From 53714f8deee0b21a345606dd12a5e56bfb034494 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Tue, 2 Feb 2021 18:04:50 +0800 Subject: [PATCH] =?UTF-8?q?20210202=E7=BB=9F=E8=AE=A1=E6=AF=8F=E4=B8=AA?= =?UTF-8?q?=E5=8C=BB=E9=99=A2=E7=9A=84=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/StatisticalAnalysisController.java | 21 ++++++++++++++ .../com/ccsens/tcm/bean/dto/StatisticDto.java | 18 ++++++++++++ .../com/ccsens/tcm/bean/vo/StatisticVo.java | 19 +++++++++++++ .../ccsens/tcm/persist/dao/PatientDao.java | 6 ++++ .../ccsens/tcm/service/IPatientService.java | 6 ++++ .../ccsens/tcm/service/PatientService.java | 9 ++++++ .../main/resources/mapper_dao/PatientDao.xml | 28 +++++++++++++++++++ 7 files changed, 107 insertions(+) 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 b5f6391a..863fb40e 100644 --- a/tcm/src/main/java/com/ccsens/tcm/api/StatisticalAnalysisController.java +++ b/tcm/src/main/java/com/ccsens/tcm/api/StatisticalAnalysisController.java @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; /** * @author wang @@ -52,4 +53,24 @@ public class StatisticalAnalysisController { log.info("查找统计病例的完成情况"); return JsonResponse.newInstance().ok(statisticsComplete); } + + @MustLogin + @ApiOperation(value = "统计每个医院的完成情况", notes = "zy:") + @RequestMapping(value = "/hospital/complete", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse completeHospital(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("统计每个医院的完成情况：{}",params); + List completeHospital = patientService.completeHospital(); + log.info("查找每个医院的病例完成情况"); + return JsonResponse.newInstance().ok(completeHospital); + } + +// @MustLogin +// @ApiOperation(value = "统计医生的病例的完成情况", notes = "zy:") +// @RequestMapping(value = "/doctor/complete", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) +// public JsonResponse completeDoctor(@ApiParam @Validated @RequestBody QueryDto params) { +// log.info("统计每个医院的完成情况：{}",params); +// List completeHospital = patientService.completeHospital(); +// log.info("查找每个医院的病例完成情况"); +// return JsonResponse.newInstance().ok(completeHospital); +// } } diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/dto/StatisticDto.java b/tcm/src/main/java/com/ccsens/tcm/bean/dto/StatisticDto.java index f8f794f2..66c8f763 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/dto/StatisticDto.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/dto/StatisticDto.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; import java.util.Date; @Data @@ -31,4 +32,21 @@ public class StatisticDto { @ApiModelProperty("主治大夫id 为空则查询全部") private Long userId; } + + @Data + @ApiModel("查看医院的的病例完成情况") + public static class CompleteHospital{ + @ApiModelProperty("主治大夫id 为空则查询全部") + private Long userId; + } + + @Data + @ApiModel("查看医院下的医生的病例完成情况") + public static class CompleteDoctor{ + @NotNull(message = "医院id不能为空") + @ApiModelProperty("医院id") + private Long hospitalId; + @ApiModelProperty("主治大夫id 为空则查询全部") + private Long userId; + } } 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 5e85fbcf..793c663b 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 @@ -43,4 +43,23 @@ public class StatisticVo { @ApiModelProperty("废弃的") private Integer discarded; } + + @Data + @ApiModel("医院的的病例完成情况") + public static class CompleteHospital{ + @ApiModelProperty("医院id") + private Long hospitalId; + @ApiModelProperty("医院名") + private String hospitalName; + @ApiModelProperty("已完成") + private Integer completed; + @ApiModelProperty("未完成") + private Integer unfinished; + @ApiModelProperty("进行中") + private Integer underway; + @ApiModelProperty("数据采集超时") + private Integer overtime; + @ApiModelProperty("废弃的") + private Integer discarded; + } } 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 e3e2328c..a0eee0b7 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 @@ -31,4 +31,10 @@ public interface PatientDao { * @return 返回完成情况 */ StatisticVo.StatisticsComplete statisticsComplete(@Param("hospitalId")Long hospitalId, @Param("userId")Long userId); + + /** + * 查询各个医院的病例完成情况 + * @return 返回完成情况按医院分组 + */ + List completeHospital(); } diff --git a/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java b/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java index 27407f06..1256d8cd 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java @@ -35,4 +35,10 @@ public interface IPatientService { * @return 返回完成的情况 */ StatisticVo.StatisticsComplete statisticsComplete(StatisticDto.Complete param); + + /** + * 统计各个医院的病例完成情况 + * @return 返回每个医院的名字和 + */ + List completeHospital(); } 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 fa5cca1e..62d5bc5f 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java @@ -235,4 +235,13 @@ public class PatientService implements IPatientService { public StatisticVo.StatisticsComplete statisticsComplete(StatisticDto.Complete param) { return patientDao.statisticsComplete(param.getHospitalId(),param.getUserId()); } + + /** + * 查看各个医院的病例完成情况 + */ + @Override + public List completeHospital() { + + return patientDao.completeHospital(); + } } diff --git a/tcm/src/main/resources/mapper_dao/PatientDao.xml b/tcm/src/main/resources/mapper_dao/PatientDao.xml index a5cc9b71..a3d6c70b 100644 --- a/tcm/src/main/resources/mapper_dao/PatientDao.xml +++ b/tcm/src/main/resources/mapper_dao/PatientDao.xml @@ -155,4 +155,32 @@ input_status ) t + \ No newline at end of file