Merge remote-tracking branch 'origin/dev_2.0.0' into dev_2.0.0

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

@@ -51,16 +51,6 @@ public class MedicalRec implements Serializable {
      */
     private String symptoms;
 
-    /**
-     * 预期诊断结果
-     */
-    private String expectDiagnosisResult;
-
-    /**
-     * 预期治疗计划
-     */
-    private String expectDiseaseTreatmentPlan;
-
     /**
      * 过敏史
      */

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

@@ -5,16 +5,18 @@
 <mapper namespace="com.supervision.mapper.DiseaseTreatmentPlanMapper">
 
     <resultMap id="BaseResultMap" type="com.supervision.model.DiseaseTreatmentPlan">
-            <id property="diseaseId" column="disease_id" jdbcType="VARCHAR"/>
+        <id property="id" column="id" jdbcType="VARCHAR"/>
-            <id property="planId" column="plan_id" jdbcType="VARCHAR"/>
+        <result property="diseaseId" column="disease_id" jdbcType="VARCHAR"/>
-            <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
+        <result property="planId" column="plan_id" jdbcType="VARCHAR"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
-            <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+        <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        disease_id,plan_id,create_user_id,
+        id
+        ,disease_id,plan_id,create_user_id,
         create_time,update_user_id,update_time
     </sql>
 </mapper>

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

@@ -11,8 +11,6 @@
             <result property="diseaseId" column="disease_id" jdbcType="VARCHAR"/>
             <result property="patientSelfDesc" column="patient_self_desc" jdbcType="VARCHAR"/>
             <result property="symptoms" column="symptoms" jdbcType="VARCHAR"/>
-            <result property="expectDiagnosisResult" column="expect_diagnosis_result" jdbcType="VARCHAR"/>
-            <result property="expectDiseaseTreatmentPlan" column="expect_disease_treatment_plan" jdbcType="VARCHAR"/>
             <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"/>
@@ -24,8 +22,7 @@
 
     <sql id="Base_Column_List">
         id,no,patient_id,
-        patient_self_desc,symptoms,expect_diagnosis_result,
+        patient_self_desc,symptoms,primarily_diagnosis_criteria,
-        expect_disease_treatment_plan,primarily_diagnosis_criteria,
         confirm_diagnosis_criteria,confirm_diagnosis_criteria,allergy_history,
         previous_history,family_history,marriage_child_history
     </sql>

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

@@ -3,6 +3,7 @@ package com.supervision.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.supervision.exception.BusinessException;
 import com.supervision.model.*;
 import com.supervision.model.Process;
@@ -94,7 +95,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
         DealPlanResVO dealPlanResVO = new DealPlanResVO();
         dealPlanResVO.setUserTreatmentPlanType(diagnosisResult.getTreatmentPlanType());
         dealPlanResVO.setUserTreatmentPlan(diagnosisResult.getTreatmentPlan());
-        dealPlanResVO.setRealTreatmentPlan(medicalRec.getExpectDiseaseTreatmentPlan());
+        dealPlanResVO.setRealTreatmentPlan("2.0修改,后期修改这个问题");
         return dealPlanResVO;
 
     }
@@ -226,7 +227,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
      */
     private ExpertDiagnosisResultResVO creatExpertDiagnosisResult(MedicalRec medicalRec, DiagnosisResult diagnosisResult, List<Disease> diseasesList) {
         ExpertDiagnosisResultResVO expertDiagnosisResultResVO = new ExpertDiagnosisResultResVO();
-        expertDiagnosisResultResVO.setDiagnosis(medicalRec.getExpectDiagnosisResult());
+        expertDiagnosisResultResVO.setDiagnosis(StrUtil.join(";",diseasesList.stream().map(Disease::getDiseaseName).collect(Collectors.toList())));
         Set<String> expertDiseaseIdSet = diseasesList.stream().map(Disease::getId).collect(Collectors.toSet());
         List<Disease> userDiagnosisDiseaseList = CollUtil.isEmpty(diagnosisResult.getFinalDiagnosis()) ? CollUtil.newArrayList()
                 : diseaseService.listByIds(diagnosisResult.getFinalDiagnosis());