From 37a525a869413429177c23819f50b62f455f3273 Mon Sep 17 00:00:00 2001
From: zhizhi wu <2377881365@qq.com>
Date: Tue, 13 Apr 2021 19:11:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ccsens/tcm/service/ImportService.java   | 13 ++++++-------
 .../main/resources/mapper_dao/QuestionDao.xml   | 17 ++++++++++-------
 .../main/resources/mapper_dao/ReportCodeDao.xml |  2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/tcm/src/main/java/com/ccsens/tcm/service/ImportService.java b/tcm/src/main/java/com/ccsens/tcm/service/ImportService.java
index 4fc45e74..7ac5069b 100644
--- a/tcm/src/main/java/com/ccsens/tcm/service/ImportService.java
+++ b/tcm/src/main/java/com/ccsens/tcm/service/ImportService.java
@@ -283,18 +283,17 @@ public class ImportService implements IImportService {
         }
         question.setRelevanceOptionId(optionId == null ? 0 : optionId);
         // 设置关联那个医院
-        List<Long> hospitalIds = null;
+        List<Long> hospitalIds = new ArrayList<>();
         int hospitalIndex = 10;
         if (objs.length > hospitalIndex && !StringUtils.isEmpty(objs[hospitalIndex])) {
-            hospitalMap.forEach((key, value)->{
-                hospitalIds.add(value);
-
-            });
-        } else {
             String[] codes = ((String) objs[hospitalIndex]).split("[，,]");
             for (String code:codes) {
                 hospitalIds.add(hospitalMap.get(code));
             }
+        } else {
+            hospitalMap.forEach((key, value)->{
+                hospitalIds.add(value);
+            });
         }
 
         hospitalIds.forEach(id->{
@@ -302,7 +301,7 @@ public class ImportService implements IImportService {
             questionHospital.setId(snowflake.nextId());
             questionHospital.setQuestionId(question.getId());
             questionHospital.setHospitalId(id);
-            questionHospitalDao.insert(questionHospital);
+            questionHospitalDao.insertSelective(questionHospital);
         });
 
         log.info("导入试题：{}", question);
diff --git a/tcm/src/main/resources/mapper_dao/QuestionDao.xml b/tcm/src/main/resources/mapper_dao/QuestionDao.xml
index 28a2a991..2d17545c 100644
--- a/tcm/src/main/resources/mapper_dao/QuestionDao.xml
+++ b/tcm/src/main/resources/mapper_dao/QuestionDao.xml
@@ -173,8 +173,11 @@
         from  t_question q, t_question_hospital h
         WHERE
         q.id = h.question_id
-        q.`code` = #{code}
-        h.hospital_id = #{hospitalId}
+        <if test="code != null and code != ''">
+            and q.`code` = #{code}
+        </if>
+
+        and h.hospital_id = #{hospitalId}
         and q.relevance_option_id = 0
         and q.rec_status = 0
         and h.rec_status = 0
@@ -262,15 +265,15 @@
       )a
       ORDER BY a.qsort,a.osort,a.choose DESC,-a.otherInformation DESC
   </select>
-  <resultMap id="queryQuestionMap" type="com.ccsens.tcm.bean.vo.QuestionVo.SubjectLists">
+  <resultMap id="queryQuestionMap" type="com.ccsens.tcm.bean.vo.QuestionVo$SubjectLists">
       <id column="id" property="id"/>
       <result column="code" property="code"/>
       <result column="name" property="name"/>
-      <collection property="optionVos" ofType="com.ccsens.tcm.bean.vo.QuestionVo.SubjectLists">
+      <collection property="optionVos" ofType="com.ccsens.tcm.bean.vo.QuestionVo$SubjectLists">
           <id column="id1" property="id"/>
           <result column="code1" property="code"/>
           <result column="name1" property="name"/>
-          <collection property="optionVos" ofType="com.ccsens.tcm.bean.vo.QuestionVo.SubjectLists">
+          <collection property="optionVos" ofType="com.ccsens.tcm.bean.vo.QuestionVo$SubjectLists">
             <id property="id" column="id2"/>
             <result property="name" column="question"/>
           </collection>
@@ -298,11 +301,11 @@
         AND trc.rec_status =0
         order by trc.sort,trc1.sort,tq.sort
   </select>
-    <resultMap id="queryQuestion1Map" type="com.ccsens.tcm.bean.vo.QuestionVo.SubjectLists">
+    <resultMap id="queryQuestion1Map" type="com.ccsens.tcm.bean.vo.QuestionVo$SubjectLists">
         <id column="id" property="id"/>
         <result column="code" property="code"/>
         <result column="name" property="name"/>
-        <collection property="optionVos" ofType="com.ccsens.tcm.bean.vo.QuestionVo.SubjectLists">
+        <collection property="optionVos" ofType="com.ccsens.tcm.bean.vo.QuestionVo$SubjectLists">
             <id property="id" column="id2"/>
             <result column="question" property="name"/>
         </collection>
diff --git a/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml b/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml
index 0283429c..bc304f6f 100644
--- a/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml
+++ b/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml
@@ -149,7 +149,7 @@
             c.code = t.code
             and t.recode_time = #{nums}
             and c.`level` = 2
-            and crec_status = 0
+            and c.rec_status = 0
             and t.rec_status = 0
         ) c2 on c1.`code` = c2.parent_code