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 6adf5922..5feec3c1 100644 --- a/tcm/src/main/java/com/ccsens/tcm/api/StatisticalAnalysisController.java +++ b/tcm/src/main/java/com/ccsens/tcm/api/StatisticalAnalysisController.java @@ -45,11 +45,15 @@ public class StatisticalAnalysisController { @MustLogin @ApiOperation(value = "病例分析", notes = "w:病例分析") @RequestMapping(value = "/countAnalysis", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse> countAnalysis(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse countAnalysis(@ApiParam @Validated @RequestBody QueryDto params) { log.info("病例分析参数:{}", params); + List stringLists=patientService.stringLists(params.getParam().getTestQuestionsId()); List selGroupNum = patientService.countAnalysis(params.getParam(), params.getUserId()); + StatisticVo.SelGroupNumAdd selGroupNumAdd=new StatisticVo.SelGroupNumAdd(); + selGroupNumAdd.setSelGroupNums(selGroupNum); + selGroupNumAdd.setStringList(stringLists); log.info("病例分析调用完成"); - return JsonResponse.newInstance().ok(selGroupNum); + return JsonResponse.newInstance().ok(selGroupNumAdd); } @MustLogin 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 e781ab2f..54fe2aad 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 @@ -26,6 +26,16 @@ public class StatisticVo { @ApiModelProperty("数量") private Integer nums; } + + @Data + @ApiModel("病例分析-增加一个字段") + public static class SelGroupNumAdd{ + @ApiModelProperty("病例分析") + private List selGroupNums; + @ApiModelProperty("所有得内容分类") + private List stringList; + } + @Data @ApiModel("病例分析") public static class SelGroupNum{ @@ -41,6 +51,8 @@ public class StatisticVo { private String content; @ApiModelProperty("数量") private Integer nums; + @ApiModelProperty("对照组名称") + private String name; } @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 567ec986..86c79f64 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 @@ -66,4 +66,6 @@ public interface PatientDao { List adjacentTasks(StatisticDto.RecentAnalysisDto param,Long userId); List selPatientProgress(Long userId); + + List stringLists(Long testQuestionsId); } 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 3fa56136..5efe920f 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java @@ -67,4 +67,6 @@ public interface IPatientService { PageInfo adjacentTasks(StatisticDto.RecentAnalysisDto param,Long userId); List selPatientProgress(Long userId); + + List stringLists(Long testQuestionsId); } 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 64cc44d4..7adf1e8b 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java @@ -2,6 +2,7 @@ package com.ccsens.tcm.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.ObjectUtil; import com.ccsens.tcm.bean.dto.BiologicalSamplesDto; import com.ccsens.tcm.bean.dto.ConRecDto; import com.ccsens.tcm.bean.dto.PatientDto; @@ -265,6 +266,11 @@ public class PatientService implements IPatientService { public List countAnalysis(StatisticDto.SelBinLCount param, Long userId) { List selGroupNumsList= new ArrayList(); if(param.getInpatientId()!=null && param.getInpatientId().length==0) { + StatisticVo.SelGroupNum selGroupNum =new StatisticVo.SelGroupNum(); + List selGroupList= patientDao.countAnalysis(param.getConditionList(),param.getConditionListDate(),null,param.getTestQuestionsId(),param.getHospitalization(),param.getInputStatus(),param.getHospitalId()); + selGroupNum.setInpatientId(null); + selGroupNum.setList(selGroupList); + selGroupNumsList.add(selGroupNum); return selGroupNumsList; } for (int i = 0; i < param.getInpatientId().length; i++) { @@ -390,5 +396,16 @@ public class PatientService implements IPatientService { return patientDao.selPatientProgress(userId); } + @Override + public List stringLists(Long testQuestionsId) { + List stringList=Arrays.asList(); + if(ObjectUtil.isNotNull(testQuestionsId)){ + stringList= patientDao.stringLists(testQuestionsId); + }else { + stringList.add("总人数"); + } + return stringList; + } + } diff --git a/tcm/src/main/resources/mapper_dao/PatientDao.xml b/tcm/src/main/resources/mapper_dao/PatientDao.xml index fc9b6cf7..51c9e569 100644 --- a/tcm/src/main/resources/mapper_dao/PatientDao.xml +++ b/tcm/src/main/resources/mapper_dao/PatientDao.xml @@ -162,10 +162,11 @@ + \ No newline at end of file