Merge remote-tracking branch 'origin/master'

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

@@ -36,6 +36,8 @@ public class AfterIncidentLog implements Serializable {
 	@TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键ID")
     private java.lang.Integer id;
+
+    private String hisid;
 	/**就诊类别;住院/门诊*/
 	@Excel(name = "就诊类别;住院/门诊", width = 15)
     @ApiModelProperty(value = "就诊类别;住院/门诊")

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

@@ -335,4 +335,12 @@ public class MasterAdmissionBill implements Serializable {
     @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间;")
     private java.util.Date updateTime;
+
+    private String settleType;
+
+    private String invalidOperator;
+
+    private String invalidDate;
+
+    private String backReceiptNo;
 }

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

@@ -251,4 +251,12 @@ public class OutpatientSettleBill implements Serializable {
 	/**创建人员;*/
     @ApiModelProperty(value = "创建人员;")
     private java.lang.String createBy;
+
+    private String settleType;
+
+    private String invalidOperator;
+
+    private String invalidDate;
+
+    private String backReceiptNo;
 }

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

@@ -63,6 +63,7 @@ public class AfterWaringLogJob implements Job {
             log.error("住院结算主单为:{} 未更新到处理状态", masterAdmissionBill.getId());
             return;
         }
+
         AfterIncidentLog afterIncidentLog = afterIncidentLogService.addAfterIncidentLog(masterAdmissionBill);
         List<HospitalizatioSettleDetail> hospitalizatioSettleDetails = hospitalizatioSettleDetailService.lambdaQuery().eq(HospitalizatioSettleDetail::getHisid, masterAdmissionBill.getHisid()).list();
         List<AfterIncidentDetailLog> afterIncidentDetailLogList = new ArrayList<>();
@@ -144,4 +145,16 @@ public class AfterWaringLogJob implements Job {
     }
 
 
+    /**
+     * 作废，冲销流程
+     * @param masterAdmissionBill
+     */
+    public void checkBillInv(MasterAdmissionBill masterAdmissionBill){
+        if(StringUtils.isNotBlank(masterAdmissionBill.getBackReceiptNo())){
+            List<AfterIncidentLog> afterIncidentLogList = afterIncidentLogService.lambdaQuery().eq(AfterIncidentLog::getHisid, masterAdmissionBill.getHisid()).list();
+            List<AfterIncidentDetailLog> afterIncidentDetailLogList = afterIncidentDetailLogService.lambdaQuery().eq(AfterIncidentDetailLog::getVisitNo, masterAdmissionBill.getZyh()).list();
+
+        }
+    }
+
 }

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

@@ -55,7 +55,7 @@ public class XCFYDataV_MEDICAL_RECORD_HOMEPAGEJob implements Job {
     }
 
     public void transferHomePage(Map<String,String> dischargeMethodMap){
-        String querySql = "select * from V_MASTER_ADMISSION_BILL where hisid is not null and to_char(bill_date,'yyyy-MM-dd')=to_char(sysdate-10,'yyyy-MM-dd') ";
+        String querySql = "select * from V_YBKF_MASTER_ADMISSION_BILL where hisid is not null and to_char(bill_date,'yyyy-MM-dd')=to_char(sysdate-10,'yyyy-MM-dd') ";
         Date endBillDate = DateUtil.offsetDay(new Date(), -10);
         log.info("开始10天前master_admission_bill数据,获取同步日期:{}", endBillDate);
         Map<String, Object> paramMap = new HashMap<>();
@@ -69,15 +69,15 @@ public class XCFYDataV_MEDICAL_RECORD_HOMEPAGEJob implements Job {
             }
         });
         if (count <= 0) {
-            log.error("V_MASTER_ADMISSION_BILL 未查询到等于住院billdate:{}  的数据，停止同步", endBillDate);
+            log.error("V_YBKF_MASTER_ADMISSION_BILL 未查询到等于住院billdate:{}  的数据，停止同步", endBillDate);
             return;
         }
     }
 
     public Integer transferMedicalRecordHomePage(String zyh,Map<String,String> dischargeMethodMap) {
-        String querySql = "select * from V_MEDICAL_RECORD_HOMEPAGE where ZYH=:ZYH";
+        String querySql = "select * from V_YBKF_MEDICAL_RECORD_HOMEPAGE where ZYH=:ZYH";
 
-        log.info("开始同步V_MEDICAL_RECORD_HOMEPAGE数据,获取zyh:{}", zyh);
+        log.info("开始同步V_YBKF_MEDICAL_RECORD_HOMEPAGE数据,获取zyh:{}", zyh);
         Map<String, Object> paramMap = new HashMap<>();
 
         paramMap.put("ZYH", zyh);
@@ -101,7 +101,7 @@ public class XCFYDataV_MEDICAL_RECORD_HOMEPAGEJob implements Job {
                 return true;
             }
         });
-        log.info("结束同步V_MEDICAL_RECORD_HOMEPAGE数据,获取zyh:{} 条数:{}", zyh, count);
+        log.info("结束同步V_YBKF_MEDICAL_RECORD_HOMEPAGE数据,获取zyh:{} 条数:{}", zyh, count);
         return count;
     }
 

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

@@ -47,12 +47,12 @@ public class XCFYDataV_OPERATIONJob implements Job {
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        String sql = "select * from V_OPERATION where rownum<1000 %s";
+        String sql = "select * from V_YBKF_OPERATION where rownum<1000 %s";
         while(true) {
-            log.info("开始同步V_OPERATION数据");
+            log.info("开始同步V_YBKF_OPERATION数据");
             String whereSql = "";
             Date opEndDate = getLastOpEndDate();
-            log.info("开始同步V_OPERATION数据,获取上个同步记录访问最大手术结束时间:{}", opEndDate);
+            log.info("开始同步V_YBKF_OPERATION数据,获取上个同步记录访问最大手术结束时间:{}", opEndDate);
             Map<String,Object> paramMap = new HashMap<>();
             if(null != opEndDate){
                 whereSql = "and operation_end_time>:OPERATION_END_TIME";
@@ -74,7 +74,7 @@ public class XCFYDataV_OPERATIONJob implements Job {
                 }
             });
             if(count<=0){
-                log.info("V_OPERATION 大于手术结束时间:{} 没有的数据，停止同步", opEndDate);
+                log.info("V_YBKF_OPERATION 大于手术结束时间:{} 没有的数据，停止同步", opEndDate);
                 return;
             }
         }

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

@@ -38,9 +38,9 @@ public class XCFYDataV_OPERATIVE_ITEMSJob implements Job {
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
         Integer startRows = 0;
         Integer endRows = 1000;
-        String sql = "SELECT * FROM (SELECT A.*, ROWNUM RN FROM (SELECT * FROM V_OPERATIVE_ITEMS) A WHERE ROWNUM < %s) WHERE RN >= %s";
+        String sql = "SELECT * FROM (SELECT A.*, ROWNUM RN FROM (SELECT * FROM V_YBKF_OPERATIVE_ITEMS) A WHERE ROWNUM < %s) WHERE RN >= %s";
         while (true) {
-            log.info("开始同步V_OPERATIVE_ITEMS数据 startRows:{} endRows:{}", startRows, endRows);
+            log.info("开始同步V_YBKF_OPERATIVE_ITEMS数据 startRows:{} endRows:{}", startRows, endRows);
             Map<String, Object> paramMap = new HashMap<>();
             String queyrSql = String.format(sql, endRows, startRows);
             Integer count = xcfyDataTransferService.transferDataList(queyrSql, insertSql, paramMap, new TransferDataCallFunction() {
@@ -53,7 +53,7 @@ public class XCFYDataV_OPERATIVE_ITEMSJob implements Job {
                 }
             });
             if (count <= 0) {
-                log.info("V_OPERATIVE_ITEMS 开始rownum:{} 结束rownum:{} 没有的数据，停止同步", startRows, endRows);
+                log.info("V_YBKF_OPERATIVE_ITEMS 开始rownum:{} 结束rownum:{} 没有的数据，停止同步", startRows, endRows);
                 return;
             }
             startRows = endRows;

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

@@ -44,12 +44,12 @@ public class XCFYDataV_PRESCRIPTION_ORDERJob implements Job {
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        String sql = "select * from V_PRESCRIPTION_ORDER where rownum<1000 %s";
+        String sql = "select * from V_YBKF_PRESCRIPTION_ORDER where rownum<1000 %s";
         while (true) {
-            log.info("开始同步V_PRESCRIPTION_ORDER数据");
+            log.info("开始同步V_YBKF_PRESCRIPTION_ORDER数据");
             String whereSql = "";
             Date orderTime = getLastOpEndDate();
-            log.info("开始同步V_PRESCRIPTION_ORDER数据,获取上个同步记录访问最大ORDER_TIME:{}", orderTime);
+            log.info("开始同步V_YBKF_PRESCRIPTION_ORDER数据,获取上个同步记录访问最大ORDER_TIME:{}", orderTime);
             Map<String, Object> paramMap = new HashMap<>();
             if (null != orderTime) {
                 whereSql = "and ORDER_TIME>:ORDER_TIME";
@@ -65,7 +65,7 @@ public class XCFYDataV_PRESCRIPTION_ORDERJob implements Job {
                 }
             });
             if (count <= 0) {
-                log.info(" V_PRESCRIPTION_ORDER 大于ORDER_TIME:{} 没有的数据，停止同步", orderTime);
+                log.info(" V_YBKF_PRESCRIPTION_ORDER 大于ORDER_TIME:{} 没有的数据，停止同步", orderTime);
                 return;
             }
         }

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

@@ -59,7 +59,7 @@ public class XCFYDataV_STAFF_INFOJob implements Job {
         String querySql = "select ORG_ID,STAFF_CODE as DOCTOR_ID,WORK_CODE,STAFF_NAME as DOCTOR_NAME,STAFF_SEX as SEX,STAFF_BIRTHDAY as BIRTH_DATE,IDENTITY_CARD_NO," +
                 "MOBI_PHONE,ADMIN_DEPT as DEPT_CODE,ADMIN_DEPT_NAME as DEPT_NAME,LOGIN_USER,TECH_TITLE as DOCTOR_LEVEL from V_STAFF_INFO ";
 
-        log.info("开始同步V_STAFF_INFO数据");
+        log.info("开始同步V_YBKF_STAFF_INFO数据");
         Map<String, Object> paramMap = new HashMap<>();
         Integer count = xcfyDataTransferService.transferDataList(querySql, insertSql, paramMap, new TransferDataCallFunction() {
             @Override
@@ -73,7 +73,7 @@ public class XCFYDataV_STAFF_INFOJob implements Job {
             }
         });
         if (count <= 0) {
-            log.info("V_STAFF_INFO 没有的数据，停止同步");
+            log.info("V_YBKF_STAFF_INFO 没有的数据，停止同步");
             return;
         }
 

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

@@ -41,9 +41,9 @@ public class XCFYDataV_TREATMENT_ITEMSJob implements Job {
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
         Integer startRows = 0;
         Integer endRows = 1000;
-        String sql = "SELECT * FROM (SELECT A.*, ROWNUM RN FROM (SELECT * FROM V_TREATMENT_ITEMS) A WHERE ROWNUM < %s) WHERE RN >= %s";
+        String sql = "SELECT * FROM (SELECT A.*, ROWNUM RN FROM (SELECT * FROM V_YBKF_TREATMENT_ITEMS) A WHERE ROWNUM < %s) WHERE RN >= %s";
         while (true) {
-            log.info("开始同步V_TREATMENT_ITEMS数据 startRows:{} endRows:{}", startRows, endRows);
+            log.info("开始同步V_YBKF_TREATMENT_ITEMS数据 startRows:{} endRows:{}", startRows, endRows);
             Map<String, Object> paramMap = new HashMap<>();
             String querySql = String.format(sql,  endRows, startRows);
             Integer count = xcfyDataTransferService.transferDataList(querySql, insertSql, paramMap, new TransferDataCallFunction() {
@@ -55,7 +55,7 @@ public class XCFYDataV_TREATMENT_ITEMSJob implements Job {
                 }
             });
             if (count <= 0) {
-                log.info("V_TREATMENT_ITEMS 开始rownum:{} 结束rownum:{} 没有的数据，停止同步", startRows, endRows);
+                log.info("V_YBKF_TREATMENT_ITEMS 开始rownum:{} 结束rownum:{} 没有的数据，停止同步", startRows, endRows);
                 return;
             }
             startRows = endRows;

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

@@ -35,12 +35,12 @@ public class XCFYDatav_check_listJob implements Job {
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        String sql = "select * from V_CHECK_LIST where rownum<1000 %s and hisid is not null";
+        String sql = "select * from V_YBKF_CHECK_LIST where rownum<1000 %s and hisid is not null";
         while (true) {
-            log.info("开始同步v_check_list数据");
+            log.info("开始同步V_YBKF_check_list数据");
             String whereSql = "";
             Long hsdId = getLastId();
-            log.info("开始同步v_check_list数据,获取上个同步记录访问最大主键ID:{}", hsdId);
+            log.info("开始同步V_YBKF_check_list数据,获取上个同步记录访问最大主键ID:{}", hsdId);
             Map<String, Object> paramMap = new HashMap<>();
             if (null != hsdId) {
                 whereSql = "and ID>:ID";
@@ -56,7 +56,7 @@ public class XCFYDatav_check_listJob implements Job {
                 }
             });
             if (count <= 0) {
-                log.info("v_check_list 没有大于id:{} 的数据，停止同步", hsdId);
+                log.info("V_YBKF_check_list 没有大于id:{} 的数据，停止同步", hsdId);
                 return;
             }
         }

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

@@ -39,9 +39,9 @@ public class XCFYDatav_diagnose_itemsJob implements Job {
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
         Integer startRows = 0;
         Integer endRows = 1000;
-        String sql = "SELECT * FROM (SELECT A.*, ROWNUM RN FROM (SELECT * FROM V_DIAGNOSE_ITEMS) A WHERE ROWNUM < %s) WHERE RN >= %s";
+        String sql = "SELECT * FROM (SELECT A.*, ROWNUM RN FROM (SELECT * FROM V_YBKF_DIAGNOSE_ITEMS) A WHERE ROWNUM < %s) WHERE RN >= %s";
         while (true) {
-            log.info("开始同步v_diagnose_items数据 startRows:{} endRows:{}", startRows, endRows);
+            log.info("开始同步V_YBKF_diagnose_items数据 startRows:{} endRows:{}", startRows, endRows);
             Map<String, Object> paramMap = new HashMap<>();
             String querySql = String.format(sql, endRows, startRows);
             Integer count = xcfyDataTransferService.transferDataList(querySql, insertSql, paramMap, new TransferDataCallFunction() {
@@ -54,7 +54,7 @@ public class XCFYDatav_diagnose_itemsJob implements Job {
                 }
             });
             if (count <= 0) {
-                log.info("v_diagnose_items 开始rownum:{} 结束rownum:{} 没有的数据，停止同步", startRows, endRows);
+                log.info("V_YBKF_diagnose_items 开始rownum:{} 结束rownum:{} 没有的数据，停止同步", startRows, endRows);
                 return;
             }
             startRows = endRows;

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

@@ -35,11 +35,11 @@ public class XCFYDatav_his_patientJob implements Job {
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        String sql = "select * from v_his_patient where rownum<1000 %s";
+        String sql = "select * from V_YBKF_HIS_PATIENT where rownum<1000 %s";
         while (true) {
             String whereSql = "";
             String id = getLastId();
-            log.info("开始同步v_his_patient数据,获取上个同步记录访问最大的病人编码:{}", id);
+            log.info("开始同步V_YBKF_his_patient数据,获取上个同步记录访问最大的病人编码:{}", id);
             Map<String, Object> paramMap = new HashMap<>();
             if (StringUtils.isNotBlank(id)) {
                 whereSql = "AND PATIENT_NO>:PATIENT_NO";
@@ -59,7 +59,7 @@ public class XCFYDatav_his_patientJob implements Job {
                 }
             });
             if (count <= 0) {
-                log.info("v_his_patient 没有大于id:{} 的数据，停止同步", id);
+                log.info("V_YBKF_his_patient 没有大于id:{} 的数据，停止同步", id);
                 return;
             }
         }

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

@@ -50,17 +50,17 @@ public class XCFYDatav_hospitalizatio_settle_detailJob implements Job {
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        String sql = "select * from v_hospitalizatio_settle_detail where  item_id is not null and rownum<1000 %s";
+        String sql = "select * from V_YBKF_HOSPITALIZATIO_SETTLE_DETAIL where  item_id is not null and rownum<1000 %s";
         List<DictModel> cateGoriesList = sysDictService.getDictItems(Constant.DICT_CATEGORIES_ITEMS_KEY);
         Map<String, String> cateGoriesMap = new HashMap<>();
         for (DictModel dictModel : cateGoriesList) {
             cateGoriesMap.put(dictModel.getText(), dictModel.getValue());
         }
         while (true) {
-            log.info("开始同步v_hospitalizatio_settle_detail数据");
+            log.info("开始同步V_YBKF_hospitalizatio_settle_detail数据");
             String whereSql = "";
             Long hsdId = getLastId();
-            log.info("开始同步v_hospitalizatio_settle_detail数据,获取上个同步记录访问最大主键ID:{}", hsdId);
+            log.info("开始同步V_YBKF_hospitalizatio_settle_detail数据,获取上个同步记录访问最大主键ID:{}", hsdId);
             Map<String, Object> paramMap = new HashMap<>();
             if (null != hsdId && hsdId > 0) {
                 whereSql = "and ID>:ID";

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

@@ -80,7 +80,7 @@ public class XCFYDatav_master_admission_billJob implements Job {
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        String sql = "select * from V_MASTER_ADMISSION_BILL where hisid is not null and pay_method!='自费' and bill_date<=:END_BILL_DATE %s  order by bill_date asc";
+        String sql = "select * from V_YBKF_MASTER_ADMISSION_BILL where hisid is not null and pay_method!='自费' and bill_date<=:END_BILL_DATE %s  order by bill_date asc";
         Date endBillDate = DateUtil.yesterday();
         endBillDate = DateUtil.endOfDay(endBillDate);
         List<DictModel> dictModelList = sysDictService.getDictItems("discharge_method");

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

@@ -38,9 +38,9 @@ public class XCFYDatav_material_itemsJob implements Job {
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
         Integer startRows = 0;
         Integer endRows = 1000;
-        String sql = "SELECT * FROM (SELECT A.*, ROWNUM RN FROM (SELECT * FROM V_MATERIAL_ITEMS) A WHERE ROWNUM < %s) WHERE RN >= %s";
+        String sql = "SELECT * FROM (SELECT A.*, ROWNUM RN FROM (SELECT * FROM V_YBKF_MATERIAL_ITEMS) A WHERE ROWNUM < %s) WHERE RN >= %s";
         while (true) {
-            log.info("开始同步v_material_items数据 startRows:{} endRows:{}", startRows, endRows);
+            log.info("开始同步V_YBKF_MATERIAL_ITEMS数据 startRows:{} endRows:{}", startRows, endRows);
             Map<String, Object> paramMap = new HashMap<>();
             String querySql = String.format(sql, endRows, startRows);
             Integer count = xcfyDataTransferService.transferDataList(querySql, insertSql, paramMap, new TransferDataCallFunction() {
@@ -52,7 +52,7 @@ public class XCFYDatav_material_itemsJob implements Job {
                 }
             });
             if (count <= 0) {
-                log.info("v_material_items 开始rownum:{} 结束rownum:{} 没有的数据，停止同步", startRows, endRows);
+                log.info("V_YBKF_MATERIAL_ITEMS 开始rownum:{} 结束rownum:{} 没有的数据，停止同步", startRows, endRows);
                 return;
             }
             startRows = endRows;

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

@@ -44,9 +44,9 @@ public class XCFYDatav_medical_insurance_drugsJob implements Job {
 
         Integer startRows = 0;
         Integer endRows = 1000;
-        String sql = "SELECT * FROM (SELECT A.*, ROWNUM RN FROM (SELECT * FROM V_MEDICAL_INSURANCE_DRUGS) A WHERE ROWNUM < %s) WHERE RN >= %s";
+        String sql = "SELECT * FROM (SELECT A.*, ROWNUM RN FROM (SELECT * FROM V_YBKF_MEDICAL_INSURANCE_DRUGS) A WHERE ROWNUM < %s) WHERE RN >= %s";
         while (true) {
-            log.info("开始同步V_MEDICAL_INSURANCE_DRUGS数据 startRows:{} endRows:{}", startRows, endRows);
+            log.info("开始同步V_YBKF_MEDICAL_INSURANCE_DRUGS数据 startRows:{} endRows:{}", startRows, endRows);
             Map<String, Object> paramMap = new HashMap<>();
             String querySql = String.format(sql, endRows, startRows);
 
@@ -61,7 +61,7 @@ public class XCFYDatav_medical_insurance_drugsJob implements Job {
                 }
             });
             if (count <= 0) {
-                log.info("V_MEDICAL_INSURANCE_DRUGS 开始rownum:{} 结束rownum:{} 没有的数据，停止同步", startRows, endRows);
+                log.info("V_YBKF_MEDICAL_INSURANCE_DRUGS 开始rownum:{} 结束rownum:{} 没有的数据，停止同步", startRows, endRows);
                 return;
             }
             startRows = endRows;

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

@@ -72,13 +72,13 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        String sql = "select * from V_OUTPATIENT_SETTLE_BILL where hisid is not null and pay_method!='自费' and bill_date<=:END_BILL_DATE %s and rownum<=1000 order by bill_date asc";
+        String sql = "select * from V_YBKF_OUTPATIENT_SETTLE_BILL where hisid is not null and pay_method!='自费' and bill_date<=:END_BILL_DATE %s and rownum<=1000 order by bill_date asc";
         Date endBillDate = DateUtil.yesterday();
         endBillDate = DateUtil.endOfDay(endBillDate);
         while (true) {
             String whereSql = "";
             Date billDate = getBillDate();
-            log.info("开始同步v_outpatient_settle_bill数据,获取上个同步开始结算日期:{} 结束日期:{}", billDate, endBillDate);
+            log.info("开始同步V_YBKF_outpatient_settle_bill数据,获取上个同步开始结算日期:{} 结束日期:{}", billDate, endBillDate);
             Map<String, Object> paramMap = new HashMap<>();
             if (null != billDate) {
                 whereSql = " and BILL_DATE>:BILL_DATE";
@@ -147,7 +147,7 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
                 }
             });
             if (count <= 0) {
-                log.error("v_outpatient_settle_bill 未查询到大于住院billdate:{} 小于等于住院billdate:{} 的数据，停止同步", billDate, endBillDate);
+                log.error("V_YBKF_outpatient_settle_bill 未查询到大于住院billdate:{} 小于等于住院billdate:{} 的数据，停止同步", billDate, endBillDate);
                 return;
             }
         }
@@ -155,7 +155,7 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
     }
 
     public Integer getDetailByHisId(String hisId) {
-        String sql = "select * from V_OUTPATIENT_SETTLE_DETAILS where hisid=:HISID and item_id is not null";
+        String sql = "select * from V_YBKF_OUTPATIENT_SETTLE_DETAILS where hisid=:HISID and item_id is not null";
 //        List<DictModel> cateGoriesList = sysDictService.getDictItems(Constant.DICT_CATEGORIES_ITEMS_KEY);
         Map<String, String> cateGoriesMap = CommonUtil.getCategoriesItemsMap();
 //        for (DictModel dictModel : cateGoriesList) {
@@ -189,7 +189,7 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
                 return true;
             }
         });
-        log.info("结束同步V_OUTPATIENT_SETTLE_DETAILS数据,HISID:{} 条数:{}", hisId, count);
+        log.info("结束同步V_YBKF_OUTPATIENT_SETTLE_DETAILS数据,HISID:{} 条数:{}", hisId, count);
         return count;
 
 

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

@@ -49,7 +49,7 @@ public class XCFYDatav_outpatient_settle_detailsJob implements Job {
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        String sql = "select * from V_OUTPATIENT_SETTLE_DETAILS where rownum<1000 %s";
+        String sql = "select * from V_YBKF_OUTPATIENT_SETTLE_DETAILS where rownum<1000 %s";
 //        String sql = "SELECT A.*, ROWNUM RN FROM (SELECT * FROM V_OUTPATIENT_SETTLE_DETAILS) A WHERE ROWNUM < 1000 %s";
         List<DictModel> cateGoriesList = sysDictService.getDictItems(Constant.DICT_CATEGORIES_ITEMS_KEY);
         Map<String, String> cateGoriesMap = new HashMap<>();
@@ -57,10 +57,10 @@ public class XCFYDatav_outpatient_settle_detailsJob implements Job {
             cateGoriesMap.put(dictModel.getText(), dictModel.getValue());
         }
         while (true) {
-            log.info("开始同步v_outpatient_settle_details数据");
+            log.info("开始同步V_YBKF_outpatient_settle_details数据");
             String whereSql = "";
             Long hsdId = getLastId();
-            log.info("开始同步v_outpatient_settle_details数据,获取上个同步记录访问最大主键ID:{}", hsdId);
+            log.info("开始同步V_YBKF_outpatient_settle_details数据,获取上个同步记录访问最大主键ID:{}", hsdId);
             Map<String, Object> paramMap = new HashMap<>();
             if (null != hsdId && hsdId > 0) {
                 whereSql = "and ID>:ID";
@@ -95,7 +95,7 @@ public class XCFYDatav_outpatient_settle_detailsJob implements Job {
                 }
             });
             if (count <= 0) {
-                log.info("v_outpatient_settle_details 大于ID:{} 没有的数据，停止同步", hsdId);
+                log.info("V_YBKF_outpatient_settle_details 大于ID:{} 没有的数据，停止同步", hsdId);
                 return;
             }
         }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/ruleengine/FactorEnchangeFactory.java

@@ -266,7 +266,7 @@ public class FactorEnchangeFactory {
                 afterwardsAuditDetail.setDoctorId(afterwardsAudit.getDoctorId());
                 afterwardsAuditDetail.setPatientId(afterwardsAudit.getPatientId());
                 afterwardsAuditDetail.setPatientName(afterwardsAudit.getPatientName());
-                afterwardsAuditDetail.setTreatmentType(medicalInsRuleInfo.getTreatmentType());
+                afterwardsAuditDetail.setTreatmentType(itemMap.getOrDefault("VISIT_TYPE","1").toString());
                 afterwardsAuditDetail.setNoticeType("after");
                 afterwardsAuditDetail.setMedicalInsRuleInfoCode(medicalInsRuleInfo.getRuleCode());
                 afterwardsAuditDetail.setMedicalInsRuleInfoId(medicalInsRuleInfo.getId());
@@ -318,7 +318,7 @@ public class FactorEnchangeFactory {
             afterwardsAuditDetail.setDoctorId(afterwardsAudit.getDoctorId());
             afterwardsAuditDetail.setPatientId(afterwardsAudit.getPatientId());
             afterwardsAuditDetail.setPatientName(afterwardsAudit.getPatientName());
-            afterwardsAuditDetail.setTreatmentType(medicalInsRuleInfo.getTreatmentType());
+            afterwardsAuditDetail.setTreatmentType(itemMap.getOrDefault("VISIT_TYPE","1").toString());
             afterwardsAuditDetail.setNoticeType("after");
             afterwardsAuditDetail.setMedicalInsRuleInfoCode(medicalInsRuleInfo.getRuleCode());
             afterwardsAuditDetail.setMedicalInsRuleInfoId(medicalInsRuleInfo.getId());

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/AfterIncidentLogServiceImpl.java

@@ -21,6 +21,8 @@ import java.util.Date;
 @Service
 public class AfterIncidentLogServiceImpl extends ServiceImpl<AfterIncidentLogMapper, AfterIncidentLog> implements IAfterIncidentLogService {
 
+
+
     @Override
     public AfterIncidentLog addAfterIncidentLog(MasterAdmissionBill masterAdmissionBill){
         Date date = new Date(System.currentTimeMillis());
@@ -45,6 +47,7 @@ public class AfterIncidentLogServiceImpl extends ServiceImpl<AfterIncidentLogMap
         afterIncidentLog.setPatientAge(masterAdmissionBill.getPatientAge());
         afterIncidentLog.setPatientGender(masterAdmissionBill.getPatientGender());
         afterIncidentLog.setState(Constant.WATING);
+        afterIncidentLog.setHisid(masterAdmissionBill.getHisid());
         Integer medicalINsurance = 0;
         if(!"0".equals(masterAdmissionBill.getPayMethod())){
             medicalINsurance = 1;