Merge remote-tracking branch 'origin/master'

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

@@ -40,9 +40,9 @@ public class BillFacade {
     public BillDTO billFac(IndicationPushVO indicationPushVO) {
         // 模型处理数据
         WordCrfDTO wordCrfDTO = commonFacade.crf_process(indicationPushVO);
-        StandConvert standConvert = commonFacade.dataTypeGet(wordCrfDTO);
 
-        // 标准词转换 TODO
+        // 标准词转换
+        StandConvert standConvert = commonFacade.dataTypeGet(wordCrfDTO);
         Map<String, Map<String, String>> typeStand = neoFacade.standConvert(standConvert);
 //        wordCrfDTO = commonFacade.dataTypeSet(wordCrfDTO, typeStand);
 
@@ -51,9 +51,10 @@ public class BillFacade {
 
         List<BillNeoDTO> billNeoDTOList = neoFacade.getBillNeo(billNeoVO);
 
+        // 获取药品缓存信息，现在不用
         // neoFacade.getDrugCache();
 
-        // 规则开发 TODO
+        // 规则开发
        return billProcess.process(billNeoDTOList, wordCrfDTO);
     }