hyy-alt 4 years ago
parent
commit
a875909342
  1. 3
      wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/OtherRecordsDto.java
  2. 2
      wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/PatientAndFamilyDto.java
  3. 1
      wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/WisdomCarDto.java
  4. 4
      wisdomcar/src/main/java/com/ccsens/wisdomcar/service/OtherRecordsService.java
  5. 4
      wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java
  6. 4
      wisdomcar/src/main/resources/application.yml

3
wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/OtherRecordsDto.java

@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
@ -17,6 +18,7 @@ public class OtherRecordsDto {
@Data
@ApiModel("上传图片和记录")
public static class PicturesAndRecords {
@NotNull(message="请说明您的任务")
@ApiModelProperty("分解任务id")
private Long id;
@ApiModelProperty("上传图片")
@ -27,6 +29,7 @@ public class OtherRecordsDto {
@Data
@ApiModel("查询上传图片和记录")
public static class QueryId {
@NotNull(message="请说明您的任务")
@ApiModelProperty("分解任务id")
private Long id;
}

2
wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/PatientAndFamilyDto.java

@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
@ -49,6 +50,7 @@ public class PatientAndFamilyDto {
@Data
@ApiModel("查询患者参数")
public static class queryPatientInfo{
@NotNull(message="请说明您的项目")
@ApiModelProperty("项目ID")
private Long projectId;
}

1
wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/WisdomCarDto.java

@ -51,6 +51,7 @@ public class WisdomCarDto {
@Data
@ApiModel("查询绑定平车参数")
public static class QueryInfo {
@NotNull(message="请说明您的任务")
@ApiModelProperty("分解任务id")
private Long taskSubId;

4
wisdomcar/src/main/java/com/ccsens/wisdomcar/service/OtherRecordsService.java

@ -97,6 +97,10 @@ public class OtherRecordsService implements IOtherRecordsService {
PatientInformationRecordExample patientInformationRecordExample = new PatientInformationRecordExample();
patientInformationRecordExample.createCriteria().andTaskSubIdEqualTo(param.getId());
List<PatientInformationRecord> patientInformationRecords = patientInformationRecordMapper.selectByExample(patientInformationRecordExample);
if(CollectionUtil.isEmpty(patientInformationRecords)){
log.info("没有找到对应的的任务");
throw new BaseException(CodeEnum.PARAM_ERROR);
}
for (PatientInformationRecord patientInformationRecord : patientInformationRecords) {
OtherRecordsVo.TypeAndComment query = new OtherRecordsVo.TypeAndComment();
query.setComment(patientInformationRecord.getContent());

4
wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java

@ -303,6 +303,10 @@ public class WisdomCarService implements IWisdomCarService {
@Override
public List<WisdomCarVo.BindingCarInfo> queryBindingCar(WisdomCarDto.QueryInfo param) {
List<WisdomCarVo.BindingCarInfo> bindingCarList = patientWisdomCarDao.queryBindingCarList(param.getTaskSubId());
if(CollectionUtil.isEmpty(bindingCarList)){
log.info("未找到对应的任务");
throw new BaseException(CodeEnum.PARAM_ERROR);
}
for (WisdomCarVo.BindingCarInfo bindingCar : bindingCarList) {
//拿到患者id把 患者的信息存入
PatientProject patientProject = patientProjectDao.selectByPrimaryKey(bindingCar.getPatientId());

4
wisdomcar/src/main/resources/application.yml

@ -1,6 +1,6 @@
spring:
profiles:
active: test
include: common, util-test
active: dev
include: common, util-dev

Loading…
Cancel
Save