Merge branch 'hb/beilun_20210816' into hb/master

kernel/src/main/java/com/lantone/qc/kernel/catalogue/deathcasediscuss/DEAC03146.java

@@ -13,6 +13,7 @@ import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -35,7 +36,7 @@ public class DEAC03146 extends QCCatalogue {
             status.set("0");
             return;
         }
-        Map<String, String> positionMap= Content.positionMap;
+        List<String> positionArrayList = Content.positionArrayList;
         FirstPageRecordDoc firstPageRecordDoc = inputInfo.getFirstPageRecordDoc();
         String directorName ="";
         if (firstPageRecordDoc != null) {
@@ -51,7 +52,7 @@ public class DEAC03146 extends QCCatalogue {
                 return;
             }
         }
-        if (positionMap.containsKey(recordDoctor)) {
+        if (positionArrayList.contains(recordDoctor)) {
             status.set("0");
             return;
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/difficultcasediscuss/DIF03148.java

@@ -31,7 +31,7 @@ public class DIF03148 extends QCCatalogue {
             status.set("0");
             return;
         }
-        Map<String, String> positionMap = Content.positionMap;
+        List<String> positionArrayList = Content.positionArrayList;
         FirstPageRecordDoc firstPageRecordDoc = inputInfo.getFirstPageRecordDoc();
         String directorName ="";
         if (firstPageRecordDoc != null) {
@@ -49,7 +49,7 @@ public class DIF03148 extends QCCatalogue {
                     return;
                 }
             }
-            if (positionMap.containsKey(diisName)) {
+            if (positionArrayList.contains(diisName)) {
                 status.set("0");
                 return;
             }

public/src/main/java/com/lantone/qc/pub/Content.java

@@ -454,16 +454,12 @@ public class Content {
             "血管造影","深静脉造影","经食道超声心动图","运动平板试验","化学治疗"
     );
     //台州职务目录
-    public static Map<String,String> positionMap=new HashMap<String, String>(){
-        {
-            put("罗建华","科室主任");
-            put("罗万余","科室主任");
-            put("潘君素","科室主任");
-            put("冯继红","科室主任");
-            put("花京剩","科室主任");
-            put("王宏刚","科室主任");
-        }
-    };
+    public static List<String> positionArrayList= Arrays.asList(
+                "王昌明","赵淑清","蔡仙丽","朱雄文","陈方虎","郎伯旭","陈晨","徐浩","梁斌","杨敏","陶宝鸿","聂寒秋","陈滔",
+               "李隆祥","刘晟","吕静瑶","徐传华","夏发明","伍海建","夏贤武","李皖生","金小福","金茜","周健",
+               "徐小辉","郑文标","陈华彬","张强","管青聪","徐丹蕾","林爱琳","王晨","金涌","王国祥","花京剩",
+               "何婓","程茹","刘治慧"
+    );
     //抗菌药物目录
     public static List<String> antimicrobialDrugList = Arrays.asList(
             "多西环素","二维四环素甲氧苄啶","复方四环素","复方四环素泼尼松","胍甲环素","美他环素","米诺环素","四环素","替加环素","土霉素","琥珀氯霉素","甲砜霉素","甲砜霉素甘氨酸酯","氯霉素",