From 82eb05ed5eaff600385c30836780bdd0bddd86b1 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Thu, 4 Mar 2021 09:16:48 +0800
Subject: [PATCH] =?UTF-8?q?20210304=E6=9F=A5=E8=AF=A2=E8=AF=95=E9=A2=98?=
 =?UTF-8?q?=E5=8F=8A=E7=AD=94=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ccsens/tcm/bean/vo/QuestionVo.java |  2 +-
 tcm/src/main/resources/mapper_dao/QuestionDao.xml    | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java
index 1ccb7d59..9e793ac5 100644
--- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java
+++ b/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java
@@ -154,7 +154,7 @@ public class QuestionVo {
     @Data
     @ApiModel("患者的答案")
     public static class PatientOption {
-        @ApiModelProperty("id")
+        @ApiModelProperty("选项id")
         private Long id;
         @ApiModelProperty("排序")
         private int sort;
diff --git a/tcm/src/main/resources/mapper_dao/QuestionDao.xml b/tcm/src/main/resources/mapper_dao/QuestionDao.xml
index f1bdb052..13359c91 100644
--- a/tcm/src/main/resources/mapper_dao/QuestionDao.xml
+++ b/tcm/src/main/resources/mapper_dao/QuestionDao.xml
@@ -122,6 +122,10 @@
 
 
   <select id="getQuestionByCodeAndPatientId" resultMap="getQuestionByCodeAndPatientId">
+      SELECT
+      *
+      FROM
+      (
     SELECT
     q.id as qid,
     q.question as qquestion,
@@ -134,7 +138,10 @@
     o.show_value as oshow_value,
     o.submit_value as osubmit_value,
     o.after_operation as oafter_operation,
-    if(q.type &gt; 2 and q.type &lt;13 and q.type != 6,if(o.submit_value = r.contents,true,false),null) as choose,
+      IF (q.type &gt; 2 AND q.type &lt; 13 AND q.type != 6,
+      IF ((o.submit_value = r.contents) or(r.contents_type = 1 AND SUBSTRING_INDEX( r.contents, ':', 1 ) = o.submit_value), TRUE, FALSE ),
+      NULL
+      ) AS choose,
     r.patient_id,
     r.id as recordId,
     if(r.collect_time is null, 0,r.collect_time) as collect_time,
@@ -155,6 +162,9 @@
     q.relevance_option_id = 0
     and q.rec_status = 0
     and q.`code` = #{code}
+
+      )a
+      ORDER BY a.qsort,a.osort,a.choose DESC,-a.otherInformation DESC
   </select>
 
   <resultMap id="getQuestionByOptionId" type="com.ccsens.tcm.bean.vo.QuestionVo$PatientQuestion">