diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/ask/ProcessMedicalLayerResVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/ask/ProcessMedicalLayerResVo.java new file mode 100644 index 00000000..7e14e8c7 --- /dev/null +++ b/virtual-patient-model/src/main/java/com/supervision/vo/ask/ProcessMedicalLayerResVo.java @@ -0,0 +1,25 @@ +package com.supervision.vo.ask; + +import cn.hutool.core.bean.BeanUtil; +import com.supervision.model.ProcessMedical; +import lombok.Data; + +import java.util.Objects; + +@Data +public class ProcessMedicalLayerResVo { + + private ProcessMedicalResVo base; + private ProcessMedical processMedical; + + + public static ProcessMedicalLayerResVo ProcessMedicalResVoToBean(ProcessMedicalResVo processMedical){ + if (Objects.isNull(processMedical)){ + return null; + } + ProcessMedicalLayerResVo bean = new ProcessMedicalLayerResVo(); + bean.processMedical = BeanUtil.toBean(processMedical, ProcessMedical.class); + bean.base = processMedical; + return bean; + } +} diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/ask/ProcessMedicalViewDetailResVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/ask/ProcessMedicalViewDetailResVo.java index e8c87645..de2944fd 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/ask/ProcessMedicalViewDetailResVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/ask/ProcessMedicalViewDetailResVo.java @@ -18,7 +18,7 @@ public class ProcessMedicalViewDetailResVo extends ProcessMedicalResVo{ private List physicalDiagnosisNameList; @ApiModelProperty("辅助检查名列表") - private List ancillaryDiagnosisNameList; + private List ancillaryDiagnosisNameList; @ApiModelProperty("用户名") private String userName; diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/MedicalRecordController.java b/virtual-patient-web/src/main/java/com/supervision/controller/MedicalRecordController.java index f1845bc6..c031230e 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/MedicalRecordController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/MedicalRecordController.java @@ -1,7 +1,9 @@ package com.supervision.controller; +import cn.hutool.core.bean.BeanUtil; import com.supervision.model.ProcessMedical; import com.supervision.service.MedicalRecordService; +import com.supervision.vo.ask.ProcessMedicalLayerResVo; import com.supervision.vo.ask.ProcessMedicalResVo; import com.supervision.vo.ask.ProcessMedicalViewDetailResVo; import io.swagger.annotations.Api; @@ -43,9 +45,9 @@ public class MedicalRecordController { @ApiOperation("通过流程id查询电子病例信息") @GetMapping("findByProcessId") - public ProcessMedicalResVo findByProcessId(@ApiParam("流程id") @RequestParam("processId") String processId){ + public ProcessMedicalLayerResVo findByProcessId(@ApiParam("流程id") @RequestParam("processId") String processId){ - return medicalRecordService.findByProcessId(processId); + return ProcessMedicalLayerResVo.ProcessMedicalResVoToBean(medicalRecordService.findByProcessId(processId)); } diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPhysicalServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPhysicalServiceImpl.java index 0f4fd70c..8efe98c4 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPhysicalServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPhysicalServiceImpl.java @@ -87,13 +87,15 @@ public class AskPhysicalServiceImpl implements AskPhysicalService { diagnosisPhysicalRecord.insert(); // 保存初步诊断 - for (String primaryId : reqVO.getPrimaryIdList()) { - DiagnosisPrimaryRelation diagnosisPrimaryRelation = new DiagnosisPrimaryRelation(); - diagnosisPrimaryRelation.setProcessId(process.getId()); - diagnosisPrimaryRelation.setPrimaryId(primaryId); - diagnosisPrimaryRelation.setType(2); - diagnosisPrimaryRelation.setRelationId(diagnosisPhysicalRecord.getId()); - diagnosisPrimaryRelation.insert(); + if (CollUtil.isNotEmpty(reqVO.getPrimaryIdList())){ + for (String primaryId : reqVO.getPrimaryIdList()) { + DiagnosisPrimaryRelation diagnosisPrimaryRelation = new DiagnosisPrimaryRelation(); + diagnosisPrimaryRelation.setProcessId(process.getId()); + diagnosisPrimaryRelation.setPrimaryId(primaryId); + diagnosisPrimaryRelation.setType(2); + diagnosisPrimaryRelation.setRelationId(diagnosisPhysicalRecord.getId()); + diagnosisPrimaryRelation.insert(); + } } DiagnosisPhysicalRecordVo resVo = BeanUtil.toBean(diagnosisPhysicalRecord, DiagnosisPhysicalRecordVo.class);