浏览代码

更新药品开单合理性的返回数据结构

MarkHuang 4 年之前
父节点
当前提交
40f42e176c

+ 7 - 3
src/main/java/com/diagbot/facade/BillFacade.java

@@ -1,6 +1,5 @@
 package com.diagbot.facade;
 
-import com.diagbot.biz.push.entity.Item;
 import com.diagbot.dto.BillDTO;
 import com.diagbot.dto.BillNeoDTO;
 import com.diagbot.dto.WordCrfDTO;
@@ -11,7 +10,10 @@ 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;
 
 /**
@@ -45,12 +47,14 @@ public class BillFacade {
 
         // 开单合理性图谱接口调用
         BillNeoVO billNeoVO = fillBillNeo(indicationPushVO);
-        BillNeoDTO billNeoDTO = neoFacade.getBillNeo(billNeoVO);
+
+        List<BillNeoDTO> billNeoDTOs = neoFacade.getBillNeo(billNeoVO);
 
         // neoFacade.getDrugCache();
 
         // 规则开发 TODO
-        return billRuleFacade.process(billNeoDTO, wordCrfDTO);
+//        return billRuleFacade.process(billNeoDTO, wordCrfDTO);
+        return null;
     }
 
 

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

@@ -47,7 +47,7 @@ public class PushFacade {
         // 图谱接口调用
         BillNeoVO billNeoVO = fillBillNeo(indicationPushVO);
 
-        BillNeoDTO billNeoDTO = neoFacade.getBillNeo(billNeoVO);
+        List<BillNeoDTO> billNeoDTOs = neoFacade.getBillNeo(billNeoVO);
 
         // 规则开发 TODO
         neoFacade.getDrugCache();

+ 0 - 13
src/main/java/com/diagbot/repository/MedicineNode.java

@@ -13,19 +13,6 @@ public class MedicineNode {
     public DrugBillNeoDTO MedicinetoDrugDTO(Medicine medicine) {
         DrugBillNeoDTO drugBillNeoDTO = new DrugBillNeoDTO();
 
-        /*
-        AgeMin ageMin = medicine.getAgeMin();
-        String ageMin_val = (ageMin==null)?"":ageMin.getName();
-        ageMin_val = ageMin_val.replace(age_ch, "").trim();
-        drugBillNeoDTO.setMinage(Integer.parseInt(ageMin_val));
-
-
-        AgeMax ageMax = medicine.getAgemax();
-        String ageMax_val = (ageMax==null)?"":ageMax.getName();
-        ageMax_val = ageMax_val.replace(age_ch, "").trim();
-        drugBillNeoDTO.setMaxage(Integer.parseInt(ageMax_val));
-        */
-
         Age age = medicine.getAge();
         if (age!=null) {
             AgeNeoDTO ageNeoDTO = new AgeNeoDTO();