心理测试新增保存字段

xlcs-service/src/main/java/com/diagbot/entity/Option.java

@@ -0,0 +1,16 @@
+package com.diagbot.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2020/3/3 16:01
+ */
+@Getter
+@Setter
+public class Option {
+    private Boolean select;
+    private String name;
+}

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

@@ -13,15 +13,19 @@ import com.diagbot.service.impl.InquiryDetailServiceImpl;
 import com.diagbot.service.impl.InquiryInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.GsonUtil;
 import com.diagbot.util.HttpUtils;
 import com.diagbot.util.IdCard;
 import com.diagbot.util.IntegerUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.HospitalVO;
 import com.diagbot.vo.InquiryDetailVO;
 import com.diagbot.vo.InquiryPatInquiryVO;
 import com.diagbot.vo.InquiryPatVO;
+import com.diagbot.vo.SaveInquiryDetailVO;
 import com.diagbot.vo.SaveInquiryVO;
+import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -63,12 +67,12 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         }
 
         SaveInquiryDTO saveInquiryDTO = new SaveInquiryDTO();
-//        List<String> naliRetList = getUrl(saveInquiryVO);
-//        String retUrl = naliRetList.get(0);
-//        saveInquiryDTO.setBody(retUrl);
-//        saveInquiryDTO.setResponse(naliRetList.get(1));
-//        saveInquiryDTO.setRequest(naliRetList.get(2));
-//        saveInquiryDTO.setRequestBodys(naliRetList.get(3));
+        //        List<String> naliRetList = getUrl(saveInquiryVO);
+        //        String retUrl = naliRetList.get(0);
+        //        saveInquiryDTO.setBody(retUrl);
+        //        saveInquiryDTO.setResponse(naliRetList.get(1));
+        //        saveInquiryDTO.setRequest(naliRetList.get(2));
+        //        saveInquiryDTO.setRequestBodys(naliRetList.get(3));
 
         Date now = DateUtil.now();
         InquiryInfo inquiryInfo = null;
@@ -128,12 +132,18 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             );
         }
         Long id = inquiryInfo.getId();
-        List<InquiryDetail> inquiryDetailList = BeanUtil.listCopyTo(saveInquiryVO.getDetailList(), InquiryDetail.class);
-        inquiryDetailList.forEach(i -> {
-            i.setInquiryId(id);
-            i.setGmtCreate(now);
-            i.setGmtModified(now);
-        });
+        List<InquiryDetail> inquiryDetailList = Lists.newArrayList();
+        for (SaveInquiryDetailVO saveInquiryDetailVO : saveInquiryVO.getDetailList()) {
+            InquiryDetail inquiryDetail = new InquiryDetail();
+            BeanUtil.copyProperties(saveInquiryDetailVO, inquiryDetail);
+            inquiryDetail.setInquiryId(id);
+            inquiryDetail.setGmtCreate(now);
+            inquiryDetail.setGmtModified(now);
+            if (ListUtil.isNotEmpty(saveInquiryDetailVO.getOptions())) {
+                inquiryDetail.setRemark(GsonUtil.toJson(saveInquiryDetailVO.getOptions()));
+            }
+            inquiryDetailList.add(inquiryDetail);
+        }
         inquiryDetailService.saveBatch(inquiryDetailList);
 
         HospitalVO hospitalVO = new HospitalVO();

xlcs-service/src/main/java/com/diagbot/vo/SaveInquiryDetailVO.java

@@ -1,8 +1,11 @@
 package com.diagbot.vo;
 
+import com.diagbot.entity.Option;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * @author rengb
  * @Description
@@ -23,8 +26,8 @@ public class SaveInquiryDetailVO {
     private String answer;
 
     /**
-     * 答案明细
+     * 问题的选项答案，包含已选中的问题
      */
-    private String remark;
+    private List<Option> options;
 
 }