From 6314d6781970a5feb4fbb034b7499f5d63ab65b6 Mon Sep 17 00:00:00 2001
From: wang1007152140 <1007152140@qq.com>
Date: Fri, 5 Feb 2021 17:12:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tcm/src/main/java/com/ccsens/tcm/service/PatientService.java | 2 +-
 tcm/src/main/resources/application.yml                       | 4 ++--
 tcm/src/main/resources/mapper_dao/PatientDao.xml             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

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 911ea3a3..c4d1b24c 100644
--- a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java
+++ b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java
@@ -87,7 +87,7 @@ public class PatientService implements IPatientService {
         Long disease_time=Long.parseLong(String.valueOf(redisUtil.get(Constant.Redis.DISEASE_TIME)));
         //升序查询,发病试题答案的数量
         PatientRecordExample patientRecordExample1=new PatientRecordExample();
-        patientRecordExample1.setOrderByClause("rec_status");
+        patientRecordExample1.setOrderByClause("created_at");
         patientRecordExample1.createCriteria().andPatientIdEqualTo(param.getPatientId()).andTestQuestionsIdEqualTo(disease_time).andRecStatusEqualTo((byte)0);
         List<PatientRecord> patientRecordList = patientRecordMapper.selectByExample(patientRecordExample1);
         Date onsetTime=null;
diff --git a/tcm/src/main/resources/application.yml b/tcm/src/main/resources/application.yml
index f59084b0..4ecd13fd 100644
--- a/tcm/src/main/resources/application.yml
+++ b/tcm/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
-    include: common, util-test
+    active: dev
+    include: common, util-dev
 
diff --git a/tcm/src/main/resources/mapper_dao/PatientDao.xml b/tcm/src/main/resources/mapper_dao/PatientDao.xml
index 4e77508d..70aa1fca 100644
--- a/tcm/src/main/resources/mapper_dao/PatientDao.xml
+++ b/tcm/src/main/resources/mapper_dao/PatientDao.xml
@@ -157,7 +157,7 @@
     <select id="countAnalysis" resultType="com.ccsens.tcm.bean.vo.StatisticVo$SelGroupList">
         <if test="testQuestionsId!=null and testQuestionsId!=0">
 
-        select if(locate('其他',tpr.contents),'其他',tpr.contents) as content,count(DISTINCT patient_id)) as nums from t_patient_information tpi left join  t_patient_record tpr on tpi.id=tpr.patient_id and tpr.rec_status=0
+        select if(locate('其他',tpr.contents),'其他',tpr.contents) as content,count(distinct tpr.patient_id) 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}