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 d5ff581d..537e543a 100644 --- a/tcm/src/main/java/com/ccsens/tcm/api/BiologicalSamplesController.java +++ b/tcm/src/main/java/com/ccsens/tcm/api/BiologicalSamplesController.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 @@ -50,4 +51,12 @@ public class BiologicalSamplesController { log.info("查询生物样本完成"); return JsonResponse.newInstance().ok(selBiologPageInfo); } + @MustLogin + @ApiOperation(value = "统计生物样本数量", notes = "w:统计每个医院的生物样本的数量") + @RequestMapping(value = "/selAllYBS", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> selAllYBS(){ + List selBiologNumsList=patientService.selAllYBS(); + return JsonResponse.newInstance().ok(selBiologNumsList); + } + } 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 4ffbd2a4..a1b078da 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 @@ -18,4 +18,14 @@ public class BiologicalSamplesVo { @ApiModelProperty("采集时间") private Integer collectTime; } + @Data + @ApiModel("统计医院生物样本数量") + public static class SelBiologNums{ + @ApiModelProperty("医院名称") + private String name; + @ApiModelProperty("医院id") + private Long id; + @ApiModelProperty("生物样本数量") + private Integer nums; + } } 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 edf12612..c0faf38a 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 @@ -22,8 +22,7 @@ public class StatisticVo { @ApiModel("每日统计的数量") public static class Shuliang{ @ApiModelProperty("时间") - @JsonFormat(pattern="yyyy-MM-dd") - private Date shijian; + private String shijian; @ApiModelProperty("数量") private Integer nums; } 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 78d00ba5..5a6e0b79 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 @@ -60,4 +60,6 @@ public interface PatientDao { List completeDoctor(@Param("hospitalId")Long hospitalId); List selBiologicalSamples(BiologicalSamplesDto.SelBiolog param); + + List selAllYBS(); } 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 f1594445..fd4b850b 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java @@ -60,4 +60,6 @@ public interface IPatientService { * @return 返回医院信息 */ HospitalVo.SelHospitalVo getHospitalByProjectId(Long projectId); + + List selAllYBS(); } 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 0163cb8e..671c8d43 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java @@ -354,4 +354,10 @@ public class PatientService implements IPatientService { } return selHospitalVo; } + + @Override + public List selAllYBS() { + List selBiologNumsList= patientDao.selAllYBS(); + return selBiologNumsList; + } } diff --git a/tcm/src/main/resources/mapper_dao/PatientDao.xml b/tcm/src/main/resources/mapper_dao/PatientDao.xml index 6a5d3927..9d43a8eb 100644 --- a/tcm/src/main/resources/mapper_dao/PatientDao.xml +++ b/tcm/src/main/resources/mapper_dao/PatientDao.xml @@ -343,4 +343,11 @@ and tbs.collect_time=#{collectTime} + \ No newline at end of file