Selaa lähdekoodia

更新门诊和住院数据入库

0027005599 2 vuotta sitten
vanhempi
säilyke
ea093803ec

+ 2 - 2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/afterwaring/XCFYDataTransferService.java

@@ -123,11 +123,11 @@ public class XCFYDataTransferService {
     public List<String> getColumnArr(String sql){
         int startIndx = sql.indexOf("(");
         int endIndx = sql.indexOf(")");
-        String sqlCloumnStr = sql.substring(startIndx, endIndx);
+        String sqlCloumnStr = sql.substring(startIndx+1, endIndx);
         String[] columnStrArr = sqlCloumnStr.split(Constant.SPLIT_STR);
         List<String> columnList = new ArrayList<>();
         for(String columnName : columnStrArr){
-            columnList.add(columnName.trim());
+            columnList.add(columnName.toUpperCase().trim());
         }
         return columnList;
     }

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

@@ -52,15 +52,15 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
     @Autowired
     IOutpatientSettlementDetailsService outpatientSettlementDetailsService;
 
-    String insertSql = "INSERT INTO outpatient_settle_bill (id, hisid, visit_no, recipe_no, pay_method, " +
-            "bmi_area_id, bmi_area_name, hospital_id, hospital_name, p_level_yy, benefit_type, " +
-            "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,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, patient_age_days) VALUES (:ID,:HISID,:VISIT_NO,:RECIPE_NO,:PAY_METHOD,:BMI_AREA_ID," +
+    String insertSql = "INSERT INTO OUTPATIENT_SETTLE_BILL (ID, HISID, VISIT_NO, RECIPE_NO, PAY_METHOD, " +
+            "BMI_AREA_ID, BMI_AREA_NAME, HOSPITAL_ID, HOSPITAL_NAME, P_LEVEL_YY, BENEFIT_TYPE, " +
+            "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,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, PATIENT_AGE_DAYS) VALUES (:ID,:HISID,:VISIT_NO,:RECIPE_NO,:PAY_METHOD,:BMI_AREA_ID," +
             ":BMI_AREA_NAME,:HOSPITAL_ID,:HOSPITAL_NAME,:P_LEVEL_YY,:BENEFIT_TYPE,:ADMISSION_DEPT_ID," +
             ":ADMISSION_DEPT_NAME,:DOCTOR_ID,:DOCTOR_NAME,:REFUND_FLAG,:FEE_OCUR_TIME,:BILL_DATE," +
             ":REFUND_DATE,:PATIENT_ID,:PATIENT_NAME,:PATIENT_GENDER,:PATIENT_BIRTHDAY,:PATIENT_AGE," +

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/TestMain.java


Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä