From ce60cee6b0dc78e6b3b7080bba0f1a7a5eaa35ba Mon Sep 17 00:00:00 2001
From: wang0018 <1007152140@qq.com>
Date: Tue, 2 Mar 2021 15:54:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=89=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ccsens/tcm/bean/dto/ConRecDto.java    |  6 ++++
 .../com/ccsens/tcm/bean/vo/StatisticVo.java   |  3 ++
 .../ccsens/tcm/persist/dao/PatientDao.java    |  2 +-
 .../main/resources/mapper_dao/PatientDao.xml  | 29 +++++++++++++------
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/dto/ConRecDto.java b/tcm/src/main/java/com/ccsens/tcm/bean/dto/ConRecDto.java
index fe250dcb..ccf5741e 100644
--- a/tcm/src/main/java/com/ccsens/tcm/bean/dto/ConRecDto.java
+++ b/tcm/src/main/java/com/ccsens/tcm/bean/dto/ConRecDto.java
@@ -7,6 +7,7 @@ import lombok.Data;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 
@@ -53,14 +54,19 @@ public class ConRecDto {
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         @ApiModelProperty("结束时间")
         private Date endTime;
+        @NotEmpty
         @ApiModelProperty("会议地点")
         private String place;
+        @NotEmpty
         @ApiModelProperty("主持人")
         private String host;
+        @NotEmpty
         @ApiModelProperty("'参会人'")
         private String participants;
+        @NotEmpty
         @ApiModelProperty("研讨内容")
         private String discussionContent;
+        @NotEmpty
         @ApiModelProperty("会议纪要")
         private String meetingMinutes;
     }
diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/vo/StatisticVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/StatisticVo.java
index 8d27fa62..3c6edc7a 100644
--- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/StatisticVo.java
+++ b/tcm/src/main/java/com/ccsens/tcm/bean/vo/StatisticVo.java
@@ -112,6 +112,9 @@ public class StatisticVo {
     @Data
     @ApiModel("临近任务-返回参数")
     public static class RecentAnalysisVO{
+        @ApiModelProperty("患者记录表id")
+        private Long id;
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         @ApiModelProperty("日期")
         private Date shijian;
         @ApiModelProperty("住院号")
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 86c79f64..119baa34 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
@@ -63,7 +63,7 @@ public interface PatientDao {
 
     List<BiologicalSamplesVo.SelBiologNums> selAllYBS();
 
-    List<StatisticVo.RecentAnalysisVO> adjacentTasks(StatisticDto.RecentAnalysisDto param,Long userId);
+    List<StatisticVo.RecentAnalysisVO> adjacentTasks(@Param("param") StatisticDto.RecentAnalysisDto param,@Param("userId") Long userId);
 
     List<StatisticVo.PatientProgressVo> selPatientProgress(Long userId);
 
diff --git a/tcm/src/main/resources/mapper_dao/PatientDao.xml b/tcm/src/main/resources/mapper_dao/PatientDao.xml
index 07e96ca2..4a1771b6 100644
--- a/tcm/src/main/resources/mapper_dao/PatientDao.xml
+++ b/tcm/src/main/resources/mapper_dao/PatientDao.xml
@@ -363,7 +363,9 @@
         group by th.id
     </select>
     <select id="adjacentTasks" resultType="com.ccsens.tcm.bean.vo.StatisticVo$RecentAnalysisVO">
-        select (
+        select
+        tpr.id,
+        (
         CASE
             WHEN ( DATEDIFF( now( ), tpr.contents ) &gt;= 11 AND DATEDIFF( now( ), tpr.contents ) &lt;= 17 ) THEN
             DATE_FORMAT( FROM_UNIXTIME( UNIX_TIMESTAMP( tpr.contents ) + 14 * 24 * 60 * 60 ), '%Y-%m-%d' )
@@ -392,7 +394,7 @@
         ) as task from  t_patient_record tpr
         left join t_patient_information tpi on tpi.id=tpr.patient_id and tpi.rec_status=0
         where tpr.rec_status=0
-        and tpr.test_questions_id=#{testQuestionsId}
+        and tpr.test_questions_id=#{param.testQuestionsId}
         and (
         ( DATEDIFF( now( ), tpr.contents ) &gt;= 11 AND DATEDIFF( now( ), tpr.contents ) &lt;= 17 )
         OR ( DATEDIFF( now( ), tpr.contents ) &gt;= 87 AND DATEDIFF( now( ), tpr.contents ) &lt;= 93 )
@@ -410,13 +412,22 @@
         </collection>
     </resultMap>
     <select id="selPatientProgress" resultMap="selPatientProgress1">
-        select  tpi.id,tpi.hospitalization,tpr.collect_time collectTime
-        from t_patient_record tpr
-        left join  t_patient_information tpi on tpi.rec_status=0 and tpi.id=tpr.patient_id
-        where tpr.rec_status=0
-        and tpr.user_id=#{userId}
-        and tpr.created_at &gt; DATE_SUB(now(), INTERVAL 1 YEAR)
-        group by tpr.patient_id,tpr.collect_time
+        SELECT
+            tpi.id,
+            tpi.hospitalization,
+            tpr.collect_time collectTime
+        FROM
+            t_patient_record tpr
+            , t_patient_information tpi
+        WHERE
+            tpr.rec_status = 0
+            and tpi.rec_status = 0
+            AND tpi.id = tpr.patient_id
+            AND tpi.input_status IN ( 0, 1, 3 )
+            AND tpr.user_id = #{userId}
+            AND tpr.created_at &gt; DATE_SUB( now( ), INTERVAL 1 YEAR )
+        GROUP BY
+            tpr.patient_id,tpr.collect_time
     </select>
     <select id="stringLists" resultType="java.lang.String">
         select distinct tpr.contents from t_patient_record tpr