From 4b21aec8e50caf4317d6b33e08d41548bfe25d6e Mon Sep 17 00:00:00 2001
From: wang1007152140 <1007152140@qq.com>
Date: Thu, 4 Feb 2021 18:19:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=97=85=E4=BE=8B=E5=88=86?=
 =?UTF-8?q?=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ccsens/tcm/persist/dao/PatientDao.java    |  2 +-
 .../ccsens/tcm/service/PatientService.java    |  4 ++--
 .../main/resources/mapper_dao/PatientDao.xml  | 20 +++++++++++++++----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/tcm/src/main/java/com/ccsens/tcm/persist/dao/PatientDao.java b/tcm/src/main/java/com/ccsens/tcm/persist/dao/PatientDao.java
index 462f764f..8e121b69 100644
--- a/tcm/src/main/java/com/ccsens/tcm/persist/dao/PatientDao.java
+++ b/tcm/src/main/java/com/ccsens/tcm/persist/dao/PatientDao.java
@@ -35,7 +35,7 @@ public interface PatientDao {
      * @param hospitalId 医院id
      * @return
      */
-    StatisticVo.SelGroupList countAnalysis(List<PatientDto.Condition> conditionList, List<PatientDto.ConditionDate> conditionListDate, Long inpatientId, Long testQuestionsId,String hospitalization,Byte inputStatus,Long hospitalId);
+    List<StatisticVo.SelGroupList> countAnalysis(@Param("conditionList")List<PatientDto.Condition> conditionList, @Param("conditionListDate")List<PatientDto.ConditionDate> conditionListDate, @Param("inpatientId")Long inpatientId, @Param("testQuestionsId")Long testQuestionsId,@Param("hospitalization")String hospitalization,@Param("inputStatus")Byte inputStatus,@Param("hospitalId")Long hospitalId);
     /**
      * 统计病例完成情况
      * @param hospitalId 医院id
diff --git a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java
index 5099115b..8c82aec3 100644
--- a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java
+++ b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java
@@ -245,9 +245,9 @@ public class PatientService implements IPatientService {
             return selGroupNumsList;
         for (int i = 0; i < param.getInpatientId().length; i++) {
             StatisticVo.SelGroupNum selGroupNum =new StatisticVo.SelGroupNum();
-            StatisticVo.SelGroupList selGroupList= patientDao.countAnalysis(param.getConditionList(),param.getConditionListDate(),param.getInpatientId()[i],param.getTestQuestionsId(),param.getHospitalization(),param.getInputStatus(),param.getHospitalId());
+            List<StatisticVo.SelGroupList> selGroupList= patientDao.countAnalysis(param.getConditionList(),param.getConditionListDate(),param.getInpatientId()[i],param.getTestQuestionsId(),param.getHospitalization(),param.getInputStatus(),param.getHospitalId());
             selGroupNum.setInpatientId(param.getInpatientId()[i]);
-            selGroupNum.getList().add(selGroupList);
+            selGroupNum.setList(selGroupList);
             selGroupNumsList.add(selGroupNum);
         }
         return selGroupNumsList;
diff --git a/tcm/src/main/resources/mapper_dao/PatientDao.xml b/tcm/src/main/resources/mapper_dao/PatientDao.xml
index 1f7a6eb7..f30ec278 100644
--- a/tcm/src/main/resources/mapper_dao/PatientDao.xml
+++ b/tcm/src/main/resources/mapper_dao/PatientDao.xml
@@ -155,10 +155,22 @@
         </if>
     </select>
     <select id="countAnalysis" resultType="com.ccsens.tcm.bean.vo.StatisticVo$SelGroupList">
-        select if(LOCATE('其他'),'其他',tpr.contents) as content,count(*) as nums from t_patient_information tpi left join  t_patient_record tpr on tpi.id=tpr.patient_id and tpr.rec_status=0
-        where tpi.rec_status=0
         <if test="testQuestionsId!=null and testQuestionsId!=0">
-            and tpr.test_questions_id=#{testQuestionsId}
+        select if(locate('其他',tpr.contents),'其他',tpr.contents) as content,count(*) as nums from t_patient_information tpi left join  t_patient_record tpr on tpi.id=tpr.patient_id and tpr.rec_status=0
+        where tpi.rec_status=0
+            <if test="testQuestionsId!=null and testQuestionsId!=0">
+                and tpr.test_questions_id=#{testQuestionsId}
+            </if>
+        </if>
+        <if test="testQuestionsId==null or testQuestionsId==0">
+            SELECT
+            '' as content,
+            count( * ) AS nums
+            FROM
+            t_patient_information tpi
+
+            WHERE
+            tpi.rec_status = 0
         </if>
         and tpi.id in (
         SELECT
@@ -224,7 +236,7 @@
             )
         </if>
         )
-        <if test="testQuestionsId!=null">
+        <if test="testQuestionsId != null and testQuestionsId!=0">
             group by content
         </if>
     </select>