过滤非医保数据

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/common/CommonUtil.java

@@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.modules.medical.Constant;
+import org.jeecg.modules.medical.SystemEventAttrConstant;
 import org.jeecg.modules.medical.ruleengine.SPELUtil;
 import org.jeecg.modules.system.service.ISysDictService;
 import org.quartz.DisallowConcurrentExecution;
@@ -188,6 +189,18 @@ public class CommonUtil {
         }
     }
 
+    public static void setPtype(Map<String,Object> dataMap,String pTypeKey){
+        Map<String,String> pTypeMap = sysDictService.queryValueMapByCode(SystemEventAttrConstant.HIS_CHANGE_CLASS);
+        Object pType = dataMap.get(pTypeKey);
+        if(null != pType){
+            String value = pTypeMap.get(pType.toString());
+            if(value != null){
+                dataMap.put(pTypeKey, value);
+            }
+        }
+
+    }
+
     /**
      * 根据就诊类型获取对应的医保规则就诊类型数据
      * @param treatmentType

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/job/XCFYDatav_master_admission_billJob.java

@@ -247,8 +247,13 @@ public class XCFYDatav_master_admission_billJob implements Job {
                     if (StringUtils.isNotBlank(pCategory)) {
                         dataMap.put("CATEGORIES_ITEMS", cateGoriesMap.getOrDefault(categoriesItems, categoriesItems));
                     }
-                    //甲类01
-                    dataMap.put("P_TYPE", "01");
+                    Object pType = dataMap.get("P_TYPE");
+                    if(null == pType) {
+                        //甲类01
+                        dataMap.put("P_TYPE", "01");
+                    }else{
+                        CommonUtil.setPtype(dataMap, "P_TYPE");
+                    }
                     return true;
                 }
             }, new TransferDataCallFunction() {