门诊费用类别问题修复

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

@@ -112,7 +112,7 @@ public class OutpatientAuditLogJob implements Job {
             afterIncidentDetailLog.setDoseUnit(outpatientSettlementDetails.getPackageUnit());
             afterIncidentDetailLog.setPrice(outpatientSettlementDetails.getUnitPrice());
 //            afterIncidentDetailLog.setDscgBed(outpatientSettleBill.getAdmBed());
-            afterIncidentDetailLog.setExpenseCategory(outpatientSettlementDetails.getPCategory());
+            afterIncidentDetailLog.setExpenseCategory(outpatientSettlementDetails.getExpenseCategory());
             afterIncidentDetailLog.setProjectUseTime(outpatientSettlementDetails.getUsageDate());
             afterIncidentDetailLog.setChangeClass(outpatientSettlementDetails.getPCategory());
 //            afterIncidentDetailLog.setInspectionSite();

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

@@ -43,12 +43,12 @@ public class XCFYDatav_outpatient_settle_detailsJob implements Job {
     @Autowired
     RedisTemplate redisTemplate;
 
-    String insertSql = "INSERT INTO outpatient_settlement_details (id, hisid, visit_no, patient_id, hospital_id, " +
+    String insertSql = "INSERT INTO outpatient_settlement_details (hisid, visit_no, patient_id, hospital_id, " +
             "usage_date, item_id, item_name, item_id_hosp, item_name_hosp, drug_spec, dosage_form, package_unit," +
             " unit_price, num, cost, use_day, categories_items, bmi_convered_amount, bmi_pay_amount, " +
             "individual_payment_amount, amount_refusal, amount_reason, expense_category, change_class, " +
             "refund_falge, refund_date, p_category, create_time, create_by, p_type_pct) " +
-            "VALUES (:ID,:HISID,:VISIT_NO,:PATIENT_ID,:HOSPITAL_ID,:USAGE_DATE,:ITEM_ID," +
+            "VALUES (:HISID,:VISIT_NO,:PATIENT_ID,:HOSPITAL_ID,:USAGE_DATE,:ITEM_ID," +
             ":ITEM_NAME,:ITEM_ID_HOSP,:ITEM_NAME_HOSP,:DRUG_SPEC,:DOSAGE_FORM,:PACKAGE_UNIT," +
             ":UNIT_PRICE,:NUM,:COST,:USE_DAY,:CATEGORIES_ITEMS,:BMI_CONVERED_AMOUNT,:BMI_PAY_AMOUNT," +
             ":INDIVIDUAL_PAYMENT_AMOUNT,:AMOUNT_REFUSAL,:AMOUNT_REASON,:EXPENSE_CATEGORY,:CHANGE_CLASS," +
@@ -99,9 +99,9 @@ public class XCFYDatav_outpatient_settle_detailsJob implements Job {
                         dataMap.put("P_CATEGORY", cateGoriesMap.getOrDefault(pCategory, pCategory));
                     }
 
-                    String categoriesItems = dataMap.getOrDefault("CATEGORIES_ITEMS", "").toString();
-                    if (StringUtils.isNotBlank(pCategory)) {
-                        dataMap.put("CATEGORIES_ITEMS", cateGoriesMap.getOrDefault(categoriesItems, categoriesItems));
+                    Object categoriesItems = dataMap.get("EXPENSE_CATEGORY");
+                    if (null != categoriesItems && StringUtils.isNotBlank(categoriesItems.toString())) {
+                        dataMap.put("EXPENSE_CATEGORY", cateGoriesMap.getOrDefault(categoriesItems.toString(), categoriesItems.toString()));
                     }
                     return true;
                 }