后台同步数据处理

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/OutpatientSettleBill.java

@@ -163,6 +163,14 @@ public class OutpatientSettleBill implements Serializable {
 	@Excel(name = "诊断名称;普通门诊、门慢、门特诊断名称", width = 15)
     @ApiModelProperty(value = "诊断名称;普通门诊、门慢、门特诊断名称")
     private java.lang.String admissionDiseaseName;
+    /**诊断编码;普通门诊、门慢、门特诊断编码*/
+    @Excel(name = "医保诊断编码;普通门诊、门慢、门特诊断编码", width = 15)
+    @ApiModelProperty(value = "医保诊断编码;普通门诊、门慢、门特诊断编码")
+    private java.lang.String ybAdmissionDiseaseId;
+    /**诊断名称;普通门诊、门慢、门特诊断名称*/
+    @Excel(name = "医保诊断名称;普通门诊、门慢、门特诊断名称", width = 15)
+    @ApiModelProperty(value = "医保诊断名称;普通门诊、门慢、门特诊断名称")
+    private java.lang.String ybAdmissionDiseaseName;
 	/**医疗总发生费用*/
 	@Excel(name = "医疗总发生费用", width = 15)
     @ApiModelProperty(value = "医疗总发生费用")

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

@@ -32,7 +32,7 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
             "admission_dept_id, admission_dept_name, doctor_id, doctor_name, refund_falge, " +
             "fee_ocur_time, bill_date, refund_date, patient_id, patient_name, patient_gender, " +
             "patient_birthday, patient_age, visit_time, benefit_group_id, claim_type, if_local_flag, " +
-            "admission_disease_id, admission_disease_name, medfee_sumamt, fulamt_ownpay_amt, " +
+            "admission_disease_id, admission_disease_name,yb_admission_disease_id, yb_admission_disease_name, medfee_sumamt, fulamt_ownpay_amt, " +
             "overlmt_selfpay, preselfpay_amt, inscp_scp_amt, act_pay_dedc, hifp_pay, pool_prop_selfpay, " +
             "cvlserv_pay, hifes_pay, hifmi_pay, hifob_pay, maf_pay, oth_pay, fund_pay_sumamt, " +
             "create_time, create_by) VALUES (:ID,:HISID,:VISIT_NO,:RECIPE_NO,:PAY_METHOD,:BMI_AREA_ID," +
@@ -40,7 +40,7 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
             ":ADMISSION_DEPT_NAME,:DOCTOR_ID,:DOCTOR_NAME,:REFUND_FALGE,:FEE_OCUR_TIME,:BILL_DATE," +
             ":REFUND_DATE,:PATIENT_ID,:PATIENT_NAME,:PATIENT_GENDER,:PATIENT_BIRTHDAY,:PATIENT_AGE," +
             ":VISIT_TIME,:BENEFIT_GROUP_ID,:CLAIM_TYPE,:IF_LOCAL_FLAG,:ADMISSION_DISEASE_ID," +
-            ":ADMISSION_DISEASE_NAME,:MEDFEE_SUMAMT,:FULAMT_OWNPAY_AMT,:OVERLMT_SELFPAY,:PRESELFPAY_AMT," +
+            ":ADMISSION_DISEASE_NAME,:YB_ADMISSION_DISEASE_ID,:YB_ADMISSION_DISEASE_NAME:MEDFEE_SUMAMT,:FULAMT_OWNPAY_AMT,:OVERLMT_SELFPAY,:PRESELFPAY_AMT," +
             ":INSCP_SCP_AMT,:ACT_PAY_DEDC,:HIFP_PAY,:POOL_PROP_SELFPAY,:CVLSERV_PAY,:HIFES_PAY,:HIFMI_PAY," +
             ":HIFOB_PAY,:MAF_PAY,:OTH_PAY,:FUND_PAY_SUMAMT,:CREATE_TIME,:CREATE_BY)";
 
@@ -63,15 +63,14 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
                 public void transferData(Map<String, Object> dataMap) throws Exception {
                     dataMap.put("CREATE_BY", "auto");
                     dataMap.put("CREATE_TIME", new Date());
-//                    String itemIDHosp = dataMap.getOrDefault("ITEM_ID_HOSP", "").toString();
-//                    String itemId = dataMap.getOrDefault("ITEM_ID", "").toString();
-//                    if (StringUtils.isNotBlank(itemIDHosp) && StringUtils.isBlank(itemId)) {
-//                        String[] itemIdArr = CommonUtil.getMedicalCodeAndName(itemIDHosp);
-//                        if (null != itemIdArr) {
-//                            dataMap.put("ITEM_ID", itemIdArr[0]);
-//                            dataMap.put("ITEM_NAME", itemIdArr[1]);
-//                        }
-//                    }
+                    String diagCode = dataMap.getOrDefault("ADMISSION_DISEASE_ID", "").toString();
+                    if (StringUtils.isNotBlank(diagCode)) {
+                        String[] ybDiagCode = CommonUtil.getMedicalCodeAndName(diagCode);
+                        if (null != ybDiagCode) {
+                            dataMap.put("YB_ADMISSION_DISEASE_ID", ybDiagCode[0]);
+                            dataMap.put("YB_ADMISSION_DISEASE_NAME", ybDiagCode[1]);
+                        }
+                    }
                 }
             });
             if (count <= 0) {