Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/dto/BillMsg.java

@@ -12,8 +12,12 @@ public class BillMsg {
 
     // 提示信息
     private String msg;
-    // 输入名称
-    private String name;
-    // 标准名称
-    private String standName;
+    // 开单名称
+    private String orderName;
+    // 开单标准名称
+    private String orderStandName;
+    // 匹配名称
+    private String compareName;
+    // 匹配标准名称
+    private String compareStandName;
 }

src/main/java/com/diagbot/dto/BillNeoMaxDTO.java

@@ -38,7 +38,7 @@ public class BillNeoMaxDTO {
     private List<String> procedures = new ArrayList<>();
 
     // 禁忌辅助检查
-    private List<NodeNeoDTO> Pacs = new ArrayList<>();
+    private List<NodeNeoDTO> pacs = new ArrayList<>();
 
     // 禁忌疾病
     private List<String> disease = new ArrayList<>();

src/main/java/com/diagbot/dto/IndicationDTO.java

@@ -13,12 +13,7 @@ import java.util.List;
 @Data
 public class IndicationDTO {
 
-    // 化验开单合理性提示信息
-    private List<BillMsg> lisBill = new ArrayList<>();
+    // 开单合理性提示信息
+    private List<BillMsg> billMsgList = new ArrayList<>();
 
-    // 辅检开单合理性提示信息
-    private List<BillMsg> pacsBill = new ArrayList<>();
-
-    // 药品开单合理性提示信息
-    private List<BillMsg> drugBill = new ArrayList<>();
 }

src/main/java/com/diagbot/dto/WordCrfDTO.java

@@ -6,7 +6,9 @@ import com.diagbot.model.label.*;
 import lombok.Data;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * crf 解析后各個模塊出參
@@ -22,6 +24,8 @@ public class WordCrfDTO {
     private Integer age;
     // 性别（1：男，2：女）
     private Integer sex;
+    // 标准词转换
+    Map<String, Map<String, String>> standConvertMap = new HashMap<>();
     // 化验项目和结果
     private List<Lis> lis = new ArrayList<>();
     // 辅检项目和结果

src/main/java/com/diagbot/facade/CommonFacade.java

@@ -64,6 +64,7 @@ public class CommonFacade {
         standConvert.setDiaglList(diagList);
         return standConvert;
     }
+
     //把图谱返回的标准词set到label中
     public WordCrfDTO dataTypeSet(WordCrfDTO wordCrfDTO, Map<String, Map<String, String>> map){
         ChiefLabel chiefLabel = wordCrfDTO.getChiefLabel();

src/main/java/com/diagbot/facade/IndicationFacade.java

@@ -39,8 +39,9 @@ public class IndicationFacade {
 
         // 标准词转换
         StandConvert standConvert = commonFacade.dataTypeGet(wordCrfDTO);
-        Map<String, Map<String, String>> typeStand = neoFacade.standConvert(standConvert);
-//        wordCrfDTO = commonFacade.dataTypeSet(wordCrfDTO, typeStand);
+        Map<String, Map<String, String>> standConvertMap = neoFacade.standConvert(standConvert);
+        wordCrfDTO = commonFacade.dataTypeSet(wordCrfDTO, standConvertMap);
+        wordCrfDTO.setStandConvertMap(standConvertMap);
 
         List<String> ruleTypeList = Arrays.asList(indicationPushVO.getRuleType().split(","));
 

src/main/java/com/diagbot/process/BillProcess.java

@@ -23,6 +23,8 @@ import org.springframework.stereotype.Component;
 import java.util.ArrayList;
 import java.util.List;
 
+// import java.math.BigDecimal;
+
 /**
  * @Description: 开单总入口
  * @author: zhoutg
@@ -32,6 +34,7 @@ import java.util.List;
 public class BillProcess {
 
     public void process(List<BillNeoDTO> billNeoDTOList, WordCrfDTO wordCrfDTO, IndicationDTO res) {
+        // 合并图谱数据到同一个对象中
         List<BillNeoMaxDTO> billNeoMaxDTOList = new ArrayList<>();
         for (BillNeoDTO billNeoDTO : billNeoDTOList) {
             BillNeoMaxDTO billNeoMaxDTO =  new BillNeoMaxDTO();
@@ -43,6 +46,12 @@ public class BillProcess {
                 BeanUtil.copyProperties(billNeoDTO.getPacsBillNeoDTO(), billNeoMaxDTO);
             }
             billNeoMaxDTO.setName(billNeoDTO.getName());
+            // 测试数据开始
+            // billNeoMaxDTO.setGender("男");
+            // billNeoMaxDTO.getAgeNeoDTO().setMax(new BigDecimal(30));
+            // billNeoMaxDTO.getAgeNeoDTO().setMin(new BigDecimal(25));
+            // 测试数据结束
+
             billNeoMaxDTOList.add(billNeoMaxDTO);
         }
         processRule(billNeoMaxDTOList, wordCrfDTO, res);
@@ -68,15 +77,15 @@ public class BillProcess {
         List<Lis> lis = wordCrfDTO.getLis();
         List<Pacs> pacs = wordCrfDTO.getPacs();
 
-        List<BillMsg> drugBill = new ArrayList<>();
+        List<BillMsg> billMsgList = new ArrayList<>();
         for (BillNeoMaxDTO bill : billNeoMaxDTOList) {
             // 性别
             BillMsg sexMsg = SexRule.compareSexWithBill(bill.getGender(), wordCrfDTO, bill.getName());
-            CoreUtil.addBeanToList(drugBill, sexMsg);
+            CoreUtil.addBeanToList(billMsgList, sexMsg);
 
             // 诊断
             BillMsg billMsg_disease = DiagRule.compareDiseaseWithBill(bill.getDisease(), diags, bill.getName());
-            CoreUtil.addBeanToList(drugBill, billMsg_disease);
+            CoreUtil.addBeanToList(billMsgList, billMsg_disease);
 
             // //化验
             // BillMsg lisMsg = LisPacsRule.compareLisPacsWithBill(drug.getLis(), lis, bill.getName());
@@ -92,10 +101,10 @@ public class BillProcess {
 
             // 年龄
             BillMsg ageMsg = AgeRule.compareAgeWithBill(bill.getAgeNeoDTO(), wordCrfDTO, bill.getName());
-            CoreUtil.addBeanToList(drugBill, ageMsg);
+            CoreUtil.addBeanToList(billMsgList, ageMsg);
 
         }
-        indicationDTO.setDrugBill(drugBill);
+        indicationDTO.setBillMsgList(billMsgList);
     }
     //
     // /**

src/main/java/com/diagbot/util/CoreUtil.java

@@ -179,7 +179,7 @@ public class CoreUtil {
      */
     public static BillMsg getCommonBillMsg(String errMsg, String name) {
         BillMsg billMsg = new BillMsg();
-        String msg = String.format(errMsg + ",不宜做%s", name);
+        String msg = String.format(errMsg + ",不宜开%s", name);
         billMsg.setMsg(msg);
         return billMsg;
     }

src/main/java/com/diagbot/vo/StandConvert.java

@@ -1,6 +1,5 @@
 package com.diagbot.vo;
 
-import com.diagbot.model.entity.Clinical;
 import lombok.Data;
 
 import java.util.List;
@@ -16,4 +15,7 @@ import java.util.List;
 public class StandConvert {
     private List<String> clinicalList;
     private List<String> diaglList;
+    private List<String> lisList;
+    private List<String> pacsList;
+    private List<String> drugList;
 }