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 19020bb9..bf9c038e 100644 --- a/tcm/src/main/java/com/ccsens/tcm/api/StatisticalAnalysisController.java +++ b/tcm/src/main/java/com/ccsens/tcm/api/StatisticalAnalysisController.java @@ -59,9 +59,9 @@ public class StatisticalAnalysisController { @MustLogin @ApiOperation(value = "统计病例的完成情况", notes = "zy:") @RequestMapping(value = "/complete", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse statisticsComplete(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse> statisticsComplete(@ApiParam @Validated @RequestBody QueryDto params) { log.info("统计病例的完成情况:{}",params); - StatisticVo.StatisticsComplete statisticsComplete = patientService.statisticsComplete(params.getParam()); + List statisticsComplete = patientService.statisticsComplete(params.getParam()); log.info("查找统计病例的完成情况"); return JsonResponse.newInstance().ok(statisticsComplete); } 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 3c6edc7a..6ab392ac 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 @@ -60,16 +60,12 @@ public class StatisticVo { @Data @ApiModel("统计病例的完成情况") public static class StatisticsComplete{ - @ApiModelProperty("已完成") - private Integer completed; - @ApiModelProperty("未完成") - private Integer unfinished; - @ApiModelProperty("进行中") - private Integer underway; - @ApiModelProperty("数据采集超时") - private Integer overtime; - @ApiModelProperty("废弃的") - private Integer discarded; + @ApiModelProperty("输入状态") + private Byte id; + @ApiModelProperty("新建") + private String name; + @ApiModelProperty("数量") + private Integer nums; } @Data 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 212fec73..1158faaa 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 @@ -45,7 +45,7 @@ public interface PatientDao { * @param userId 主治医生id * @return 返回完成情况 */ - StatisticVo.StatisticsComplete statisticsComplete(@Param("hospitalId")Long hospitalId, @Param("userId")Long userId); + List statisticsComplete(@Param("hospitalId")Long hospitalId, @Param("userId")Long userId); /** * 查询各个医院的病例完成情况 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 46b471d0..8ec3feb2 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java @@ -43,7 +43,7 @@ public interface IPatientService { * @param param 搜索的条件 * @return 返回完成的情况 */ - StatisticVo.StatisticsComplete statisticsComplete(StatisticDto.Complete param); + List statisticsComplete(StatisticDto.Complete param); /** * 统计各个医院的病例完成情况 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 b3f69bd8..acc0f559 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java @@ -308,7 +308,7 @@ public class PatientService implements IPatientService { * 统计病例完成情况 */ @Override - public StatisticVo.StatisticsComplete statisticsComplete(StatisticDto.Complete param) { + public List statisticsComplete(StatisticDto.Complete param) { return patientDao.statisticsComplete(param.getHospitalId(),param.getUserId()); } @@ -347,7 +347,7 @@ public class PatientService implements IPatientService { @Override public PageInfo selBiologicalSamples(BiologicalSamplesDto.SelBiolog param, Long userId) { - PageHelper.startPage(param.getPageNum(),param.getPageSize()); + PageHelper.startPage(param.getPageNum(),param.getPageSize(),"tbs.update_at desc"); List selBiologs= patientDao.selBiologicalSamples(param); return new PageInfo<>(selBiologs); } diff --git a/tcm/src/main/resources/mapper_dao/PatientDao.xml b/tcm/src/main/resources/mapper_dao/PatientDao.xml index ab24d684..ed90bd3e 100644 --- a/tcm/src/main/resources/mapper_dao/PatientDao.xml +++ b/tcm/src/main/resources/mapper_dao/PatientDao.xml @@ -309,16 +309,17 @@