zhoutg 4 gadi atpakaļ
vecāks
revīzija
2061089824

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

@@ -12,11 +12,8 @@ public class BillMsg {
 
     // 提示信息
     private String msg;
-
-    public BillMsg() {
-    }
-
-    public BillMsg(String msg) {
-        this.msg = msg;
-    }
+    // 输入名称
+    private String name;
+    // 标准名称
+    private String standName;
 }

+ 4 - 16
src/main/java/com/diagbot/facade/BillFacade.java

@@ -1,23 +1,19 @@
 package com.diagbot.facade;
 
-import com.diagbot.biz.push.entity.Pacs;
+import com.diagbot.biz.push.entity.Item;
 import com.diagbot.biz.push.entity.Lis;
-import com.diagbot.dto.IndicationDTO;
+import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.dto.BillNeoDTO;
+import com.diagbot.dto.IndicationDTO;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.process.BillProcess;
 import com.diagbot.vo.BillNeoVO;
 import com.diagbot.vo.IndicationPushVO;
-import com.diagbot.vo.StandConvert;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.diagbot.biz.push.entity.Item;
-
 import java.util.List;
 
-import java.util.Map;
-
 /**
  * @Description: 开单合理性facade
  * @author: zhoutg
@@ -38,15 +34,7 @@ public class BillFacade {
      * @param
      * @return
      */
-    public void billFac(IndicationPushVO indicationPushVO, IndicationDTO res) {
-        // 模型处理数据
-        WordCrfDTO wordCrfDTO = commonFacade.crf_process(indicationPushVO);
-
-        // 标准词转换
-        StandConvert standConvert = commonFacade.dataTypeGet(wordCrfDTO);
-        Map<String, Map<String, String>> typeStand = neoFacade.standConvert(standConvert);
-//        wordCrfDTO = commonFacade.dataTypeSet(wordCrfDTO, typeStand);
-
+    public void billFac(IndicationPushVO indicationPushVO, WordCrfDTO wordCrfDTO, IndicationDTO res) {
         // 开单合理性图谱接口调用
         BillNeoVO billNeoVO = fillBillNeo(indicationPushVO);
 

+ 1 - 1
src/main/java/com/diagbot/facade/IndicationFacade.java

@@ -46,7 +46,7 @@ public class IndicationFacade {
 
         // 开单合理性
         if (ruleTypeList.contains("2")) {
-            billFacade.billFac(indicationPushVO, res);
+            billFacade.billFac(indicationPushVO, wordCrfDTO, res);
         }
 
         // TODO 其他类型提示

+ 2 - 1
src/main/java/com/diagbot/util/CoreUtil.java

@@ -192,7 +192,8 @@ public class CoreUtil {
      * @return
      */
     public static BillMsg getBillMsgWithConst(String msg) {
-        BillMsg billMsg = new BillMsg(msg);
+        BillMsg billMsg = new BillMsg();
+        billMsg.setMsg(msg);
         return billMsg;
     }