0027005599 2 роки тому
батько
коміт
62d0312105

+ 3 - 1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/job/XCFYDatav_his_patientJob.java

@@ -31,7 +31,9 @@ public class XCFYDatav_his_patientJob implements Job {
     @Autowired
     JdbcTemplate jdbcTemplate;
 
-    String insertSql = "INSERT INTO his_patient (id, patient_no, gender, patient_name, id_type, id_no, birth_weight, birthday, create_by, create_time) VALUES (:ID,:PATIENT_NO,:GENDER,:PATIENT_NAME,:ID_TYPE,:ID_NO,:BIRTH_WEIGHT,:BIRTHDAY,:CREATE_BY,:CREATE_TIME))";
+    String insertSql = "INSERT INTO his_patient (id, patient_no, gender, patient_name, id_type, id_no, birth_weight, " +
+            "birthday, create_by, create_time) VALUES (:ID,:PATIENT_NO,:GENDER,:PATIENT_NAME,:ID_TYPE,:ID_NO," +
+            ":BIRTH_WEIGHT,:BIRTHDAY,:CREATE_BY,:CREATE_TIME)";
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {

+ 12 - 7
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/job/XCFYDatav_hospitalizatio_settle_detailJob.java

@@ -28,7 +28,15 @@ public class XCFYDatav_hospitalizatio_settle_detailJob implements Job {
     @Autowired
     IHospitalizatioSettleDetailService hospitalizatioSettleDetailService;
 
-    String insertSql = "INSERT INTO hospitalizatio_settle_detail (id, hisid, patient_id, zyh, hospital_id, p_category, categories_items, usage_date, discharge_dept_id, discharge_dept_name, item_id, item_name, item_id_hosp, item_name_hosp, drug_spec, dosage_form, package_unit, unit_price, num, cost, use_day, bmi_convered_amount, bmi_pay_amount, individual_payment_amount, amount_refusal, amount_reason, discharge_medication, refund_falge, refund_date, p_type, p_type_pct, create_time, create_by) VALUES (:ID,:HISID,:PATIENT_ID,:ZYH,:HOSPITAL_ID,:P_CATEGORY,:CATEGORIES_ITEMS,:USAGE_DATE,:DISCHARGE_DEPT_ID,:DISCHARGE_DEPT_NAME,:ITEM_ID,:ITEM_NAME,:ITEM_ID_HOSP,:ITEM_NAME_HOSP,:DRUG_SPEC,:DOSAGE_FORM,:PACKAGE_UNIT,:UNIT_PRICE,:NUM,:COST,:USE_DAY,:BMI_CONVERED_AMOUNT,:BMI_PAY_AMOUNT,:INDIVIDUAL_PAYMENT_AMOUNT,:AMOUNT_REFUSAL,:AMOUNT_REASON,:DISCHARGE_MEDICATION,:REFUND_FALGE,:REFUND_DATE,:P_TYPE,:P_TYPE_PCT,:CREATE_TIME,:CREATE_BY)";
+    String insertSql = "INSERT INTO hospitalizatio_settle_detail (id, hisid, patient_id, zyh, hospital_id, p_category, " +
+            "categories_items, usage_date, discharge_dept_id, discharge_dept_name, item_id, item_name, item_id_hosp, " +
+            "item_name_hosp, drug_spec, dosage_form, package_unit, unit_price, num, cost, use_day, bmi_convered_amount, " +
+            "bmi_pay_amount, individual_payment_amount, amount_refusal, amount_reason, discharge_medication, refund_falge, " +
+            "refund_date, p_type, p_type_pct, create_time, create_by) VALUES (:ID,:HISID,:PATIENT_ID,:ZYH,:HOSPITAL_ID," +
+            ":P_CATEGORY,:CATEGORIES_ITEMS,:USAGE_DATE,:DISCHARGE_DEPT_ID,:DISCHARGE_DEPT_NAME,:ITEM_ID,:ITEM_NAME," +
+            ":ITEM_ID_HOSP,:ITEM_NAME_HOSP,:DRUG_SPEC,:DOSAGE_FORM,:PACKAGE_UNIT,:UNIT_PRICE,:NUM,:COST,:USE_DAY," +
+            ":BMI_CONVERED_AMOUNT,:BMI_PAY_AMOUNT,:INDIVIDUAL_PAYMENT_AMOUNT,:AMOUNT_REFUSAL,:AMOUNT_REASON,:DISCHARGE_MEDICATION," +
+            ":REFUND_FALGE,:REFUND_DATE,:P_TYPE,:P_TYPE_PCT,:CREATE_TIME,:CREATE_BY)";
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
@@ -43,10 +51,7 @@ public class XCFYDatav_hospitalizatio_settle_detailJob implements Job {
                 whereSql = "and ID>:ID";
                 paramMap.put("ID", hsdId);
             }
-
-
             String querySql = String.format(sql, whereSql);
-
             Integer count = xcfyDataTransferService.transferDataList(querySql, insertSql, paramMap, new TransferDataCallFunction() {
                 @Override
                 public void transferData(Map<String, Object> dataMap) throws Exception {
@@ -62,11 +67,11 @@ public class XCFYDatav_hospitalizatio_settle_detailJob implements Job {
     }
 
     public Long getLastId() {
-        List<HospitalizatioSettleDetail> masterAdmissionBillList = hospitalizatioSettleDetailService.lambdaQuery().orderByDesc(HospitalizatioSettleDetail::getId).last("limit 1").list();
-        if (CollectionUtil.isEmpty(masterAdmissionBillList)) {
+        List<HospitalizatioSettleDetail> hospitalizatioSettleDetails = hospitalizatioSettleDetailService.lambdaQuery().orderByDesc(HospitalizatioSettleDetail::getId).last("limit 1").list();
+        if (CollectionUtil.isEmpty(hospitalizatioSettleDetails)) {
             return null;
         }
-        return masterAdmissionBillList.get(0).getId();
+        return hospitalizatioSettleDetails.get(0).getId();
     }
 
 //    @Async("commonTaskAsyncPool")

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

@@ -41,7 +41,7 @@ public class XCFYDatav_master_admission_billJob implements Job {
     IMasterAdmissionBillService masterAdmissionBillService;
 
     String insertSql = "INSERT INTO `master_admission_bill` (`id`, `bridge_id`, `hisid`, `zyh`, `recipe_no`, `pay_method`, `benefit_type`, `hospital_id`, `hospital_name`, `p_level_yy`, `refund_flag`, `p_level`, `bmi_area_id`, `bmi_area_name`, `bill_date`, `refund_date`, `admission_dept_id`, `admission_dept_name`, `adm_bed`, `transfer_dept_id`, `transfer_dept_name`, `discharge_dept_id`, `discharge_dept_name`, `dscg_bed`, `doctor_id`, `doctor_name`, `patient_id`, `patient_name`, `patient_gender`, `patient_birthday`, `patient_age`, `patient_age_days`, `claim_type`, `visit_time`, `if_local_flag`, `admission_date`, `discharge_date`, `zyts`, `discharge_status`, `pre_admission_date`, `days_re_admission_31`, `yb_admission_disease_id`, `yb_admission_disease_name`, `yb_discharge_disease_id_main`, `yb_discharge_disease_name_main`, `admission_disease_id`, `admission_disease_name`, `discharge_disease_id_main`, `discharge_disease_name_main`, `yb_pay_type`, `drgs_code`, `drgs_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`, `state`, `create_time`, `create_by`) " +
-            "VALUES (:ID,:BRIDGE_ID,:HISID,:ZYH,:RECIPE_NO,:PAY_METHOD,:BENEFIT_TYPE,:HOSPITAL_ID,:HOSPITAL_NAME,:P_LEVEL_YY,:REFUND_FLAG,:P_LEVEL,:BMI_AREA_ID,:BMI_AREA_NAME,:BILL_DATE,:REFUND_DATE,:ADMISSION_DEPT_ID,:ADMISSION_DEPT_NAME,:ADM_BED,:TRANSFER_DEPT_ID,:TRANSFER_DEPT_NAME,:DISCHARGE_DEPT_ID,:DISCHARGE_DEPT_NAME,:DSCG_BED,:DOCTOR_ID,:DOCTOR_NAME,:PATIENT_ID,:PATIENT_NAME,:PATIENT_GENDER,:PATIENT_BIRTHDAY,:PATIENT_AGE,:PATIENT_AGE_DAYS,:CLAIM_TYPE,:VISIT_TIME,:IF_LOCAL_FLAG,:ADMISSION_DATE,:DISCHARGE_DATE,:ZYTS,:DISCHARGE_STATUS,:PRE_ADMISSION_DATE,:DAYS_RE_ADMISSION_31,:YB_ADMISSION_DISEASE_ID,:YB_ADMISSION_DISEASE_NAME,:YB_DISCHARGE_DISEASE_ID_MAIN,:YB_DISCHARGE_DISEASE_NAME_MAIN,:ADMISSION_DISEASE_ID,:ADMISSION_DISEASE_NAME,:DISCHARGE_DISEASE_ID_MAIN,:DISCHARGE_DISEASE_NAME_MAIN,:YB_PAY_TYPE,:DRGS_CODE,:DRGS_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,:STATE,:NOW,:CREATE_BY)";
+            "VALUES (:ID,:BRIDGE_ID,:HISID,:ZYH,:RECIPE_NO,:PAY_METHOD,:BENEFIT_TYPE,:HOSPITAL_ID,:HOSPITAL_NAME,:P_LEVEL_YY,:REFUND_FLAG,:P_LEVEL,:BMI_AREA_ID,:BMI_AREA_NAME,:BILL_DATE,:REFUND_DATE,:ADMISSION_DEPT_ID,:ADMISSION_DEPT_NAME,:ADM_BED,:TRANSFER_DEPT_ID,:TRANSFER_DEPT_NAME,:DISCHARGE_DEPT_ID,:DISCHARGE_DEPT_NAME,:DSCG_BED,:DOCTOR_ID,:DOCTOR_NAME,:PATIENT_ID,:PATIENT_NAME,:PATIENT_GENDER,:PATIENT_BIRTHDAY,:PATIENT_AGE,:PATIENT_AGE_DAYS,:CLAIM_TYPE,:VISIT_TIME,:IF_LOCAL_FLAG,:ADMISSION_DATE,:DISCHARGE_DATE,:ZYTS,:DISCHARGE_STATUS,:PRE_ADMISSION_DATE,:DAYS_RE_ADMISSION_31,:YB_ADMISSION_DISEASE_ID,:YB_ADMISSION_DISEASE_NAME,:YB_DISCHARGE_DISEASE_ID_MAIN,:YB_DISCHARGE_DISEASE_NAME_MAIN,:ADMISSION_DISEASE_ID,:ADMISSION_DISEASE_NAME,:DISCHARGE_DISEASE_ID_MAIN,:DISCHARGE_DISEASE_NAME_MAIN,:YB_PAY_TYPE,:DRGS_CODE,:DRGS_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,:STATE,:CREATE_TIME,:CREATE_BY)";
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
         String sql = "select * from v_master_admission_bill where rownum<1000 %s order by VISIT_TIME asc";
@@ -55,14 +55,12 @@ public class XCFYDatav_master_admission_billJob implements Job {
                 whereSql = "and ID>:ID";
                 paramMap.put("ID", id);
             }
-
             String querySql = String.format(sql, whereSql);
-
             Integer count = xcfyDataTransferService.transferDataList(querySql, insertSql, paramMap, new TransferDataCallFunction() {
                 @Override
                 public void transferData(Map<String, Object> dataMap) throws Exception {
                     dataMap.put("CREATE_BY", "auto");
-                    dataMap.put("NOW", new Date());
+                    dataMap.put("CREATE_TIME", new Date());
                 }
             });
 
@@ -82,9 +80,4 @@ public class XCFYDatav_master_admission_billJob implements Job {
         return masterAdmissionBillList.get(0).getId();
     }
 
-
-//    @Async("commonTaskAsyncPool")
-//    public void statictisRuleByRuleEngine(MedicalInsRuleInfo medicalInsRuleInfo) {
-//        ruleEngine.runStatictisEngine(new HashMap<>(), medicalInsRuleInfo);
-//    }
 }