From 81a20bf16f69baa9e112214e2544edf906bb520a Mon Sep 17 00:00:00 2001
From: liu <liujiatong112@163.com>
Date: Wed, 20 Dec 2023 16:43:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=BE=85=E5=8A=A9=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E5=88=A4=E8=AF=BB=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/model/DiagnosisAncillaryRecord.java   |  5 +++++
 .../supervision/vo/ask/AskAncillaryHistoryResVO.java  |  3 +++
 .../mapper/DiagnosisAncillaryRecordMapper.xml         |  6 ++++--
 .../controller/AskAncillaryController.java            |  7 +++++++
 .../pojo/vo/SaveAncillaryAssessmentResultReqVO.java   | 11 +++++++++++
 .../com/supervision/service/AskAncillaryService.java  |  4 ++++
 .../service/impl/AskAncillaryServiceImpl.java         |  5 +++++
 7 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 virtual-patient-web/src/main/java/com/supervision/pojo/vo/SaveAncillaryAssessmentResultReqVO.java

diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisAncillaryRecord.java b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisAncillaryRecord.java
index f4826bfc..6a9db76c 100644
--- a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisAncillaryRecord.java
+++ b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisAncillaryRecord.java
@@ -51,12 +51,17 @@ public class DiagnosisAncillaryRecord extends Model<DiagnosisAncillaryRecord> im
     @ApiModelProperty("检查结果")
     private String result;
 
+    @ApiModelProperty("诊断判读结果")
+    private String assessmentResult;
+
     @ApiModelProperty("是否是证实诊断依据(0否1是)")
     private Integer basisConfirmFlag;
 
     @ApiModelProperty("是否是鉴别依据(0否1是)")
     private Integer basisIdentificationFlag;
 
+
+
     /**
      * 创建人ID
      */
diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/ask/AskAncillaryHistoryResVO.java b/virtual-patient-model/src/main/java/com/supervision/vo/ask/AskAncillaryHistoryResVO.java
index 1edddf16..c84a8d42 100644
--- a/virtual-patient-model/src/main/java/com/supervision/vo/ask/AskAncillaryHistoryResVO.java
+++ b/virtual-patient-model/src/main/java/com/supervision/vo/ask/AskAncillaryHistoryResVO.java
@@ -35,6 +35,9 @@ public class AskAncillaryHistoryResVO {
     @ApiModelProperty("是否诊断判读 0不需要 1需要")
     private Integer diagnosisAssessmentFlag;
 
+    @ApiModelProperty("诊断判读结果")
+    private String assessmentResult;
+
     @ApiModelProperty("关联的初步诊断")
     private List<DiagnosisPrimaryVO> primaryList;
 
diff --git a/virtual-patient-model/src/main/resources/mapper/DiagnosisAncillaryRecordMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiagnosisAncillaryRecordMapper.xml
index e9888003..fd671f04 100644
--- a/virtual-patient-model/src/main/resources/mapper/DiagnosisAncillaryRecordMapper.xml
+++ b/virtual-patient-model/src/main/resources/mapper/DiagnosisAncillaryRecordMapper.xml
@@ -10,6 +10,7 @@
         <result property="processId" column="process_id" jdbcType="VARCHAR"/>
         <result property="itemId" column="item_id" jdbcType="VARCHAR"/>
         <result property="result" column="result" jdbcType="VARCHAR"/>
+        <result property="assessmentResult" column="assessment_result" jdbcType="VARCHAR"/>
         <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
@@ -19,7 +20,7 @@
     <sql id="Base_Column_List">
         id
         ,process_id,item_id,primary_id,ancillary_id
-        result,create_user_id,create_time,
+        result,assessment_result,create_user_id,create_time,
         update_user_id,update_time
     </sql>
     <select id="queryAncillaryResultByProcessId"
@@ -42,8 +43,9 @@
         select t2.item_name                 as itemName,
                t2.id                        as itemId,
                t2.type                      as type,
-               t4.primary_id            as primaryId,
+               t4.primary_id                as primaryId,
                t1.result                    as result,
+               t1.assessment_result         as assessmentResult,
                t1.id                        as id,
                t3.diagnosis_assessment_flag as diagnosisAssessmentFlag,
                t1.create_time               as createTime
diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/AskAncillaryController.java b/virtual-patient-web/src/main/java/com/supervision/controller/AskAncillaryController.java
index 34a9a64b..9de3675d 100644
--- a/virtual-patient-web/src/main/java/com/supervision/controller/AskAncillaryController.java
+++ b/virtual-patient-web/src/main/java/com/supervision/controller/AskAncillaryController.java
@@ -2,6 +2,7 @@ package com.supervision.controller;
 
 import com.supervision.model.ConfigAncillaryItem;
 import com.supervision.pojo.vo.AskAncillaryBatchReqVO;
+import com.supervision.pojo.vo.SaveAncillaryAssessmentResultReqVO;
 import com.supervision.vo.ask.AncillaryItemReqVo;
 import com.supervision.vo.ask.AskAncillaryHistoryResVO;
 import com.supervision.pojo.vo.AskAncillaryResultReqVO;
@@ -55,5 +56,11 @@ public class AskAncillaryController {
         return askAncillaryService.queryAskAncillaryHistory(processId);
     }
 
+    @ApiOperation("保存辅助检查判读结果")
+    @GetMapping("saveAncillaryAssessmentResult")
+    public void saveAncillaryAssessmentResult(@RequestBody SaveAncillaryAssessmentResultReqVO reqVO){
+        askAncillaryService.saveAncillaryAssessmentResult(reqVO);
+    }
+
 
 }
diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/SaveAncillaryAssessmentResultReqVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/SaveAncillaryAssessmentResultReqVO.java
new file mode 100644
index 00000000..0abc49cf
--- /dev/null
+++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/SaveAncillaryAssessmentResultReqVO.java
@@ -0,0 +1,11 @@
+package com.supervision.pojo.vo;
+
+import lombok.Data;
+
+@Data
+public class SaveAncillaryAssessmentResultReqVO {
+
+    private String recordId;
+
+    private String result;
+}
diff --git a/virtual-patient-web/src/main/java/com/supervision/service/AskAncillaryService.java b/virtual-patient-web/src/main/java/com/supervision/service/AskAncillaryService.java
index 6f025e04..fa9cad5c 100644
--- a/virtual-patient-web/src/main/java/com/supervision/service/AskAncillaryService.java
+++ b/virtual-patient-web/src/main/java/com/supervision/service/AskAncillaryService.java
@@ -2,11 +2,13 @@ package com.supervision.service;
 
 import com.supervision.model.ConfigAncillaryItem;
 import com.supervision.pojo.vo.AskAncillaryBatchReqVO;
+import com.supervision.pojo.vo.SaveAncillaryAssessmentResultReqVO;
 import com.supervision.vo.ask.AncillaryItemReqVo;
 import com.supervision.vo.ask.AskAncillaryHistoryResVO;
 import com.supervision.pojo.vo.AskAncillaryResultReqVO;
 import com.supervision.vo.ask.ConfigAncillaryItemResVO;
 import com.supervision.vo.ask.DiagnosisAncillaryRecordVo;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -23,4 +25,6 @@ public interface AskAncillaryService {
     DiagnosisAncillaryRecordVo execAskAncillaryResult(AskAncillaryResultReqVO reqVO);
 
     List<AskAncillaryHistoryResVO> queryAskAncillaryHistory(String processId);
+
+    void saveAncillaryAssessmentResult(SaveAncillaryAssessmentResultReqVO reqVO);
 }
diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java
index 0223a952..ba7caf38 100644
--- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java
+++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java
@@ -8,6 +8,7 @@ import com.supervision.exception.BusinessException;
 import com.supervision.model.*;
 import com.supervision.model.Process;
 import com.supervision.pojo.vo.AskAncillaryBatchReqVO;
+import com.supervision.pojo.vo.SaveAncillaryAssessmentResultReqVO;
 import com.supervision.vo.ask.*;
 import com.supervision.pojo.vo.AskAncillaryResultReqVO;
 import com.supervision.service.*;
@@ -148,4 +149,8 @@ public class AskAncillaryServiceImpl implements AskAncillaryService {
         return resList;
     }
 
+    @Override
+    public void saveAncillaryAssessmentResult(SaveAncillaryAssessmentResultReqVO reqVO) {
+
+    }
 }