提交修改保存信息

tcm/src/main/java/com/ccsens/tcm/api/PatientController.java

@@ -76,5 +76,4 @@ public class PatientController {
         return JsonResponse.newInstance().ok(selSearchCriteriaList);
     }
 
-
 }

tcm/src/main/java/com/ccsens/tcm/api/StatisticalAnalysisController.java

@@ -40,4 +40,5 @@ public class StatisticalAnalysisController {
         log.info("统计每日病例调用完成");
         return JsonResponse.newInstance().ok(countCase);
     }
+
 }

tcm/src/main/java/com/ccsens/tcm/bean/dto/PatientDto.java

@@ -22,11 +22,11 @@ public class PatientDto {
         @ApiModelProperty("住院号")
         private String hospitalization;
         @ApiModelProperty("对照组id")
-        private Integer inpatientId;
+        private Long inpatientId;
         @ApiModelProperty("录入状态：0：新建 1：数据搜集中 2数据搜集完成 3数据搜集超时 4：废弃")
         private Byte inputStatus=0;
         @ApiModelProperty("医院id")
-        private Integer hospitalId;
+        private Long hospitalId;
     }
     @Data
     @ApiModel("查询患者基本信息")
@@ -36,7 +36,7 @@ public class PatientDto {
         @ApiModelProperty("住院号")
         private String hospitalization;
         @ApiModelProperty("对照组id")
-        private Integer inpatientId;
+        private Long inpatientId;
         @ApiModelProperty("录入状态：0：新建 1：数据搜集中 2数据搜集完成 3数据搜集超时 4：废弃")
         private Byte inputStatus;
         @Min(1)
@@ -78,11 +78,11 @@ public class PatientDto {
         @ApiModelProperty("住院号")
         private String hospitalization;
         @ApiModelProperty("对照组id")
-        private Integer inpatientId;
+        private Long inpatientId;
         @ApiModelProperty("录入状态：0：新建 1：数据搜集中 2数据搜集完成 3数据搜集超时 4：废弃")
         private Byte inputStatus;
         @ApiModelProperty("医院id")
-        private Integer hospitalId;
+        private Long hospitalId;
     }
     @Data
     @ApiModel("查询患者的搜索条件集合")

tcm/src/main/java/com/ccsens/tcm/bean/vo/PatientVo.java

@@ -22,11 +22,15 @@ public class PatientVo {
         @ApiModelProperty("住院号")
         private String hospitalization;
         @ApiModelProperty("对照组id")
-        private Integer inpatientId;
+        private Long inpatientId;
         @ApiModelProperty("录入状态：0：新建 1：数据搜集中 2数据搜集完成 3数据搜集超时 4：废弃")
         private Byte inputStatus;
         @ApiModelProperty("医院id")
-        private Integer hospitalId;
+        private Long hospitalId;
+        @ApiModelProperty("对照组名称")
+        private String name;
+        @ApiModelProperty("搜集次数")
+        private Integer collectionNum;
     }
     @Data
     @ApiModel("经过搜索条件查询的患者集合")

tcm/src/main/java/com/ccsens/tcm/bean/vo/StatisticVo.java

@@ -1,15 +1,31 @@
 package com.ccsens.tcm.bean.vo;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class StatisticVo {
     @Data
+    @ApiModel("每日分析数量统计")
     public static class SelCountS{
         @ApiModelProperty("新建的病例")
         private Integer newNums;
         @ApiModelProperty("已完成的病例")
         private Integer overNums;
     }
+    @Data
+    @ApiModel("病例分析")
+    public static class SelGroupNum{
+        private Long inpatientId;
+        private List<SelGroupList> list;
+    }
+    @Data
+    @ApiModel("病例分析详细数量")
+    public static class SelGroupList{
+        private String contents;
+        private Integer nums;
+    }
 }

tcm/src/main/java/com/ccsens/tcm/service/PatientService.java

@@ -210,6 +210,7 @@ public class PatientService implements IPatientService {
     public StatisticVo.SelCountS countCase(StatisticDto.SelCount param, Long userId) {
         StatisticVo.SelCountS selCountS=new StatisticVo.SelCountS();
         selCountS.setNewNums(patientDao.countCase(param,(byte)0));
+        selCountS.setOverNums(patientDao.countCase(param,(byte)0));
         return selCountS;
     }
 

tcm/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
+    active: test
-    include: common, util-dev
+    include: common, util-test
 

tcm/src/main/resources/mapper_dao/PatientDao.xml

@@ -39,13 +39,15 @@
   </select>
     <select id="selPatientMesList" resultType="com.ccsens.tcm.bean.vo.PatientVo$SelPatient">
         SELECT
-            id,
+            tpi.id,
-            hospitalization,
+            tpi.hospitalization,
             tpi.inpatient_id AS inpatientId,
             tpi.input_status AS inputStatus,
-            tpi.hospital_id AS hospitalId
+            tpi.hospital_id AS hospitalId,
+            ti.name,
+            ti.collection_num as collectionNum
         FROM
-            t_patient_information tpi
+            t_patient_information tpi left join t_inpatient ti on ti.rec_status=0 and ti.id=tpi.inpatient_id
         WHERE
             tpi.rec_status = 0
             AND tpi.id IN (
@@ -87,9 +89,11 @@
         tpi.hospitalization,
         tpi.inpatient_id AS inpatientId,
         tpi.input_status AS inputStatus,
-        tpi.hospital_id AS hospitalId
+        tpi.hospital_id AS hospitalId,
+        ti.name,
+        ti.collection_num as collectionNum
         FROM
-        t_patient_information tpi
+        t_patient_information tpi left join t_inpatient ti on ti.rec_status=0 and ti.id=tpi.inpatient_id
         WHERE
         tpi.rec_status =0
         <if test="id != null">
@@ -119,5 +123,11 @@
         <if test="inputStatus!=null">
             and tpi.input_status=#{inputStatus}
         </if>
+        <if test="param.startDate!=null">
+            and tpi.update_at &gt; #{param.startDate}
+        </if>
+        <if test="param.endDate!=null">
+            and tpi.update_at &lt; #{param.endDate}
+        </if>
     </select>
 </mapper>