web： 修改代码

virtual-patient-model/src/main/resources/mapper/ProcessMedicalMapper.xml

@@ -40,6 +40,8 @@
     <select id="findByProcessId" resultType="com.supervision.vo.ask.ProcessMedicalResVo">
         select pr.process_no            as processNo,
                pr.update_time           as recentTime,
+               pm.process_id            as processId,
+               pm.disease_id            as diseaseId,
                mr.id                    as medicalRecId,
                mr.no                    as medicalRecNo,
                mr.patient_name          as patientName,

virtual-patient-web/src/main/java/com/supervision/service/impl/MedicalRecordServiceImpl.java

@@ -1,8 +1,7 @@
 package com.supervision.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.supervision.model.Process;
 import com.supervision.model.ProcessMedical;
 import com.supervision.service.MedicalRecordService;
 import com.supervision.service.ProcessMedicalService;
@@ -12,8 +11,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 
 @Service
 @RequiredArgsConstructor
@@ -21,6 +18,9 @@ import java.util.List;
 public class MedicalRecordServiceImpl implements MedicalRecordService {
 
     private final ProcessMedicalService processMedicalService;
+
+    private final ProcessService processService;
+
     @Override
     public boolean saveMedicalRecord(ProcessMedical processMedical) {
 
@@ -47,8 +47,12 @@ public class MedicalRecordServiceImpl implements MedicalRecordService {
 
     private void saveAssert(ProcessMedical processMedical){
         Assert.notEmpty(processMedical.getProcessId(),"流程id不为空");
-        Assert.notEmpty(processMedical.getMedicalRecId(),"病例id不能为空");
-        Assert.notEmpty(processMedical.getPatientId(),"病人id不能为空");
+
+        Process process = processService.getById(processMedical.getProcessId());
+        Assert.notNull(process,"流程数据不存在");
+
+        processMedical.setMedicalRecId(process.getMedicalRecId());
+        processMedical.setPatientId(process.getPatientId());
 
         Integer count = processMedicalService.lambdaQuery().eq(ProcessMedical::getProcessId, processMedical.getProcessId()).count();
         Assert.isFalse(count > 0,"当前实例已经存在电子病例信息");