心理测试对接

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

@@ -176,8 +176,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 
         //邵逸夫医院 心理测试 对接纳里时，返回url
         if (saveInquiryVO.getHospitalCode().equals("邵逸夫医院")
-                && saveInquiryVO.getFrom().equals("5")
-                && saveInquiryVO.getSources().equals("纳里")) {
+                && saveInquiryVO.getFrom().equals("6")
+                && saveInquiryVO.getSource().equals("纳里")) {
             List<String> naliRetList = getUrl(saveInquiryVO);
             String retUrl = naliRetList.get(0);
             saveInquiryDTO.setBody(retUrl);
@@ -359,7 +359,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         body.put("appId", saveInquiryVO.getAppId());
         body.put("fromId", saveInquiryVO.getFrom());
         body.put("sources", "langtong");
-        body.put("inquiryId", saveInquiryVO.getInquiryId());
+        /*body.put("inquiryId", saveInquiryVO.getInquiryId());
         body.put("anxietyPoint", saveInquiryVO.getAnxietyPoint());
         body.put("anxietyRange", saveInquiryVO.getAnxietyRange());
         body.put("anxietyJudge", saveInquiryVO.getAnxietyJudge());
@@ -367,7 +367,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         body.put("depressionPoint", saveInquiryVO.getDepressionPoint());
         body.put("depressionRange", saveInquiryVO.getDepressionRange());
         body.put("depressionJudge", saveInquiryVO.getDepressionJudge());
-        body.put("depressionAdvise", saveInquiryVO.getDepressionAdvise());
+        body.put("depressionAdvise", saveInquiryVO.getDepressionAdvise());*/
 
         String diagnosis = "";
         diagnosis += saveInquiryVO.getAnxietyJudge() + "(" + saveInquiryVO.getAnxietyPoint() + ")" + System.lineSeparator();
@@ -375,13 +375,18 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         diagnosis += System.lineSeparator();
         diagnosis += saveInquiryVO.getDepressionJudge() + "(" + saveInquiryVO.getDepressionPoint() + ")" + System.lineSeparator();
         diagnosis += saveInquiryVO.getDepressionAdvise() + System.lineSeparator();
+        body.put("diagnosis", diagnosis);
 
         body.put("doctorName", saveInquiryVO.getDoctorName());
         body.put("organName", saveInquiryVO.getOrganName());
         body.put("doctorId", saveInquiryVO.getDoctorId());
         body.put("department", saveInquiryVO.getDepartment());
-
-        body.put("diagnosis", diagnosis);
+        body.put("patientName", saveInquiryVO.getPatName());
+        body.put("patientAge", saveInquiryVO.getPatAge());
+        body.put("patientSex", saveInquiryVO.getPatientSex());
+        body.put("supplement", "");
+        body.put("pushList", Lists.newArrayList());
+        body.put("inquiryId", -1);
 
         bodyList.add(body);
 

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

@@ -83,7 +83,7 @@ public class SaveInquiryVO {
     @ApiModelProperty(value = "机器Id")
     private String machineId;
 
-    @ApiModelProperty(value = "链接来源 菜单问诊from=1，菜单挂号from=2，公众号问诊from=3，当日挂号from=4，心理测试from=5", required = true)
+    @ApiModelProperty(value = "链接来源 菜单问诊from=1，菜单挂号from=2，公众号问诊from=3，当日挂号from=4，门诊心理测试from=6", required = true)
     @NotBlank(message = "链接来源必传")
     private String from;
 
@@ -91,7 +91,7 @@ public class SaveInquiryVO {
     private Long inquiryId;
 
     @ApiModelProperty(value = "厂商名字")
-    private String sources;
+    private String source;
 
     @ApiModelProperty(value = "医生名字")
     private String doctorName;
@@ -101,4 +101,8 @@ public class SaveInquiryVO {
     private String doctorId;
     @ApiModelProperty(value = "部门名称")
     private String department;
+
+    private String patientName;
+    private String patientAge;
+    private String patientSex;
 }