From ee67aea3bbe877045939cc93aac07bf9720c7a85 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Thu, 25 Feb 2021 09:47:46 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8B=89=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tcm/src/main/java/com/ccsens/tcm/api/QuestionController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/tcm/src/main/java/com/ccsens/tcm/api/QuestionController.java b/tcm/src/main/java/com/ccsens/tcm/api/QuestionController.java index c3b231d9..453de3c8 100644 --- a/tcm/src/main/java/com/ccsens/tcm/api/QuestionController.java +++ b/tcm/src/main/java/com/ccsens/tcm/api/QuestionController.java @@ -55,4 +55,5 @@ public class QuestionController { return JsonResponse.newInstance().ok(patientCodes); } + } From 10747ea88fd54fe090604a47b12f3205030ae767 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Thu, 25 Feb 2021 11:41:41 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=89=80=E6=9C=89?= =?UTF-8?q?=E8=AF=95=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/tcm/api/QuestionController.java | 9 +++ .../com/ccsens/tcm/bean/vo/QuestionVo.java | 31 +++++++- .../ccsens/tcm/persist/dao/QuestionDao.java | 8 ++ .../ccsens/tcm/service/IQuestionService.java | 1 + .../ccsens/tcm/service/QuestionService.java | 16 ++++ tcm/src/main/resources/application.yml | 4 +- .../main/resources/mapper_dao/QuestionDao.xml | 74 +++++++++++++++++++ 7 files changed, 140 insertions(+), 3 deletions(-) diff --git a/tcm/src/main/java/com/ccsens/tcm/api/QuestionController.java b/tcm/src/main/java/com/ccsens/tcm/api/QuestionController.java index 453de3c8..104226ff 100644 --- a/tcm/src/main/java/com/ccsens/tcm/api/QuestionController.java +++ b/tcm/src/main/java/com/ccsens/tcm/api/QuestionController.java @@ -2,6 +2,7 @@ package com.ccsens.tcm.api; import com.ccsens.tcm.bean.dto.CodeVo; import com.ccsens.tcm.bean.dto.QuestionDto; +import com.ccsens.tcm.bean.po.Question; import com.ccsens.tcm.bean.vo.QuestionVo; import com.ccsens.tcm.service.IImportService; import com.ccsens.tcm.service.IQuestionService; @@ -54,6 +55,14 @@ public class QuestionController { log.info("查看试题及患者的答案成功"); return JsonResponse.newInstance().ok(patientCodes); } + @ApiOperation(value = "查询所有得题目的类型和题目相关信息",notes = "1007:查询所有试题") + @RequestMapping(value="/queryQuestion",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryQuestion() throws Exception { + log.info("查询所有试题:{}"); + List subjectLists = questionService.queryQuestion(); + log.info("查询所有试题"); + return JsonResponse.newInstance().ok(subjectLists); + } } diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java index ac5c94ed..da35ee80 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java @@ -80,7 +80,36 @@ public class QuestionVo { @ApiModelProperty("选择之后关联的题目") private List questionVos; } - + @Data + @ApiModel("所有试题类型的信息") + public static class subjectLists{ + @ApiModelProperty("id") + private Long id; + @ApiModelProperty("code") + private String code; + @ApiModelProperty("名称") + private String name; + @ApiModelProperty("题目信息") + private List questiTonVos; + @ApiModelProperty("子类型") + private List optionVos; + } + @Data + @ApiModel("某类型下的题目信息") + public static class TopictQuestion{ + @ApiModelProperty("id") + private Long id; + @ApiModelProperty("题目名称") + private String question; + @ApiModelProperty("排序") + private int sort; + @ApiModelProperty("单位例如 g/L") + private String units; + @ApiModelProperty("类型 1单行文本,2多行文本,3单选,4多选,5下拉菜单,6日期,7图片(文件),8单选+其他，9多选+其他，10下拉+其他，11多选+其他+说明，12单选+关联其他内容 13数字类型") + private byte type; + @ApiModelProperty("备注") + private String remark; + } @Data @ApiModel("患者信息的试题类型") public static class PatientCode { diff --git a/tcm/src/main/java/com/ccsens/tcm/persist/dao/QuestionDao.java b/tcm/src/main/java/com/ccsens/tcm/persist/dao/QuestionDao.java index a3cc94fd..0a919924 100644 --- a/tcm/src/main/java/com/ccsens/tcm/persist/dao/QuestionDao.java +++ b/tcm/src/main/java/com/ccsens/tcm/persist/dao/QuestionDao.java @@ -50,4 +50,12 @@ public interface QuestionDao extends QuestionMapper { * @return 返回所有试题和答题记录 */ List getQuestionByOptionId(@Param("optionId")Long optionId, @Param("patientId")Long patientId, @Param("nums")Integer nums); + + /** + * 查询所有的试题的相关信息 + * @return + */ + List queryQuestion(); + + List queryQuestion1(); } diff --git a/tcm/src/main/java/com/ccsens/tcm/service/IQuestionService.java b/tcm/src/main/java/com/ccsens/tcm/service/IQuestionService.java index 3b804a62..bb4bdb92 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/IQuestionService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/IQuestionService.java @@ -16,4 +16,5 @@ public interface IQuestionService { */ List getQuestionAndAnswer(QuestionDto.QueryQuestionAndAnswer param); + List queryQuestion(); } diff --git a/tcm/src/main/java/com/ccsens/tcm/service/QuestionService.java b/tcm/src/main/java/com/ccsens/tcm/service/QuestionService.java index e9bdd954..bc73a433 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/QuestionService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/QuestionService.java @@ -55,4 +55,20 @@ public class QuestionService implements IQuestionService{ return patientCodeList; } + @Override + public List queryQuestion() { + List subjectLists= questionDao.queryQuestion(); + List subjectLists1= questionDao.queryQuestion1(); + if(subjectLists1.size()>0){ + subjectLists1.forEach(subjectLists2 -> { + for (int i = 0; i < subjectLists.size(); i++) { + if(subjectLists.get(i).getId().equals(subjectLists2.getId())){ + subjectLists.get(i).setQuestiTonVos(subjectLists2.getQuestiTonVos()); + } + } + }); + } + return subjectLists; + } + } diff --git a/tcm/src/main/resources/application.yml b/tcm/src/main/resources/application.yml index f59084b0..4ecd13fd 100644 --- a/tcm/src/main/resources/application.yml +++ b/tcm/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev diff --git a/tcm/src/main/resources/mapper_dao/QuestionDao.xml b/tcm/src/main/resources/mapper_dao/QuestionDao.xml index e9d29431..9e0cceb9 100644 --- a/tcm/src/main/resources/mapper_dao/QuestionDao.xml +++ b/tcm/src/main/resources/mapper_dao/QuestionDao.xml @@ -211,5 +211,79 @@ q.rec_status = 0 and q.relevance_option_id = #{optionId} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 85bff6fb3cadf78de1267d5621d3e334719806f1 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Thu, 25 Feb 2021 16:24:42 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AF=95=E9=A2=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/tcm/bean/vo/QuestionVo.java | 18 ---------- .../ccsens/tcm/service/QuestionService.java | 9 +++-- tcm/src/main/resources/application.yml | 4 +-- .../main/resources/mapper_dao/QuestionDao.xml | 34 ++++++------------- 4 files changed, 18 insertions(+), 47 deletions(-) diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java index da35ee80..a7f1e166 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java @@ -89,28 +89,10 @@ public class QuestionVo { private String code; @ApiModelProperty("名称") private String name; - @ApiModelProperty("题目信息") - private List questiTonVos; @ApiModelProperty("子类型") private List optionVos; } @Data - @ApiModel("某类型下的题目信息") - public static class TopictQuestion{ - @ApiModelProperty("id") - private Long id; - @ApiModelProperty("题目名称") - private String question; - @ApiModelProperty("排序") - private int sort; - @ApiModelProperty("单位例如 g/L") - private String units; - @ApiModelProperty("类型 1单行文本,2多行文本,3单选,4多选,5下拉菜单,6日期,7图片(文件),8单选+其他，9多选+其他，10下拉+其他，11多选+其他+说明，12单选+关联其他内容 13数字类型") - private byte type; - @ApiModelProperty("备注") - private String remark; - } - @Data @ApiModel("患者信息的试题类型") public static class PatientCode { @ApiModelProperty("id") diff --git a/tcm/src/main/java/com/ccsens/tcm/service/QuestionService.java b/tcm/src/main/java/com/ccsens/tcm/service/QuestionService.java index bc73a433..082094f5 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/QuestionService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/QuestionService.java @@ -57,13 +57,16 @@ public class QuestionService implements IQuestionService{ @Override public List queryQuestion() { + // List subjectLists= questionDao.queryQuestion(); + + List subjectLists1= questionDao.queryQuestion1(); if(subjectLists1.size()>0){ - subjectLists1.forEach(subjectLists2 -> { + subjectLists1.forEach(subject1 -> { for (int i = 0; i < subjectLists.size(); i++) { - if(subjectLists.get(i).getId().equals(subjectLists2.getId())){ - subjectLists.get(i).setQuestiTonVos(subjectLists2.getQuestiTonVos()); + if(subjectLists.get(i).getId().equals(subject1.getId())){ + subjectLists.get(i).getOptionVos().addAll(subject1.getOptionVos()); } } }); diff --git a/tcm/src/main/resources/application.yml b/tcm/src/main/resources/application.yml index 4ecd13fd..f59084b0 100644 --- a/tcm/src/main/resources/application.yml +++ b/tcm/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: common, util-dev + active: test + include: common, util-test diff --git a/tcm/src/main/resources/mapper_dao/QuestionDao.xml b/tcm/src/main/resources/mapper_dao/QuestionDao.xml index 9e0cceb9..f1bdb052 100644 --- a/tcm/src/main/resources/mapper_dao/QuestionDao.xml +++ b/tcm/src/main/resources/mapper_dao/QuestionDao.xml @@ -217,15 +217,11 @@ - - - + + + - - - - - + @@ -238,11 +234,7 @@ trc1.`code` AS code1, trc1.`name` AS name1, tq.id AS id2, - tq.question, - tq.sort, - tq.units, - tq.type, - tq.remark + tq.question FROM t_report_code trc LEFT JOIN t_report_code trc1 ON trc1.parent_code = trc.CODE @@ -253,18 +245,15 @@ WHERE trc.LEVEL = 1 AND trc.rec_status =0 + order by trc.sort,trc1.sort,tq.sort - + - - - - - + \ No newline at end of file From 2fb12aba8d1fc6790611c584f8ad26e50e344344 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Thu, 25 Feb 2021 17:44:27 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tcm/api/StatisticalAnalysisController.java | 8 ++++++-- .../com/ccsens/tcm/bean/vo/StatisticVo.java | 12 ++++++++++++ .../com/ccsens/tcm/persist/dao/PatientDao.java | 2 ++ .../com/ccsens/tcm/service/IPatientService.java | 2 ++ .../com/ccsens/tcm/service/PatientService.java | 17 +++++++++++++++++ .../main/resources/mapper_dao/PatientDao.xml | 11 +++++++++-- 6 files changed, 48 insertions(+), 4 deletions(-) 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 From d320f55f75b2bb613c88cb2fb66f0e5834bf8fb0 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Thu, 25 Feb 2021 17:55:19 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tcm/src/main/java/com/ccsens/tcm/service/PatientService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7adf1e8b..0163fcf9 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java @@ -398,7 +398,7 @@ public class PatientService implements IPatientService { @Override public List stringLists(Long testQuestionsId) { - List stringList=Arrays.asList(); + List stringList=new ArrayList(); if(ObjectUtil.isNotNull(testQuestionsId)){ stringList= patientDao.stringLists(testQuestionsId); }else {