视图数据更新

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/common/CommonUtil.java

@@ -5,6 +5,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.modules.medical.Constant;
 import org.jeecg.modules.medical.ruleengine.SPELUtil;
+import org.quartz.DisallowConcurrentExecution;
 import org.springframework.data.redis.core.RedisTemplate;
 
 import java.time.LocalDate;
@@ -13,6 +14,7 @@ import java.util.Date;
 import java.util.Map;
 
 @Slf4j
+@DisallowConcurrentExecution
 public class CommonUtil {
 
     static RedisTemplate redisTemplate = (RedisTemplate) SpringContextUtils.getBean("redisTemplate");
@@ -126,6 +128,7 @@ public class CommonUtil {
         }
     }
 
+
     public static void main(String[] args) {
 //        String day = "2023-11-09 19:10:11";
         Long day = 1607475808000l;

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

@@ -12,6 +12,7 @@ import org.jeecg.modules.medical.ruleengine.TransferDataCallFunction;
 import org.jeecg.modules.medical.service.IHospitalizatioSettleDetailService;
 import org.jeecg.modules.system.service.ISysDictService;
 import org.jeecg.modules.utils.DateTimeUtil;
+import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -29,6 +30,7 @@ import java.util.Map;
  * 每小时执行一次
  */
 @Slf4j
+@DisallowConcurrentExecution
 public class XCFYDataV_MEDICAL_RECORD_HOMEPAGEJob implements Job {
 
     @Autowired

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

@@ -7,6 +7,7 @@ import org.jeecg.modules.medical.common.CommonUtil;
 import org.jeecg.modules.medical.entity.HospitalizatioSettleDetail;
 import org.jeecg.modules.medical.ruleengine.TransferDataCallFunction;
 import org.jeecg.modules.medical.service.IHospitalizatioSettleDetailService;
+import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -24,6 +25,7 @@ import java.util.Map;
  * 在对应的结算主单中同步停掉
  */
 @Slf4j
+@DisallowConcurrentExecution
 public class XCFYDataV_OPERATIONJob implements Job {
 
     @Autowired

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

@@ -4,6 +4,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.medical.afterwaring.XCFYDataTransferService;
 import org.jeecg.modules.medical.ruleengine.TransferDataCallFunction;
 import org.jeecg.modules.medical.service.IHospitalizatioSettleDetailService;
+import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -19,6 +20,7 @@ import java.util.Map;
  * 新增OPERATIVE_CODE唯一索引
  */
 @Slf4j
+@DisallowConcurrentExecution
 public class XCFYDataV_OPERATIVE_ITEMSJob implements Job {
 
     @Autowired

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

@@ -3,6 +3,7 @@ package org.jeecg.modules.medical.job;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.medical.afterwaring.XCFYDataTransferService;
 import org.jeecg.modules.medical.ruleengine.TransferDataCallFunction;
+import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -19,6 +20,7 @@ import java.util.Map;
  * 终止执行，在主单中关联执行
  */
 @Slf4j
+@DisallowConcurrentExecution
 public class XCFYDataV_PRESCRIPTION_ORDERJob implements Job {
 
     @Autowired

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

@@ -13,6 +13,7 @@ import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecg.modules.system.service.ISysUserService;
+import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -30,6 +31,7 @@ import java.util.Map;
  * 一天执行一次
  */
 @Slf4j
+@DisallowConcurrentExecution
 public class XCFYDataV_STAFF_INFOJob implements Job {
 
     @Autowired

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

@@ -3,6 +3,7 @@ package org.jeecg.modules.medical.job;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.medical.afterwaring.XCFYDataTransferService;
 import org.jeecg.modules.medical.ruleengine.TransferDataCallFunction;
+import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -18,6 +19,7 @@ import java.util.Map;
  * * 新增TREATMENT_ITEMS唯一索引
  */
 @Slf4j
+@DisallowConcurrentExecution
 public class XCFYDataV_TREATMENT_ITEMSJob implements Job {
 
     @Autowired

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

@@ -6,6 +6,7 @@ import org.jeecg.modules.medical.afterwaring.XCFYDataTransferService;
 import org.jeecg.modules.medical.entity.CheckList;
 import org.jeecg.modules.medical.ruleengine.TransferDataCallFunction;
 import org.jeecg.modules.medical.service.ICheckListService;
+import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -22,6 +23,7 @@ import java.util.Map;
  * 停掉，在对应的结算主单中同步
  */
 @Slf4j
+@DisallowConcurrentExecution
 public class XCFYDatav_check_listJob implements Job {
 
     @Autowired

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

@@ -5,6 +5,7 @@ import org.jeecg.modules.medical.Constant;
 import org.jeecg.modules.medical.afterwaring.XCFYDataTransferService;
 import org.jeecg.modules.medical.ruleengine.TransferDataCallFunction;
 import org.jeecg.modules.medical.service.IDiagnoseItemsService;
+import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -19,6 +20,7 @@ import java.util.Map;
  * 每个月执行一次
  */
 @Slf4j
+@DisallowConcurrentExecution
 public class XCFYDatav_diagnose_itemsJob implements Job {
 
     @Autowired

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

@@ -5,6 +5,7 @@ import org.apache.commons.lang.StringUtils;
 import org.jeecg.modules.medical.afterwaring.XCFYDataTransferService;
 import org.jeecg.modules.medical.common.CommonUtil;
 import org.jeecg.modules.medical.ruleengine.TransferDataCallFunction;
+import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -20,6 +21,7 @@ import java.util.Map;
  * 每天执行一次
  */
 @Slf4j
+@DisallowConcurrentExecution
 public class XCFYDatav_his_patientJob implements Job {
 
     @Autowired

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

@@ -11,6 +11,7 @@ import org.jeecg.modules.medical.entity.HospitalizatioSettleDetail;
 import org.jeecg.modules.medical.ruleengine.TransferDataCallFunction;
 import org.jeecg.modules.medical.service.IHospitalizatioSettleDetailService;
 import org.jeecg.modules.system.service.ISysDictService;
+import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -27,6 +28,7 @@ import java.util.Map;
  * 停掉，在对应的结算主单中同步
  */
 @Slf4j
+@DisallowConcurrentExecution
 public class XCFYDatav_hospitalizatio_settle_detailJob implements Job {
 
     @Autowired

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

@@ -13,6 +13,7 @@ import org.jeecg.modules.medical.ruleengine.TransferDataCallFunction;
 import org.jeecg.modules.medical.service.IMasterAdmissionBillService;
 import org.jeecg.modules.system.service.ISysDictService;
 import org.jeecg.modules.utils.DateTimeUtil;
+import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -27,6 +28,7 @@ import java.util.Map;
  * 住院结算主单
  * 每天执行一次
  */
+@DisallowConcurrentExecution
 @Slf4j
 public class XCFYDatav_master_admission_billJob implements Job {
 
@@ -96,6 +98,7 @@ public class XCFYDatav_master_admission_billJob implements Job {
             Integer count = xcfyDataTransferService.transferDataList(querySql, insertSql, paramMap, new TransferDataCallFunction() {
                 @Override
                 public Boolean transferData(Map<String, Object> dataMap) throws Exception {
+                    dataMap.put("PAY_METHOD", 1);
                     String hisId = dataMap.get("HISID").toString();
                     Integer count = transferHospSettleDetail(hisId);
                     if (null == count || count <= 0) {

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

@@ -4,6 +4,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.medical.afterwaring.XCFYDataTransferService;
 import org.jeecg.modules.medical.ruleengine.TransferDataCallFunction;
 import org.jeecg.modules.medical.service.IMaterialItemsService;
+import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -19,6 +20,7 @@ import java.util.Map;
  * 新增ITEM_ID_HOSP唯一索引
  */
 @Slf4j
+@DisallowConcurrentExecution
 public class XCFYDatav_material_itemsJob implements Job {
 
     @Autowired

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

@@ -6,6 +6,7 @@ import org.jeecg.modules.medical.Constant;
 import org.jeecg.modules.medical.afterwaring.XCFYDataTransferService;
 import org.jeecg.modules.medical.ruleengine.TransferDataCallFunction;
 import org.jeecg.modules.system.service.ISysDictService;
+import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -22,6 +23,7 @@ import java.util.Map;
  * 一个月执行一次
  */
 @Slf4j
+@DisallowConcurrentExecution
 public class XCFYDatav_medical_insurance_drugsJob implements Job {
 
     @Autowired

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

@@ -10,6 +10,7 @@ import org.jeecg.modules.medical.common.CommonUtil;
 import org.jeecg.modules.medical.ruleengine.TransferDataCallFunction;
 import org.jeecg.modules.system.service.ISysDictService;
 import org.jeecg.modules.utils.DateTimeUtil;
+import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -26,6 +27,7 @@ import java.util.Map;
  * 执行频率：每天执行1次
  */
 @Slf4j
+@DisallowConcurrentExecution
 public class XCFYDatav_outpatient_settle_billJob implements Job {
 
     @Autowired

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

@@ -8,6 +8,7 @@ import org.jeecg.modules.medical.afterwaring.XCFYDataTransferService;
 import org.jeecg.modules.medical.common.CommonUtil;
 import org.jeecg.modules.medical.ruleengine.TransferDataCallFunction;
 import org.jeecg.modules.system.service.ISysDictService;
+import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -25,6 +26,7 @@ import java.util.Map;
  * 停止执行，在主单中关联采集
  */
 @Slf4j
+@DisallowConcurrentExecution
 public class XCFYDatav_outpatient_settle_detailsJob implements Job {
 
     @Autowired