心理健康历史记录

docs/032.20200225心理健康猜测试初始化脚本/xlcs20200304.sql

@@ -1,3 +1,5 @@
+use `sys-xlcs`;
+
 ALTER TABLE `xlcs_inquiry_info`
 ADD COLUMN `anxiety_range` varchar(1024) NOT NULL DEFAULT '' COMMENT '焦虑症分段说明' after `anxiety_point`;
 

xlcs-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -9,6 +9,7 @@ import com.diagbot.entity.Client;
 import com.diagbot.entity.InquiryDetail;
 import com.diagbot.entity.InquiryInfo;
 import com.diagbot.entity.JSONResponseBean;
+import com.diagbot.entity.Option;
 import com.diagbot.entity.Request;
 import com.diagbot.entity.Response;
 import com.diagbot.enums.IdTypeEnum;
@@ -32,6 +33,7 @@ import com.diagbot.vo.InquiryPatInquiryVO;
 import com.diagbot.vo.InquiryPatVO;
 import com.diagbot.vo.SaveInquiryDetailVO;
 import com.diagbot.vo.SaveInquiryVO;
+import com.diagbot.web.GetInquiryDetailDTO;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -190,17 +192,29 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         return this.getPatInquiryList(inquiryPatInquiryVO);
     }
 
-    public List<InquiryDTO> getInquirysByMech(InquiryMechVO inquiryMechVO){
+    public List<InquiryDTO> getInquirysByMech(InquiryMechVO inquiryMechVO) {
         return this.getInquirysByMechId(inquiryMechVO);
     }
 
-    public List<InquiryDetail> getDetail(InquiryDetailVO inquiryDetailVO) {
+    public List<GetInquiryDetailDTO> getDetail(InquiryDetailVO inquiryDetailVO) {
         List<InquiryDetail> list = inquiryDetailFacade.list(new QueryWrapper<InquiryDetail>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("inquiry_id", inquiryDetailVO.getId())
                 .orderByAsc("id")
         );
-        return list;
+
+        List<GetInquiryDetailDTO> resList = new ArrayList<>();
+        if (ListUtil.isNotEmpty(list)) {
+            for (InquiryDetail inquiryDetail : list) {
+                GetInquiryDetailDTO getInquiryDetailDTO = new GetInquiryDetailDTO();
+                BeanUtil.copyProperties(inquiryDetail, getInquiryDetailDTO);
+                if (StringUtil.isNotBlank(inquiryDetail.getRemark())) {
+                    getInquiryDetailDTO.setOptions(GsonUtil.toList(inquiryDetail.getRemark(), Option.class));
+                }
+                resList.add(getInquiryDetailDTO);
+            }
+        }
+        return resList;
     }
 
 

xlcs-service/src/main/java/com/diagbot/web/GetInquiryDetailDTO.java

@@ -0,0 +1,33 @@
+package com.diagbot.web;
+
+import com.diagbot.entity.Option;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/2/28 15:46
+ */
+@Getter
+@Setter
+public class GetInquiryDetailDTO {
+
+    /**
+     * 问题
+     */
+    private String question;
+
+    /**
+     * 答案
+     */
+    private String answer;
+
+    /**
+     * 题目选项
+     */
+    private List<Option> options;
+
+}

xlcs-service/src/main/java/com/diagbot/web/InquiryInfoController.java

@@ -97,8 +97,8 @@ public class InquiryInfoController {
             notes = "id：病历id<br>")
     @PostMapping("/getDetailById")
     @SysLogger("getDetailById")
-    public RespDTO<List<InquiryDetail>> getDetail(@RequestBody InquiryDetailVO inquiryDetailVO) {
-        List<InquiryDetail> data = inquiryInfoFacade.getDetail(inquiryDetailVO);
+    public RespDTO<List<GetInquiryDetailDTO>> getDetail(@RequestBody InquiryDetailVO inquiryDetailVO) {
+        List<GetInquiryDetailDTO> data = inquiryInfoFacade.getDetail(inquiryDetailVO);
         return RespDTO.onSuc(data);
     }
 }