From 1e78765f13cae10434e3f790c48f711740836330 Mon Sep 17 00:00:00 2001
From: wang0018 <1007152140@qq.com>
Date: Tue, 23 Feb 2021 10:08:07 +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

---
 .../java/com/ccsens/tcm/bean/vo/StatisticVo.java  | 15 +++++++++++++--
 .../com/ccsens/tcm/persist/dao/PatientDao.java    |  2 +-
 tcm/src/main/resources/mapper_dao/PatientDao.xml  |  5 +++--
 3 files changed, 17 insertions(+), 5 deletions(-)

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 2b3511de..d8425d50 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
@@ -1,9 +1,11 @@
 package com.ccsens.tcm.bean.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -12,9 +14,18 @@ public class StatisticVo {
     @ApiModel("每日分析数量统计")
     public static class SelCountS{
         @ApiModelProperty("新建的病例")
-        private Integer newNums;
+        private List<StatisticVo.Shuliang> newNums;
         @ApiModelProperty("已完成的病例")
-        private Integer overNums;
+        private List<StatisticVo.Shuliang> overNums;
+    }
+    @Data
+    @ApiModel("每日统计的数量")
+    public static class Shuliang{
+        @ApiModelProperty("时间")
+        @JsonFormat(pattern="yyyy-MM-dd")
+        private Date shijian;
+        @ApiModelProperty("数量")
+        private Integer nums;
     }
     @Data
     @ApiModel("病例分析")
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 f004bce2..78d00ba5 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
@@ -24,7 +24,7 @@ public interface PatientDao {
 
     List<PatientVo.SelPatient> selPatientInformationList(PatientDto.SelPatientList param);
 
-    Integer countCase(@Param("param") StatisticDto.SelCount param,@Param("inputStatus") byte inputStatus);
+    List<StatisticVo.Shuliang> countCase(@Param("param") StatisticDto.SelCount param,@Param("inputStatus") byte inputStatus);
 
     /**
      *
diff --git a/tcm/src/main/resources/mapper_dao/PatientDao.xml b/tcm/src/main/resources/mapper_dao/PatientDao.xml
index 64ade68f..6a5d3927 100644
--- a/tcm/src/main/resources/mapper_dao/PatientDao.xml
+++ b/tcm/src/main/resources/mapper_dao/PatientDao.xml
@@ -135,8 +135,8 @@
             </if>
         </if>
     </select>
-    <select id="countCase" resultType="java.lang.Integer">
-        select count(*) as nums from t_patient_information tpi
+    <select id="countCase" resultType="com.ccsens.tcm.bean.vo.StatisticVo$Shuliang">
+        select DATE_FORMAT(tpi.update_at,'%Y-%d-%m') as shijian,count(*) as nums from t_patient_information tpi
         where tpi.rec_status=0
         <if test="param.userId!=null and param.userId!=0 ">
             and tpi.user_id=#{param.userId}
@@ -153,6 +153,7 @@
         <if test="param.endDate!=null">
             and tpi.update_at &lt; #{param.endDate}
         </if>
+        GROUP BY shijian
     </select>
     <select id="countAnalysis" resultType="com.ccsens.tcm.bean.vo.StatisticVo$SelGroupList">
         <if test="testQuestionsId!=null and testQuestionsId!=0">