From 38294e97d144739dd23cb72189523218a6e96c3d Mon Sep 17 00:00:00 2001
From: liu <liujiatong112@163.com>
Date: Fri, 3 Nov 2023 14:02:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=8A=E6=96=AD=E6=B5=81=E7=A8=8B=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/supervision/model/Disease.java   |  5 +++++
 .../src/main/resources/mapper/DiseaseMapper.xml        | 10 ++++++++--
 .../supervision/controller/AskProcessController.java   |  6 +++---
 .../com/supervision/service/AskProcessService.java     |  2 +-
 .../service/impl/AskProcessServiceImpl.java            |  3 ++-
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/virtual-patient-model/src/main/java/com/supervision/model/Disease.java b/virtual-patient-model/src/main/java/com/supervision/model/Disease.java
index a5e1796c..d7017a9a 100644
--- a/virtual-patient-model/src/main/java/com/supervision/model/Disease.java
+++ b/virtual-patient-model/src/main/java/com/supervision/model/Disease.java
@@ -44,7 +44,12 @@ public class Disease implements Serializable {
     @ApiModelProperty("状态 0未训练 1已训练")
     private Integer status;
 
+    @ApiModelProperty("疾病类型 0单一疾病 1符合疾病")
+    private Integer diseaseType;
 
+    @ApiModelProperty("来源的单一疾病ID-用于初步诊断判定使用")
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> containsDiseaseId;
     /**
      * 初步诊断依据
      */
diff --git a/virtual-patient-model/src/main/resources/mapper/DiseaseMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiseaseMapper.xml
index 77952b04..cf6b7786 100644
--- a/virtual-patient-model/src/main/resources/mapper/DiseaseMapper.xml
+++ b/virtual-patient-model/src/main/resources/mapper/DiseaseMapper.xml
@@ -9,6 +9,11 @@
         <result property="code" column="code" jdbcType="VARCHAR"/>
         <result property="diseaseName" column="disease_name" jdbcType="VARCHAR"/>
         <result property="status" column="status" jdbcType="INTEGER"/>
+        <result property="diseaseType" column="disease_type" jdbcType="INTEGER"/>
+        <result property="containsDiseaseId" column="contains_disease_id" jdbcType="ARRAY"
+                typeHandler="com.supervision.handler.StringListTypeHandler"/>
+        <result property="standardQuestionLibrary" column="standard_question_library" jdbcType="VARCHAR"
+                typeHandler="com.supervision.handler.StringListTypeHandler"/>
         <result property="preliminaryDiagnosis" column="preliminary_diagnosis" jdbcType="VARCHAR"/>
         <result property="confirmingDiagnosis" column="confirming_diagnosis" jdbcType="VARCHAR"/>
         <result property="basisIdentification" column="basis_identification" jdbcType="VARCHAR"/>
@@ -20,8 +25,9 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,disease_name
-        ,code,status,
+        id
+        ,disease_name
+        ,code,status,diseaseType,containsDiseaseId,standardQuestionLibrary,
         expected_diagnosis_result,preliminary_diagnosis,confirming_diagnosis,
         basis_identification,disease_treatment_plan,other,create_user_id,
         create_time,update_user_id,update_time
diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/AskProcessController.java b/virtual-patient-web/src/main/java/com/supervision/controller/AskProcessController.java
index 71d53617..bbc4aa67 100644
--- a/virtual-patient-web/src/main/java/com/supervision/controller/AskProcessController.java
+++ b/virtual-patient-web/src/main/java/com/supervision/controller/AskProcessController.java
@@ -24,14 +24,14 @@ public class AskProcessController {
 
     @ApiOperation("生成诊断流程任务")
     @GetMapping("creatDiagnosisProcess")
-    public Process creatDiagnosisProcess(@ApiParam("病人ID") String patientId) {
+    public Process creatDiagnosisProcess(@ApiParam("病人ID") String patientId, String medicalId) {
         User user = UserUtil.getUser();
-        return askProcessService.creatDiagnosisProcess(patientId, user);
+        return askProcessService.creatDiagnosisProcess(patientId, medicalId, user);
     }
 
     @ApiOperation("查询用户正在诊断中的诊断记录")
     @GetMapping("queryUserProcess")
-    public List<Process> queryUserProcess(String userId){
+    public List<Process> queryUserProcess(String userId) {
         return askProcessService.queryUserProcess(userId);
     }
 }
diff --git a/virtual-patient-web/src/main/java/com/supervision/service/AskProcessService.java b/virtual-patient-web/src/main/java/com/supervision/service/AskProcessService.java
index fbd5759a..7aed4d27 100644
--- a/virtual-patient-web/src/main/java/com/supervision/service/AskProcessService.java
+++ b/virtual-patient-web/src/main/java/com/supervision/service/AskProcessService.java
@@ -7,7 +7,7 @@ import java.util.List;
 
 public interface AskProcessService {
 
-    Process creatDiagnosisProcess(String patientId, User user);
+    Process creatDiagnosisProcess(String patientId,String medicalId, User user);
 
     List<Process> queryUserProcess(String userId);
 
diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskProcessServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskProcessServiceImpl.java
index eacde7d5..d1157327 100644
--- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskProcessServiceImpl.java
+++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskProcessServiceImpl.java
@@ -16,9 +16,10 @@ public class AskProcessServiceImpl implements AskProcessService {
     private final ProcessService processService;
 
     @Override
-    public Process creatDiagnosisProcess(String patientId, User user) {
+    public Process creatDiagnosisProcess(String patientId,String medicalId, User user) {
         Process process = new Process();
         process.setPatientId(patientId);
+        process.setMedicalRecId(medicalId);
         process.setUserId(user.getId());
         process.setStatus(0);
         process.setCreateUserId(user.getId());