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] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=89=80=E6=9C=89=E8=AF=95?= =?UTF-8?q?=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