diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/MedicalRecordServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/MedicalRecordServiceImpl.java index c36bf1be..f3462217 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/MedicalRecordServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/MedicalRecordServiceImpl.java @@ -48,9 +48,12 @@ public class MedicalRecordServiceImpl implements MedicalRecordService { @Override public ProcessMedicalResVo findByProcessId(String processId) { - Assert.notEmpty(processId,"流程id不允许为空"); + Assert.notEmpty(processId, "流程id不允许为空"); // 每次查询电子病历,就等于进到页面了,这时进行更新最后问诊时间 - processService.lambdaUpdate().set(Process::getUpdateTime, LocalDateTime.now()).eq(Process::getId, processId).update(); + processService.lambdaUpdate().set(Process::getUpdateTime, LocalDateTime.now()) + // 已评估的,不更新 + .ne(Process::getStatus, 2) + .eq(Process::getId, processId).update(); return processMedicalService.findByProcessId(processId); } @@ -58,9 +61,9 @@ public class MedicalRecordServiceImpl implements MedicalRecordService { public boolean saveOrUpdateMedicalRecord(ProcessMedical processMedical) { log.info(JSONUtil.toJsonStr(processMedical)); - Assert.notEmpty(processMedical.getProcessId(),"流程id不为空"); + Assert.notEmpty(processMedical.getProcessId(), "流程id不为空"); List list = processMedicalService.lambdaQuery().eq(ProcessMedical::getProcessId, processMedical.getProcessId()).list(); - if (CollUtil.isEmpty(list)){ + if (CollUtil.isEmpty(list)) { // 新增 return saveMedicalRecord(processMedical); } @@ -73,11 +76,11 @@ public class MedicalRecordServiceImpl implements MedicalRecordService { @Override public ProcessMedicalViewDetailResVo queryViewDetail(String processId) { - Assert.notEmpty(processId,"流程id不能为空"); + Assert.notEmpty(processId, "流程id不能为空"); // 1.获取电子病例基本信息 ProcessMedicalResVo processMedicalResVo = this.findByProcessId(processId); - if (Objects.isNull(processMedicalResVo)){ + if (Objects.isNull(processMedicalResVo)) { return null; } ProcessMedicalViewDetailResVo resultVo = BeanUtil.toBean(processMedicalResVo, ProcessMedicalViewDetailResVo.class); @@ -99,28 +102,28 @@ public class MedicalRecordServiceImpl implements MedicalRecordService { // 4. 获取用户姓名 User user = userService.getById(processMedicalResVo.getUserId()); - if (Objects.nonNull(user)){ + if (Objects.nonNull(user)) { resultVo.setUserName(user.getName()); } return resultVo; } - private void saveAssert(ProcessMedical processMedical){ - Assert.notEmpty(processMedical.getProcessId(),"流程id不为空"); + private void saveAssert(ProcessMedical processMedical) { + Assert.notEmpty(processMedical.getProcessId(), "流程id不为空"); Process process = processService.getById(processMedical.getProcessId()); - Assert.notNull(process,"流程数据不存在"); + Assert.notNull(process, "流程数据不存在"); processMedical.setMedicalRecId(process.getMedicalRecId()); processMedical.setPatientId(process.getPatientId()); - if (StrUtil.isEmpty(processMedical.getDiseaseId())){ + if (StrUtil.isEmpty(processMedical.getDiseaseId())) { processMedical.setDiseaseId(process.getDiseaseId()); } Integer count = processMedicalService.lambdaQuery().eq(ProcessMedical::getProcessId, processMedical.getProcessId()).count(); - Assert.isFalse(count > 0,"当前实例已经存在电子病例信息"); + Assert.isFalse(count > 0, "当前实例已经存在电子病例信息"); } }