结构调整

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

@@ -3,7 +3,7 @@ package com.diagbot.facade;
 import com.diagbot.dto.BillDTO;
 import com.diagbot.dto.BillNeoDTO;
 import com.diagbot.dto.WordCrfDTO;
-import com.diagbot.facade.rule.BillRuleFacade;
+import com.diagbot.process.BillProcess;
 import com.diagbot.vo.BillNeoVO;
 import com.diagbot.vo.IndicationPushVO;
 import com.diagbot.vo.StandConvert;
@@ -27,7 +27,7 @@ public class BillFacade {
     @Autowired
     NeoFacade neoFacade;
     @Autowired
-    BillRuleFacade billRuleFacade;
+    BillProcess billProcess;
     @Autowired
     CommonFacade commonFacade;
 
@@ -53,7 +53,7 @@ public class BillFacade {
         // neoFacade.getDrugCache();
 
         // 规则开发 TODO
-       return billRuleFacade.process(billNeoDTOList, wordCrfDTO);
+       return billProcess.process(billNeoDTOList, wordCrfDTO);
     }
 
 

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

@@ -4,7 +4,7 @@ import com.diagbot.biz.push.entity.Item;
 import com.diagbot.dto.BillDTO;
 import com.diagbot.dto.BillNeoDTO;
 import com.diagbot.dto.WordCrfDTO;
-import com.diagbot.facade.rule.BillRuleFacade;
+import com.diagbot.process.BillProcess;
 import com.diagbot.vo.BillNeoVO;
 import com.diagbot.vo.IndicationPushVO;
 import com.diagbot.vo.PushVO;
@@ -26,7 +26,7 @@ public class PushFacade {
     @Autowired
     NeoFacade neoFacade;
     @Autowired
-    BillRuleFacade billRuleFacade;
+    BillProcess billProcess;
     @Autowired
     CommonFacade commonFacade;
 

src/main/java/com/diagbot/facade/rule/BillRuleFacade.java

@@ -1,22 +1,23 @@
-package com.diagbot.facade.rule;
+package com.diagbot.process;
 
 import com.diagbot.dto.BillDTO;
 import com.diagbot.dto.BillMsg;
 import com.diagbot.dto.BillNeoDTO;
 import com.diagbot.dto.DrugBillNeoDTO;
 import com.diagbot.dto.WordCrfDTO;
+import com.diagbot.rule.AgeRule;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * @Description: 规则facade
+ * @Description: 开单总入口
  * @author: zhoutg
  * @time: 2018/8/6 9:11
  */
 @Component
-public class BillRuleFacade {
+public class BillProcess {
 
     public BillDTO process(List<BillNeoDTO> billNeoDTOList, WordCrfDTO wordCrfDTO) {
         BillDTO billDTO = new BillDTO();
@@ -59,17 +60,18 @@ public class BillRuleFacade {
      * @param billDTO
      */
     public void processBillWithDrug(List<BillNeoDTO> billNeoDTOList, WordCrfDTO wordCrfDTO, BillDTO billDTO) {
+        List<BillMsg> drugBill = new ArrayList<>();
         for (BillNeoDTO bill : billNeoDTOList) {
             List<DrugBillNeoDTO> drugBillNeoDTOList = bill.getDrugBillNeoDTOList();
-            List<BillMsg> drugBill = new ArrayList<>();
             for (DrugBillNeoDTO drug : drugBillNeoDTOList) {
                 // 性别
-                BillMsg billMsg = RuleUtil.compareSexWithBill(drug.getGender(), wordCrfDTO, bill.getName());
+                BillMsg billMsg = AgeRule.compareSexWithBill(drug.getGender(), wordCrfDTO, bill.getName());
                 if (billMsg != null) {
                     drugBill.add(billMsg);
                 }
             }
         }
+        billDTO.setDrugBill(drugBill);
     }
 
 }

src/main/java/com/diagbot/facade/rule/RuleUtil.java

@@ -1,16 +1,15 @@
-package com.diagbot.facade.rule;
+package com.diagbot.rule;
 
 import com.diagbot.dto.BillMsg;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.util.StringUtil;
 
 /**
- * @description:
+ * @description: 性别规则
  * @author: zhoutg
- * @time: 2020/8/3 11:22
+ * @time: 2020/8/3 14:47
  */
-public class RuleUtil {
-
+public class AgeRule {
     /**
      * 比较性别
      *
@@ -28,7 +27,7 @@ public class RuleUtil {
             }
             if (sex.equals(crfSex)) {
                 BillMsg billMsg = new BillMsg();
-                billMsg.setMsg(name + "(" + sex + ")");
+                billMsg.setMsg(name + "(" + crfSex + ")");
                 return billMsg;
             }
         }