diff --git a/tcm/src/main/java/com/ccsens/tcm/api/BiologicalSamplesController.java b/tcm/src/main/java/com/ccsens/tcm/api/BiologicalSamplesController.java index 537e543a..5f0b934f 100644 --- a/tcm/src/main/java/com/ccsens/tcm/api/BiologicalSamplesController.java +++ b/tcm/src/main/java/com/ccsens/tcm/api/BiologicalSamplesController.java @@ -58,5 +58,12 @@ public class BiologicalSamplesController { List selBiologNumsList=patientService.selAllYBS(); return JsonResponse.newInstance().ok(selBiologNumsList); } + @MustLogin + @ApiOperation(value = "统计某医院下得生物样本数量", notes = "w:统计某个医院的生物样本的数量") + @RequestMapping(value = "/selByHosAllYBS", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> selByHosAllYBS(@ApiParam @Validated @RequestBody QueryDto params){ + BiologicalSamplesVo.selByHosAllYBS selBiologNumsList=patientService.selByHosAllYBS(params.getParam().getHospitalId()); + return JsonResponse.newInstance().ok(selBiologNumsList); + } } diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/dto/BiologicalSamplesDto.java b/tcm/src/main/java/com/ccsens/tcm/bean/dto/BiologicalSamplesDto.java index fcec9c54..a431c55b 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/dto/BiologicalSamplesDto.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/dto/BiologicalSamplesDto.java @@ -24,6 +24,7 @@ public class BiologicalSamplesDto { @ApiModelProperty("采集时间") private Integer collectTime; } + @Data @ApiModel("查询生物样本-1007") public static class SelBiolog { @@ -32,15 +33,22 @@ public class BiologicalSamplesDto { @ApiModelProperty("样本类型 0:抗血凝10ml 1:促凝血5ml 2:晨尿10ml 3:24小时尿10ml") private Byte sampleType; @ApiModelProperty("患者住院号") - private String hospitalization; + private String hospitalization; @ApiModelProperty("采集时间") private Integer collectTime; @Min(1) @ApiModelProperty("当前页") - private Integer pageNum=1; + private Integer pageNum = 1; @Min(1) @Max(20) @ApiModelProperty("每页数量") - private Integer pageSize=10; + private Integer pageSize = 10; + } + @Data + @ApiModel("根据医院id查询生物样本得数量统计") + public static class SelHosId { + @NotNull + @ApiModelProperty("医院id") + private Long hospitalId; } } 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 f168bd47..b67cde28 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 @@ -31,16 +31,8 @@ public class StatisticDto { @Data @ApiModel("每日病例统计传参") public static class SelCount{ - @ApiModelProperty("主治大夫id") - private Long userId; @ApiModelProperty("医院id") private Long hospitalId; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - @ApiModelProperty("开始时间") - private Date startDate; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - @ApiModelProperty("结束时间") - private Date endDate; } @Data @ApiModel("病例分析传参") diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/vo/BiologicalSamplesVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/BiologicalSamplesVo.java index a1b078da..2a783f55 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/BiologicalSamplesVo.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/vo/BiologicalSamplesVo.java @@ -28,4 +28,16 @@ public class BiologicalSamplesVo { @ApiModelProperty("生物样本数量") private Integer nums; } + @Data + @ApiModel("统计某医院医院生物样本数量") + public static class selByHosAllYBS{ + @ApiModelProperty("抗血凝10ml") + private Integer kxn; + @ApiModelProperty("促凝血5ml") + private Integer cxn; + @ApiModelProperty("晨尿10ml") + private Integer cn; + @ApiModelProperty("24小时尿10ml") + private Integer xsn; + } } 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 119baa34..956f23c4 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 @@ -68,4 +68,6 @@ public interface PatientDao { List selPatientProgress(Long userId); List stringLists(Long testQuestionsId); + + BiologicalSamplesVo.selByHosAllYBS selByHosAllYBS(@Param("id") Long id); } 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 0ae95eda..c9d1299e 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java @@ -78,4 +78,6 @@ public interface IPatientService { List selPatientProgress(Long userId); List stringLists(Long testQuestionsId); + + BiologicalSamplesVo.selByHosAllYBS selByHosAllYBS(Long id); } 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 a998098b..8e26868c 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java @@ -263,7 +263,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)); + selCountS.setOverNums(patientDao.countCase(param,(byte)2)); return selCountS; } @@ -414,5 +414,10 @@ public class PatientService implements IPatientService { return stringList; } + @Override + public BiologicalSamplesVo.selByHosAllYBS selByHosAllYBS(Long id) { + return patientDao.selByHosAllYBS(id); + } + } diff --git a/tcm/src/main/resources/mapper_dao/PatientDao.xml b/tcm/src/main/resources/mapper_dao/PatientDao.xml index 4a1771b6..76b77606 100644 --- a/tcm/src/main/resources/mapper_dao/PatientDao.xml +++ b/tcm/src/main/resources/mapper_dao/PatientDao.xml @@ -110,6 +110,7 @@ ) t ) + order by tpi.update_at desc + \ No newline at end of file