纳里对接加参修改

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

@@ -47,10 +47,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 
     public SaveInquiryDTO saveInquiry(SaveInquiryVO saveInquiryVO) {
         SaveInquiryDTO saveInquiryDTO = new SaveInquiryDTO();
-        String retUrl = null;
-        if (saveInquiryVO.getFrom().equals("1")){
-            retUrl = getUrl(saveInquiryVO);
-        }
+        String retUrl = getUrl(saveInquiryVO);
         Date now = DateUtil.now();
 
         InquiryInfo inquiryInfo = new InquiryInfo();
@@ -98,6 +95,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             Map<String, Object> detail = new HashMap<>();
             detail.put("question", i.getQuestion());
             detail.put("answer", i.getAnswer());
+            detail.put("options", i.getOptions());
             details.add(detail);
         });
 
@@ -106,6 +104,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         body.put("doctorId", Integer.parseInt(saveInquiryVO.getDoctorId()));
         body.put("mpiId", saveInquiryVO.getMpiId());
         body.put("appId", saveInquiryVO.getAppId());
+        body.put("fromId", saveInquiryVO.getFromId());
+        body.put("sources", "langtong");
         if (saveInquiryVO.getDepartment().indexOf("全科") != -1) {
             body.put("diagnosis", saveInquiryVO.getDiagnosis());
         }

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

@@ -3,6 +3,8 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * @author rengb
  * @Description
@@ -22,5 +24,10 @@ public class SaveInquiryDetailVO {
      */
     private String answer;
 
+    /**
+     * 问题的选项答案，包含已选中的问题
+     */
+    private List<String> options;
+
 
 }

znwz-service/src/main/java/com/diagbot/vo/SaveInquiryVO.java

@@ -97,10 +97,11 @@ public class SaveInquiryVO {
     private List<SaveInquiryDetailVO> detailList;
 
     /**
-     * 链接来源 (1:问诊2;挂号)
+     * 链接来源 菜单问诊from=1，菜单挂号from=2，公众号问诊from=3
      */
-    @ApiModelProperty(value = "链接来源 (1:问诊2;挂号) ")
-    private String from = "1";
+    @ApiModelProperty(value = "链接来源 菜单问诊from=1，菜单挂号from=2，公众号问诊from=3", required = true)
+    @NotBlank(message = "链接来源必传")
+    private String fromId;
 
 
 }