Merge remote-tracking branch 'origin/develop_znwz_zzcx_xlcs' into 122run

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.getDest().equals("1")) {
+                && saveInquiryVO.getFrom().equals("6")
+                && saveInquiryVO.getSource().equals("纳里")) {
             List<String> naliRetList = getUrl(saveInquiryVO);
             String retUrl = naliRetList.get(0);
             saveInquiryDTO.setBody(retUrl);
@@ -185,7 +185,6 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             saveInquiryDTO.setRequest(naliRetList.get(2));
             saveInquiryDTO.setRequestBodys(naliRetList.get(3));
         }
-
         return saveInquiryDTO;
     }
 
@@ -279,73 +278,6 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
                 }
             }
         }
-   /*     List<HistoryInquiryDTO> historyInquiryDTOList = Lists.newLinkedList();
-        QueryWrapper<InquiryInfo> inquiryInfoQueryWrapper = new QueryWrapper<>();
-        //配置了覆盖项时
-        if (sysSetFacade.isCover(historyInquiryVO.getHospitalCode())) {
-            if (StringUtil.isNotBlank(historyInquiryVO.getMachineId())) {
-                inquiryInfoQueryWrapper
-                        .eq("machine_id", historyInquiryVO.getMachineId())
-                        .apply("gmt_modified IN (\n" +
-                                "\t\tSELECT\n" +
-                                "\t\t\tmax(aa.gmt_modified) AS max_gmt_modified\n" +
-                                "\t\tFROM\n" +
-                                "\t\t\t(\n" +
-                                "\t\t\t\tSELECT\n" +
-                                "\t\t\t\t\tDATE(a.gmt_modified) datetemp,\n" +
-                                "\t\t\t\t\ta.gmt_modified,\n" +
-                                "\t\t\t\t\ta.machine_id\n" +
-                                "\t\t\t\tFROM\n" +
-                                "\t\t\t\t\txlcs_inquiry_info a\n" +
-                                "\t\t\t\tWHERE\n" +
-                                "\t\t\t\t\ta.is_deleted = 'N'\n" +
-                                "\t\t\t\t\tAND a.machine_id = {0}\n" +
-                                "\t\t\t\t\tAND a.hospital_code = {1}\n" +
-                                "\t\t\t) aa\n" +
-                                "\t\tGROUP BY\n" +
-                                "\t\t\taa.datetemp,\n" +
-                                "\t\t\taa.machine_id\n" +
-                                "\t)", historyInquiryVO.getMachineId(), historyInquiryVO.getHospitalCode());
-
-            } else if (StringUtil.isNotBlank(historyInquiryVO.getPatName()) && StringUtil.isNotBlank(historyInquiryVO.getIdNum())) {
-                inquiryInfoQueryWrapper
-                        .eq("pat_name", historyInquiryVO.getPatName())
-                        .eq("id_num", historyInquiryVO.getIdNum())
-                        .apply("gmt_modified IN (\n" +
-                                "\t\tSELECT\n" +
-                                "\t\t\tmax(aa.gmt_modified) AS max_gmt_modified\n" +
-                                "\t\tFROM\n" +
-                                "\t\t\t(\n" +
-                                "\t\t\t\tSELECT\n" +
-                                "\t\t\t\t\tDATE(gmt_modified) datetemp,\n" +
-                                "\t\t\t\t\ta.gmt_modified,\n" +
-                                "\t\t\t\t\ta.pat_name,\n" +
-                                "\t\t\t\t\ta.id_num\n" +
-                                "\t\t\t\tFROM\n" +
-                                "\t\t\t\t\txlcs_inquiry_info a\n" +
-                                "\t\t\t\tWHERE\n" +
-                                "\t\t\t\t\ta.is_deleted = 'N'\n" +
-                                "\t\t\t\tAND a.pat_name = {0}\n" +
-                                "\t\t\t\tAND a.id_num = {1}\n" +
-                                "\t\t\t\t\tAND a.hospital_code = {2}\n" +
-                                "\t\t\t) aa\n" +
-                                "\t\tGROUP BY\n" +
-                                "\t\t\taa.datetemp,\n" +
-                                "\t\t\taa.pat_name,\n" +
-                                "\t\t\taa.id_num\n" +
-                                "\t)", historyInquiryVO.getPatName(), historyInquiryVO.getIdNum(), historyInquiryVO.getHospitalCode());
-            }
-        } else {
-            inquiryInfoQueryWrapper
-                    .eq(StringUtil.isNotBlank(historyInquiryVO.getPatName()), "pat_name", historyInquiryVO.getPatName())
-                    .eq(StringUtil.isNotBlank(historyInquiryVO.getIdNum()), "id_num", historyInquiryVO.getIdNum())
-                    .eq(StringUtil.isNotBlank(historyInquiryVO.getMachineId()), "machine_id", historyInquiryVO.getMachineId());
-        }
-        inquiryInfoQueryWrapper
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_code", historyInquiryVO.getHospitalCode())
-                .orderByDesc("gmt_modified");
-       List<InquiryInfo> inquiryInfoList = this.list(inquiryInfoQueryWrapper);*/
         if (ListUtil.isNotEmpty(inquiryInfoList)) {
             List<Long> inquiryIdList = inquiryInfoList.stream().map(i -> i.getId()).collect(Collectors.toList());
             QueryWrapper<InquiryDetail> inquiryDetailQueryWrapper = new QueryWrapper<>();
@@ -427,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());
@@ -435,7 +367,26 @@ 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();
+        diagnosis += saveInquiryVO.getAnxietyAdvise() + System.lineSeparator();
+        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("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,13 +83,26 @@ 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;
 
     @ApiModelProperty(value = "自诊程序产生的ID")
     private Long inquiryId;
 
-    @ApiModelProperty(value = "对接方 对接纳里dest=1")
-    private String dest;
-}
+    @ApiModelProperty(value = "厂商名字")
+    private String source;
+
+    @ApiModelProperty(value = "医生名字")
+    private String doctorName;
+    @ApiModelProperty(value = "机构名称")
+    private String organName;
+    @ApiModelProperty(value = "医生ID")
+    private String doctorId;
+    @ApiModelProperty(value = "部门名称")
+    private String department;
+
+    private String patientName;
+    private String patientAge;
+    private String patientSex;
+}