事后监管任务生成

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

@@ -31,6 +31,10 @@ import lombok.experimental.Accessors;
 @ApiModel(value="master_admission_bill对象", description="master_admission_bill")
 public class MasterAdmissionBill implements Serializable {
     private static final long serialVersionUID = 1L;
+    /**主键ID*/
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "主键ID")
+    private java.lang.Integer id;
 
 	/**病案关联字段;与病案的关联编码，可关联该病人病案首页相关诊断等信息。*/
 	@Excel(name = "病案关联字段;与病案的关联编码，可关联该病人病案首页相关诊断等信息。", width = 15)

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

@@ -16,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 

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

@@ -1,12 +1,9 @@
 package org.jeecg.modules.medical.job;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.apache.commons.lang.StringUtils;
 import org.jeecg.modules.medical.Constant;
 import org.jeecg.modules.medical.entity.AfterIncidentDetailLog;
 import org.jeecg.modules.medical.entity.AfterIncidentLog;
-import org.jeecg.modules.medical.entity.AfterwardsAudit;
 import org.jeecg.modules.medical.entity.HospitalizatioSettleDetail;
 import org.jeecg.modules.medical.entity.MasterAdmissionBill;
 import org.jeecg.modules.medical.ruleengine.RuleEngine;
@@ -14,7 +11,6 @@ import org.jeecg.modules.medical.service.IAfterIncidentDetailLogService;
 import org.jeecg.modules.medical.service.IAfterIncidentLogService;
 import org.jeecg.modules.medical.service.IHospitalizatioSettleDetailService;
 import org.jeecg.modules.medical.service.IMasterAdmissionBillService;
-import org.jeecg.modules.medical.service.IMaterialItemsService;
 import org.jeecg.modules.medical.service.IOutpatientSettleBillService;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysUserService;
@@ -26,11 +22,10 @@ import org.springframework.scheduling.annotation.Async;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
- * 事后触发监管
+ * 事后监管任务生成
  */
 public class AfterWaringLogJob implements Job {
     @Autowired
@@ -51,7 +46,7 @@ public class AfterWaringLogJob implements Job {
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
         List<MasterAdmissionBill> masterAdmissionBillList = masterAdmissionBillService.lambdaQuery().isNull(MasterAdmissionBill::getState).last(" limit 1000").list();
-        for(MasterAdmissionBill masterAdmissionBill : masterAdmissionBillList){
+        for (MasterAdmissionBill masterAdmissionBill : masterAdmissionBillList) {
             dealAftertask(masterAdmissionBill);
         }
     }
@@ -59,16 +54,17 @@ public class AfterWaringLogJob implements Job {
 
     @Async("commonTaskAsyncPool")
     public void dealAftertask(MasterAdmissionBill masterAdmissionBill) {
+        masterAdmissionBillService.lambdaUpdate().set(MasterAdmissionBill::getState, Constant.DEALING).eq(MasterAdmissionBill::getId, masterAdmissionBill.getId()).update();
         AfterIncidentLog afterIncidentLog = afterIncidentLogService.addAfterIncidentLog(masterAdmissionBill);
         List<HospitalizatioSettleDetail> hospitalizatioSettleDetails = hospitalizatioSettleDetailService.lambdaQuery().eq(HospitalizatioSettleDetail::getHisid, masterAdmissionBill.getHisid()).list();
         List<AfterIncidentDetailLog> afterIncidentDetailLogList = new ArrayList<>();
         AfterIncidentDetailLog afterIncidentDetailLog = null;
         List<SysUser> sysUserList = sysUserService.lambdaQuery().eq(SysUser::getDoctorId, afterIncidentLog.getDoctorId()).list();
         String doctorLevel = "0";
-        if(CollectionUtil.isNotEmpty(sysUserList)){
+        if (CollectionUtil.isNotEmpty(sysUserList)) {
             doctorLevel = sysUserList.get(0).getDoctorLevel();
         }
-        for(HospitalizatioSettleDetail hospitalizatioSettleDetail : hospitalizatioSettleDetails){
+        for (HospitalizatioSettleDetail hospitalizatioSettleDetail : hospitalizatioSettleDetails) {
             afterIncidentDetailLog = new AfterIncidentDetailLog();
 
             afterIncidentDetailLog.setAfterIncidentLogId(afterIncidentLog.getId());
@@ -101,8 +97,8 @@ public class AfterWaringLogJob implements Job {
         }
 
         afterIncidentDetailLogService.saveBatch(afterIncidentDetailLogList);
+        masterAdmissionBillService.lambdaUpdate().set(MasterAdmissionBill::getState, Constant.SUCCESS).eq(MasterAdmissionBill::getId, masterAdmissionBill.getId()).update();
     }
 
 
-
 }

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

@@ -35,6 +35,7 @@ public class AfterIncidentLogServiceImpl extends ServiceImpl<AfterIncidentLogMap
         afterIncidentLog.setDoctorAdviceNo(masterAdmissionBill.getRecipeNo());
         afterIncidentLog.setVisitType(Constant.TREAMENT_TYPE_HOSP);
         afterIncidentLog.setInHospDate(masterAdmissionBill.getAdmissionDate());
+        afterIncidentLog.setState(Constant.WATING);
         this.save(afterIncidentLog);
         return afterIncidentLog;
     }