浏览代码

测试数据制造

gaodm 4 年之前
父节点
当前提交
b1f2b429cf

+ 4 - 4
src/main/java/com/diagbot/dto/BillMsg.java

@@ -16,8 +16,8 @@ public class BillMsg {
     private String orderName;
     // 开单标准名称
     private String orderStandName;
-    // 匹配名称
-    private String compareName;
-    // 匹配标准名称
-    private String compareStandName;
+    // 匹配的内容
+    private String content;
+    // 类型
+    private String type;
 }

+ 3 - 1
src/main/java/com/diagbot/dto/IndicationDTO.java

@@ -3,7 +3,9 @@ package com.diagbot.dto;
 import lombok.Data;
 
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @description: 提示信息出参
@@ -19,5 +21,5 @@ public class IndicationDTO {
     // 高危药品、手术
     private List<BillMsg> highRiskList = new ArrayList<>();
     // 记录调试信息
-    private List<String> dubugStr = new ArrayList<>();
+    private Map<String, Object> debug = new LinkedHashMap<>();
 }

+ 2 - 2
src/main/java/com/diagbot/facade/AssembleFacade.java

@@ -33,7 +33,7 @@ public class AssembleFacade {
         HospitalInfo hospitalInfo = hospitalInfoFacade.getById(searchData.getHospitalId());
         Integer isConnect = 0;
         if (hospitalInfo != null && hospitalInfo.getIsDeleted().equals(IsDeleteEnum.N.getKey())) {
-            isConnect = 1;
+            isConnect = hospitalInfo.getConnect();
         }
         if (isConnect.equals(1)) {
             try {
@@ -58,7 +58,7 @@ public class AssembleFacade {
         HospitalInfo hospitalInfo = hospitalInfoFacade.getById(hospitalId);
         Integer isConnect = 0;
         if (hospitalInfo != null && hospitalInfo.getIsDeleted().equals(IsDeleteEnum.N.getKey())) {
-            isConnect = 1;
+            isConnect = hospitalInfo.getConnect();
         }
         if (isConnect.equals(1)) {
             try {

+ 23 - 5
src/main/java/com/diagbot/facade/PushFacade.java

@@ -82,13 +82,31 @@ public class PushFacade {
         IndicationDTO indicationDTO = new IndicationDTO();
         List<BillMsg> billMsgList = Lists.newArrayList();
         BillMsg item1 = new BillMsg();
-        item1.setMsg("不宜做胃镜");
-        item1.setOrderName("胃镜");
-        item1.setOrderStandName("胃镜");
-        item1.setCompareName("妊娠");
-        item1.setCompareStandName("妊娠");
+        item1.setMsg("该患者年龄15,不宜开左氧氟沙星");
+        item1.setOrderName("左氧氟沙星");
+        item1.setOrderStandName("左氧氟沙星");
+        item1.setContent("年龄15");
+        item1.setType("禁忌年龄");
         billMsgList.add(item1);
         indicationDTO.setBillMsgList(billMsgList);
+        List<BillMsg> criticalValList = Lists.newArrayList();
+        BillMsg item2 = new BillMsg();
+        item2.setMsg("该患者血常规血小板计数30,请留意");
+        item2.setOrderName("");
+        item2.setOrderStandName("");
+        item2.setContent("血常规血小板计数30");
+        item2.setType("血常规血小板计数30");
+        criticalValList.add(item2);
+        indicationDTO.setCriticalValList(criticalValList);
+        List<BillMsg> highRiskList = Lists.newArrayList();
+        BillMsg item3 = new BillMsg();
+        item3.setMsg("盐酸肾上腺素注射液为高风险药品,请留意");
+        item3.setOrderName("盐酸肾上腺素注射液");
+        item3.setOrderStandName("盐酸肾上腺素注射液");
+        item3.setContent("");
+        item3.setType("药品");
+        highRiskList.add(item3);
+        indicationDTO.setHighRiskList(highRiskList);
         //RespDTO<IndicationDTO> resp = cdssCoreClient.indication(indicationPushVO);
         //RespDTOUtil.respNGDealCover(resp, "远程调用推理接口失败");
         //IndicationDTO indicationDTO=resp.data;