vp_medical_rec优化字段

virtual-patient-model/src/main/java/com/supervision/model/MedicalRec.java

@@ -61,11 +61,6 @@ public class MedicalRec implements Serializable {
      */
     private String expectDiseaseTreatmentPlan;
 
-    /**
-     * 初步诊断
-     */
-    private Object primaryDiagnosis;
-
     /**
      * 过敏史
      */

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

@@ -16,7 +16,6 @@
             <result property="primarilyDiagnosisCriteria" column="primarily_diagnosis_criteria" jdbcType="VARCHAR"/>
             <result property="confirmDiagnosisCriteria" column="confirm_diagnosis_criteria" jdbcType="VARCHAR"/>
             <result property="differentialDiagnosisCriteria" column="differential_diagnosis_criteria" jdbcType="VARCHAR"/>
-            <result property="primaryDiagnosis" column="primary_diagnosis" jdbcType="OTHER"/>
             <result property="allergyHistory" column="allergy_history" jdbcType="VARCHAR"/>
             <result property="previousHistory" column="previous_history" jdbcType="VARCHAR"/>
             <result property="familyHistory" column="family_history" jdbcType="VARCHAR"/>
@@ -27,8 +26,7 @@
         id,no,patient_id,
         patient_self_desc,symptoms,expect_diagnosis_result,
         expect_disease_treatment_plan,primarily_diagnosis_criteria,
-          confirm_diagnosis_criteria,confirm_diagnosis_criteria,
-          primary_diagnosis,allergy_history,
+        confirm_diagnosis_criteria,confirm_diagnosis_criteria,allergy_history,
         previous_history,family_history,marriage_child_history
     </sql>
 </mapper>

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

@@ -1,13 +1,17 @@
 package com.supervision.service.impl;
 
+import com.supervision.exception.BusinessException;
+import com.supervision.model.MedicalRec;
 import com.supervision.model.Process;
 import com.supervision.model.User;
 import com.supervision.service.AskProcessService;
+import com.supervision.service.MedicalRecService;
 import com.supervision.service.ProcessService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Optional;
 
 @Service
 @RequiredArgsConstructor
@@ -15,11 +19,15 @@ public class AskProcessServiceImpl implements AskProcessService {
 
     private final ProcessService processService;
 
+    private final MedicalRecService medicalRecService;
+
     @Override
     public Process creatDiagnosisProcess(String patientId,String medicalId, User user) {
+        MedicalRec medicalRec = Optional.ofNullable(medicalRecService.getById(medicalId)).orElseThrow(() -> new BusinessException("未找到病历"));
         Process process = new Process();
         process.setPatientId(patientId);
         process.setMedicalRecId(medicalId);
+        process.setDiseaseId(medicalRec.getDiseaseId());
         process.setUserId(user.getId());
         process.setStatus(0);
         process.setCreateUserId(user.getId());