From 2e171226a7fefd1ab999e14be78b750eed39012e Mon Sep 17 00:00:00 2001 From: wang1007152140 <1007152140@qq.com> Date: Tue, 2 Feb 2021 11:40:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/tcm/api/PatientController.java | 1 - .../api/StatisticalAnalysisController.java | 1 + .../com/ccsens/tcm/bean/dto/PatientDto.java | 10 ++++----- .../com/ccsens/tcm/bean/vo/PatientVo.java | 8 +++++-- .../com/ccsens/tcm/bean/vo/StatisticVo.java | 16 ++++++++++++++ .../ccsens/tcm/service/PatientService.java | 1 + tcm/src/main/resources/application.yml | 4 ++-- .../main/resources/mapper_dao/PatientDao.xml | 22 ++++++++++++++----- 8 files changed, 47 insertions(+), 16 deletions(-) diff --git a/tcm/src/main/java/com/ccsens/tcm/api/PatientController.java b/tcm/src/main/java/com/ccsens/tcm/api/PatientController.java index beb279f6..8335267a 100644 --- a/tcm/src/main/java/com/ccsens/tcm/api/PatientController.java +++ b/tcm/src/main/java/com/ccsens/tcm/api/PatientController.java @@ -76,5 +76,4 @@ public class PatientController { return JsonResponse.newInstance().ok(selSearchCriteriaList); } - } diff --git a/tcm/src/main/java/com/ccsens/tcm/api/StatisticalAnalysisController.java b/tcm/src/main/java/com/ccsens/tcm/api/StatisticalAnalysisController.java index bb03a553..e247b0a3 100644 --- a/tcm/src/main/java/com/ccsens/tcm/api/StatisticalAnalysisController.java +++ b/tcm/src/main/java/com/ccsens/tcm/api/StatisticalAnalysisController.java @@ -40,4 +40,5 @@ public class StatisticalAnalysisController { log.info("统计每日病例调用完成"); return JsonResponse.newInstance().ok(countCase); } + } diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/dto/PatientDto.java b/tcm/src/main/java/com/ccsens/tcm/bean/dto/PatientDto.java index e3c1e534..26d7c502 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/dto/PatientDto.java +++ b/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("查询患者的搜索条件集合") diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/vo/PatientVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/PatientVo.java index be70637e..28b4e366 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/PatientVo.java +++ b/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("经过搜索条件查询的患者集合") 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 d8a2f68b..8c8681d6 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,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 list; + } + @Data + @ApiModel("病例分析详细数量") + public static class SelGroupList{ + private String contents; + private Integer nums; + } } 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 5c78d4a8..9a7a41d0 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java +++ b/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; } diff --git a/tcm/src/main/resources/application.yml b/tcm/src/main/resources/application.yml index 4ecd13fd..f59084b0 100644 --- a/tcm/src/main/resources/application.yml +++ b/tcm/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: common, util-dev + active: test + include: common, util-test diff --git a/tcm/src/main/resources/mapper_dao/PatientDao.xml b/tcm/src/main/resources/mapper_dao/PatientDao.xml index ccec55e1..47e59544 100644 --- a/tcm/src/main/resources/mapper_dao/PatientDao.xml +++ b/tcm/src/main/resources/mapper_dao/PatientDao.xml @@ -39,13 +39,15 @@ \ No newline at end of file