yeguodong 2 月之前
父节点
当前提交
b823566e72

+ 42 - 11
src/main/java/thyyxxk/webserver/constants/sidicts/MedType.java

@@ -13,32 +13,63 @@ public enum MedType {
 
     SELF_PAY("01", "自费", "hospitalization", "01"),
 
-    GCP_EXPERIMENT("011", "GCP实验", "hospitalization", "a0"),
-
     GENERAL_CLINIC("11", "普通门诊", "clinic", "aa"),
 
     EMERGENCY_TREATMENT("13", "急诊", "clinic", "ab"),
 
+    MEN_ZHEN_MAN("1401", "门诊慢性病", "clinic", "ac"),
+
+    MEN_ZHEN_TE("1402", "门诊特性病", "clinic", "ad"),
+
+    GENERAL_HOSPITALIZATION("21", "普通住院", "hospitalization", "ae"),
+
+    TRAUMA_HOSPITALIZATION("22", "外伤住院", "hospitalization", "af"),
+
+    ZHUAN_WAI_ZHU("2301", "转外住院", "hospitalization", "ag"),
+
+    YI_DI("2302", "异地就医", "clinic", "ah"),
+
+    YUAN_QIAN_JI("24", "院前急诊", "hospitalization", "ai"),
+
+    DING_DIAN_YAO("4101", "定点药店购药", "clinic", "aj"),
+
+    DING_DIAN_TE_YAO("4102", "定点特殊药品", "clinic", "ak"),
+
+    MATERNITY_CLINIC("51", "生育门诊", "clinic", "al"),
+
+    MATERNITY_HOSPITALIZATION("52", "生育住院", "hospitalization", "am"),
+
+    JI_HUA_SHENG_YU_2("5301", "计划生育门诊", "clinic", "an"),
+
+    JI_HUA_SHENG_YU_ZHU("5302", "计划生育住院", "hospitalization", "ao"),
+
+    JIA_TING_BING_CHUANG("9902", "家庭病床", "hospitalization", "ap"),
+
+    OUTPATIENT_TWO_DISEASES("9903", "门诊两病", "clinic", "aq"),
+
+    MEN_ZHEN_TE_YIN("9904", "门诊特检特治(阴性)", "clinic", "ar"),
+
+    MEN_ZHEN_TE_YANG("9907", "门诊特检特制(阳性)", "clinic", "as"),
+
+    JIA_YI_FU_WU("9908", "家庭医师服务包", "clinic", "at"),
+
+    FU_ZHU_SHENG_ZHI("108", "辅助生殖门诊", "clinic", "au"),
+
+
+
+
     EMERGENCY_RESCUE("1301", "急诊抢救", "clinic", "bb"),
 
     OUTPATIENT_CHRONIC_IDIOPATHIC_DISEASES("14", "门诊慢特病", "clinic", "ac"),
 
-    GENERAL_HOSPITALIZATION("21", "普通住院", "hospitalization", "ad"),
-
     SINGLE_DISEASE_HOSPITALIZATION("2102", "单病种住院", "hospitalization", "ae"),
 
     RESIDENTS_NORMAL_BIRTH("2106", "生育平产(居民)", "hospitalization", "af"),
 
     RESIDENTS_BIRTH_CESAREAN_SECTION("2107", "生育剖宫产(居民)", "hospitalization", "ag"),
 
-    TRAUMA_HOSPITALIZATION("22", "外伤住院", "hospitalization", "ah"),
-
     DESIGNATED_DRUGSTORES_PURCHASE("41", "定点药店购药", "drug", "ai"),
 
-    MATERNITY_CLINIC("51", "生育门诊", "clinic", "aj"),
-
-    MATERNITY_HOSPITALIZATION("52", "生育住院", "hospitalization", "ak"),
-
     INJURY_HOSPITALIZATION("42", "工伤住院", "hospitalization", "al"),
 
     OCCUPATIONAL_INJURY_CLINIC("41", "工伤门诊", "clinic", "bl"),
@@ -47,7 +78,7 @@ public enum MedType {
 
     INJURY_RECOVER_CLINIC("46", "康复门诊", "clinic", "dl"),
 
-    OUTPATIENT_TWO_DISEASES("9901", "门诊两病", "clinic", "am"),
+
 
     ACCIDENTAL_INJURY_CLINIC("9903", "意外伤害门诊", "clinic", "an"),
 

+ 1 - 1
src/main/java/thyyxxk/webserver/service/medicalinsurance/SiZyService.java

@@ -239,7 +239,7 @@ public class SiZyService {
     private boolean invalidMultipleUploadPatient(String medtype) {
         MedType medType = MedType.get(medtype);
         return null == medType || medType == MedType.INJURY_HOSPITALIZATION
-                || medType == MedType.SELF_PAY || medType == MedType.GCP_EXPERIMENT
+                || medType == MedType.SELF_PAY
                 || medType == MedType.INJURY_TBD;
     }