药品高危重新导入

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

@@ -155,6 +155,16 @@ public class ExportFacade {
         }
     };
 
+    public final static List<String> stDrugForm = new ArrayList<String>() {
+        {
+            add("注射剂");
+            add("片剂");
+            add("缓释剂");
+            add("胶囊剂");
+            add("滴丸剂");
+        }
+    };
+
 
     public Boolean gdbExportNode() {
         //图谱数据节点处理
@@ -367,7 +377,7 @@ public class ExportFacade {
                 rootRelations.add(rootRelation);
             }
         }
-        if(ListUtil.isNotEmpty(rootRelations)){
+        if (ListUtil.isNotEmpty(rootRelations)) {
             import2MySqlR(rootRelations, stype, etype, 600, map);
         }
     }
@@ -1113,28 +1123,27 @@ public class ExportFacade {
             if (StringUtil.isNotBlank(importDataVO.getDrugLevel())
                     && StringUtil.isNotBlank(importDataVO.getDrugHighRisk())
                     && StringUtil.isNotBlank(importDataVO.getDrugForm())) {
+                String drugForm = importDataVO.getDrugForm().trim();
+                if (drugForm.indexOf("(") > 0) {
+                    drugForm = drugForm.substring(0, importDataVO.getDrugForm().indexOf("("));
+                }
+                String drug = importDataVO.getDrugHighRisk().trim() + "_" + drugForm;
                 if (null != map.get(importDataVO.getDrugHighRisk() + "_101").getId()
-                        && !drugs.contains(importDataVO.getDrugHighRisk().trim())) {
-                    drugs.add(importDataVO.getDrugHighRisk().trim());
+                        && !drugs.contains(drug) && stDrugForm.contains(drugForm)) {
+                    drugs.add(drug);
                     KlRule klRule = new KlRule();
                     klRule.setConceptId(map.get(importDataVO.getDrugHighRisk().trim() + "_101").getId());
-                    klRule.setDescription("高危药品_" + importDataVO.getDrugHighRisk().trim());
+                    klRule.setDescription("高危药品_" + drug);
                     klRule.setRuleType(2);
                     klRule.setMsg(importDataVO.getDrugLevel().trim());
                     klRule.setHasSubCond(1);
+                    //组装规则维护数据
+                    klRuleService.save(klRule);
+
                     KlRuleBase klRuleBase = new KlRuleBase();
                     klRuleBase.setType(1);
-                    String drugForm = importDataVO.getDrugForm().trim();
-                    if (drugForm.indexOf("(") > 0) {
-                        drugForm = drugForm.substring(0, importDataVO.getDrugForm().indexOf("("));
-                    }
                     klRuleBase.setConceptId(map.get(drugForm + "_102").getId());
                     klRuleBase.setDescription(drugForm);
-                    //组装规则维护数据
-                    String description = klRule.getDescription() + "_" + klRuleBase.getDescription();
-                    klRule.setDescription(description);
-                    klRuleService.save(klRule);
-
                     klRuleBaseService.save(klRuleBase);
                     KlRuleCondition klRuleCondition = new KlRuleCondition();
                     klRuleCondition.setGroupType(1);