数据引擎模式代码优化

aipt-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -50,9 +50,7 @@ public class PushFacade {
         PushDTO pushDTO = new PushDTO();
         //是否对接
         Boolean isConnect = transferFacade.isConnect(searchVo.getHosCode(), searchVo.getSysType());
-
         searchVo = assembleSearchData(searchVo, isConnect);
-
         ResponseData data = clinicalFacade.processClinicalData(searchVo);
 
         String featureType = searchVo.getFeatureType();
@@ -177,18 +175,18 @@ public class PushFacade {
 
             //诊断预处理
             if (StringUtil.isNotBlank(searchVo.getDiag())) {
-                searchVo.setDiag(transferFacade.convertDisease(searchVo.getDiag(), searchVo.getHosCode(), 1));
+                searchVo.setDiag(transferFacade.strConvert(searchVo.getDiag(), searchVo.getHosCode(), FeatureTypeEnum.Feature_Type_Disease.getKey()));
             }
 
             //治疗方案诊断转换
             if (StringUtil.isNotBlank(searchVo.getDiseaseName())) {
-                searchVo.setDiseaseName(transferFacade.convertDisease(searchVo.getDiseaseName(), searchVo.getHosCode(), 1));
+                searchVo.setDiseaseName(transferFacade.strConvert(searchVo.getDiseaseName(), searchVo.getHosCode(), FeatureTypeEnum.Feature_Type_Disease.getKey()));
             }
 
             //化验开单项
-            searchVo.setLisOrder(transferFacade.lisStrConvert(searchVo.getLisOrder(), searchVo.getHosCode()));
+            searchVo.setLisOrder(transferFacade.strConvert(searchVo.getLisOrder(), searchVo.getHosCode(), FeatureTypeEnum.Feature_Type_Lis.getKey()));
             //辅检开单项
-            searchVo.setPacsOrder(transferFacade.pacsStrConvert(searchVo.getPacsOrder(), searchVo.getHosCode()));
+            searchVo.setPacsOrder(transferFacade.strConvert(searchVo.getPacsOrder(), searchVo.getHosCode(), FeatureTypeEnum.Feature_Type_Pacs.getKey()));
         }
         return searchVo;
     }