Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,53 @@
+package org.jeecg.modules.medical;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author huang.youcai
+ * @version CdrThreadPoolConfig v 0.1 2019/4/2 9:30
+ */
+@Component
+@ConfigurationProperties(prefix = "cdr.threadpool")
+public class CommonThreadPoolConfig {
+
+    private int corePoolSize;
+
+    private int maxPoolSize;
+
+    private int keepAliveSeconds;
+
+    private int queueCapacity;
+
+    public int getCorePoolSize() {
+        return corePoolSize;
+    }
+
+    public void setCorePoolSize(int corePoolSize) {
+        this.corePoolSize = corePoolSize;
+    }
+
+    public int getMaxPoolSize() {
+        return maxPoolSize;
+    }
+
+    public void setMaxPoolSize(int maxPoolSize) {
+        this.maxPoolSize = maxPoolSize;
+    }
+
+    public int getKeepAliveSeconds() {
+        return keepAliveSeconds;
+    }
+
+    public void setKeepAliveSeconds(int keepAliveSeconds) {
+        this.keepAliveSeconds = keepAliveSeconds;
+    }
+
+    public int getQueueCapacity() {
+        return queueCapacity;
+    }
+
+    public void setQueueCapacity(int queueCapacity) {
+        this.queueCapacity = queueCapacity;
+    }
+}

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

@@ -70,6 +70,9 @@ public class Constant {
     public static final String PROJECT_TYPE_KEY = "project_type";
     //金额
     public static final String AMOUNT_KEY = "amount";
+
+    //单次门诊住院所有项目金额
+    public static final String ALL_AMOUNT_KEY = "totoal_amount";
 //    public static final String PROJECT_CODE_KEY = "project_code";
 
 
@@ -81,4 +84,9 @@ public class Constant {
 
     public static final String FAIL = "FAIL";
 
+    public static final String VALIDATION_HANDER_METHOD_RETURN = "RETURN";
+
+    public static final String VALIDATION_HANDER_METHOD_CONTINUE = "CONTINUE";
+
+    public static final String SPLIT_STR = ",";
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/AfterwardsIncidentAuditDiagnoseController.java

@@ -0,0 +1,178 @@
+package org.jeecg.modules.medical.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.medical.entity.AfterwardsIncidentAuditDiagnose;
+import org.jeecg.modules.medical.service.IAfterwardsIncidentAuditDiagnoseService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: afterwards_incident_audit_diagnose
+ * @Author: jeecg-boot
+ * @Date:   2023-05-21 14:35:02
+ * @Version: V1.0
+ */
+@Api(tags="afterwards_incident_audit_diagnose")
+@RestController
+@RequestMapping("/medical/afterwardsIncidentAuditDiagnose")
+@Slf4j
+public class AfterwardsIncidentAuditDiagnoseController extends JeecgController<AfterwardsIncidentAuditDiagnose, IAfterwardsIncidentAuditDiagnoseService> {
+	@Autowired
+	private IAfterwardsIncidentAuditDiagnoseService afterwardsIncidentAuditDiagnoseService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param afterwardsIncidentAuditDiagnose
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "afterwards_incident_audit_diagnose-分页列表查询")
+	@ApiOperation(value="afterwards_incident_audit_diagnose-分页列表查询", notes="afterwards_incident_audit_diagnose-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<AfterwardsIncidentAuditDiagnose>> queryPageList(AfterwardsIncidentAuditDiagnose afterwardsIncidentAuditDiagnose,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<AfterwardsIncidentAuditDiagnose> queryWrapper = QueryGenerator.initQueryWrapper(afterwardsIncidentAuditDiagnose, req.getParameterMap());
+		Page<AfterwardsIncidentAuditDiagnose> page = new Page<AfterwardsIncidentAuditDiagnose>(pageNo, pageSize);
+		IPage<AfterwardsIncidentAuditDiagnose> pageList = afterwardsIncidentAuditDiagnoseService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param afterwardsIncidentAuditDiagnose
+	 * @return
+	 */
+	@AutoLog(value = "afterwards_incident_audit_diagnose-添加")
+	@ApiOperation(value="afterwards_incident_audit_diagnose-添加", notes="afterwards_incident_audit_diagnose-添加")
+	@RequiresPermissions("medical:afterwards_incident_audit_diagnose:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody AfterwardsIncidentAuditDiagnose afterwardsIncidentAuditDiagnose) {
+		afterwardsIncidentAuditDiagnoseService.save(afterwardsIncidentAuditDiagnose);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param afterwardsIncidentAuditDiagnose
+	 * @return
+	 */
+	@AutoLog(value = "afterwards_incident_audit_diagnose-编辑")
+	@ApiOperation(value="afterwards_incident_audit_diagnose-编辑", notes="afterwards_incident_audit_diagnose-编辑")
+	@RequiresPermissions("medical:afterwards_incident_audit_diagnose:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody AfterwardsIncidentAuditDiagnose afterwardsIncidentAuditDiagnose) {
+		afterwardsIncidentAuditDiagnoseService.updateById(afterwardsIncidentAuditDiagnose);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "afterwards_incident_audit_diagnose-通过id删除")
+	@ApiOperation(value="afterwards_incident_audit_diagnose-通过id删除", notes="afterwards_incident_audit_diagnose-通过id删除")
+	@RequiresPermissions("medical:afterwards_incident_audit_diagnose:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		afterwardsIncidentAuditDiagnoseService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "afterwards_incident_audit_diagnose-批量删除")
+	@ApiOperation(value="afterwards_incident_audit_diagnose-批量删除", notes="afterwards_incident_audit_diagnose-批量删除")
+	@RequiresPermissions("medical:afterwards_incident_audit_diagnose:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.afterwardsIncidentAuditDiagnoseService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "afterwards_incident_audit_diagnose-通过id查询")
+	@ApiOperation(value="afterwards_incident_audit_diagnose-通过id查询", notes="afterwards_incident_audit_diagnose-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<AfterwardsIncidentAuditDiagnose> queryById(@RequestParam(name="id",required=true) String id) {
+		AfterwardsIncidentAuditDiagnose afterwardsIncidentAuditDiagnose = afterwardsIncidentAuditDiagnoseService.getById(id);
+		if(afterwardsIncidentAuditDiagnose==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(afterwardsIncidentAuditDiagnose);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param afterwardsIncidentAuditDiagnose
+    */
+    @RequiresPermissions("medical:afterwards_incident_audit_diagnose:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, AfterwardsIncidentAuditDiagnose afterwardsIncidentAuditDiagnose) {
+        return super.exportXls(request, afterwardsIncidentAuditDiagnose, AfterwardsIncidentAuditDiagnose.class, "afterwards_incident_audit_diagnose");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("medical:afterwards_incident_audit_diagnose:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, AfterwardsIncidentAuditDiagnose.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/MedicalInsRuleProjectDiagnoseController.java

@@ -0,0 +1,178 @@
+package org.jeecg.modules.medical.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.medical.entity.MedicalInsRuleProjectDiagnose;
+import org.jeecg.modules.medical.service.IMedicalInsRuleProjectDiagnoseService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: medical_ins_rule_project_diagnose
+ * @Author: jeecg-boot
+ * @Date:   2023-05-21 16:21:29
+ * @Version: V1.0
+ */
+@Api(tags="medical_ins_rule_project_diagnose")
+@RestController
+@RequestMapping("/medical/medicalInsRuleProjectDiagnose")
+@Slf4j
+public class MedicalInsRuleProjectDiagnoseController extends JeecgController<MedicalInsRuleProjectDiagnose, IMedicalInsRuleProjectDiagnoseService> {
+	@Autowired
+	private IMedicalInsRuleProjectDiagnoseService medicalInsRuleProjectDiagnoseService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param medicalInsRuleProjectDiagnose
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "medical_ins_rule_project_diagnose-分页列表查询")
+	@ApiOperation(value="medical_ins_rule_project_diagnose-分页列表查询", notes="medical_ins_rule_project_diagnose-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<MedicalInsRuleProjectDiagnose>> queryPageList(MedicalInsRuleProjectDiagnose medicalInsRuleProjectDiagnose,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<MedicalInsRuleProjectDiagnose> queryWrapper = QueryGenerator.initQueryWrapper(medicalInsRuleProjectDiagnose, req.getParameterMap());
+		Page<MedicalInsRuleProjectDiagnose> page = new Page<MedicalInsRuleProjectDiagnose>(pageNo, pageSize);
+		IPage<MedicalInsRuleProjectDiagnose> pageList = medicalInsRuleProjectDiagnoseService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param medicalInsRuleProjectDiagnose
+	 * @return
+	 */
+	@AutoLog(value = "medical_ins_rule_project_diagnose-添加")
+	@ApiOperation(value="medical_ins_rule_project_diagnose-添加", notes="medical_ins_rule_project_diagnose-添加")
+	@RequiresPermissions("medical:medical_ins_rule_project_diagnose:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody MedicalInsRuleProjectDiagnose medicalInsRuleProjectDiagnose) {
+		medicalInsRuleProjectDiagnoseService.save(medicalInsRuleProjectDiagnose);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param medicalInsRuleProjectDiagnose
+	 * @return
+	 */
+	@AutoLog(value = "medical_ins_rule_project_diagnose-编辑")
+	@ApiOperation(value="medical_ins_rule_project_diagnose-编辑", notes="medical_ins_rule_project_diagnose-编辑")
+	@RequiresPermissions("medical:medical_ins_rule_project_diagnose:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody MedicalInsRuleProjectDiagnose medicalInsRuleProjectDiagnose) {
+		medicalInsRuleProjectDiagnoseService.updateById(medicalInsRuleProjectDiagnose);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "medical_ins_rule_project_diagnose-通过id删除")
+	@ApiOperation(value="medical_ins_rule_project_diagnose-通过id删除", notes="medical_ins_rule_project_diagnose-通过id删除")
+	@RequiresPermissions("medical:medical_ins_rule_project_diagnose:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		medicalInsRuleProjectDiagnoseService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "medical_ins_rule_project_diagnose-批量删除")
+	@ApiOperation(value="medical_ins_rule_project_diagnose-批量删除", notes="medical_ins_rule_project_diagnose-批量删除")
+	@RequiresPermissions("medical:medical_ins_rule_project_diagnose:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.medicalInsRuleProjectDiagnoseService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "medical_ins_rule_project_diagnose-通过id查询")
+	@ApiOperation(value="medical_ins_rule_project_diagnose-通过id查询", notes="medical_ins_rule_project_diagnose-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<MedicalInsRuleProjectDiagnose> queryById(@RequestParam(name="id",required=true) String id) {
+		MedicalInsRuleProjectDiagnose medicalInsRuleProjectDiagnose = medicalInsRuleProjectDiagnoseService.getById(id);
+		if(medicalInsRuleProjectDiagnose==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(medicalInsRuleProjectDiagnose);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param medicalInsRuleProjectDiagnose
+    */
+    @RequiresPermissions("medical:medical_ins_rule_project_diagnose:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, MedicalInsRuleProjectDiagnose medicalInsRuleProjectDiagnose) {
+        return super.exportXls(request, medicalInsRuleProjectDiagnose, MedicalInsRuleProjectDiagnose.class, "medical_ins_rule_project_diagnose");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("medical:medical_ins_rule_project_diagnose:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, MedicalInsRuleProjectDiagnose.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/MidIncidentVisitLogController.java

@@ -40,7 +40,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  /**
  * @Description: mid_incident_visit_log
  * @Author: jeecg-boot
- * @Date:   2023-05-12 09:23:36
+ * @Date:   2023-05-21 18:30:54
  * @Version: V1.0
  */
 @Api(tags="mid_incident_visit_log")

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

@@ -4,7 +4,10 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -113,19 +116,23 @@ public class AfterIncidentDetailLog implements Serializable {
 	/**项目编码*/
 	@Excel(name = "项目编码", width = 15)
     @ApiModelProperty(value = "项目编码")
-    private java.lang.String proejctCode;
+    @TableField(value = "project_code")
+    private java.lang.String project_code;
 	/**项目名称*/
 	@Excel(name = "项目名称", width = 15)
     @ApiModelProperty(value = "项目名称")
-    private java.lang.String proejctName;
+    @TableField(value = "project_name")
+    private java.lang.String project_name;
 	/**医保项目编码*/
 	@Excel(name = "医保项目编码", width = 15)
     @ApiModelProperty(value = "医保项目编码")
-    private java.lang.String medicalProjectCode;
+    @TableField(value = "medical_project_code")
+    private java.lang.String medical_project_code;
 	/**医保项目名称*/
 	@Excel(name = "医保项目名称", width = 15)
     @ApiModelProperty(value = "医保项目名称")
-    private java.lang.String medicalProjectName;
+    @TableField("medical_project_name")
+    private java.lang.String medical_project_name;
 	/**发票项目编号*/
 	@Excel(name = "发票项目编号", width = 15)
     @ApiModelProperty(value = "发票项目编号")
@@ -211,19 +218,23 @@ public class AfterIncidentDetailLog implements Serializable {
 	/**医院诊断编码;*/
 	@Excel(name = "医院诊断编码;", width = 15)
     @ApiModelProperty(value = "医院诊断编码;")
-    private java.lang.String diagnoseCode;
+    @TableField(value = "diagnose_code")
+    private java.lang.String diagnose_code_str;
 	/**医院诊断描述;*/
 	@Excel(name = "医院诊断描述;", width = 15)
     @ApiModelProperty(value = "医院诊断描述;")
-    private java.lang.String diagnoseDesc;
+    @TableField(value = "diagnose_desc")
+    private java.lang.String diagnose_name_str;
 	/**医保诊断编码;*/
 	@Excel(name = "医保诊断编码;", width = 15)
     @ApiModelProperty(value = "医保诊断编码;")
-    private java.lang.String medDiagnoseCode;
+    @TableField(value = "medical_diagnose_code")
+    private java.lang.String medical_diagnose_code_str;
 	/**医保诊断描述;*/
 	@Excel(name = "医保诊断描述;", width = 15)
     @ApiModelProperty(value = "医保诊断描述;")
-    private java.lang.String medDiagnoseDesc;
+    @TableField(value = "medical_diagnose_desc")
+    private java.lang.String medical_diagnose_name_str;
 	/**状态;WAITING,DEALING,SUCCESS,FAIL*/
 	@Excel(name = "状态;WAITING,DEALING,SUCCESS,FAIL", width = 15)
     @ApiModelProperty(value = "状态;WAITING,DEALING,SUCCESS,FAIL")
@@ -244,4 +255,10 @@ public class AfterIncidentDetailLog implements Serializable {
     @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;
+
+    @TableField(exist = false)
+    private List<String> medical_diagnose_code;
+
+    @TableField(exist = false)
+    private List<String> medical_diagnose_name;
 }

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

@@ -74,6 +74,10 @@ public class AfterwardsAudit implements Serializable {
 	@Excel(name = "医嘱号/处方号", width = 15)
     @ApiModelProperty(value = "医嘱号/处方号")
     private java.lang.String prescriptionNumber;
+    /**违规金额*/
+    @Excel(name = "违规金额", width = 15)
+    @ApiModelProperty(value = "违规金额")
+    private java.lang.Double amount;
 	/**反馈结果*/
 	@Excel(name = "反馈结果", width = 15)
     @ApiModelProperty(value = "反馈结果")
@@ -115,4 +119,7 @@ public class AfterwardsAudit implements Serializable {
     private Date startTime;
     @TableField(exist = false)
     private Date endTime;
+
+    @TableField(exist = false)
+    private java.lang.String interfName;
 }

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

@@ -0,0 +1,83 @@
+package org.jeecg.modules.medical.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: afterwards_incident_audit_diagnose
+ * @Author: jeecg-boot
+ * @Date:   2023-05-21 14:35:02
+ * @Version: V1.0
+ */
+@Data
+@TableName("afterwards_incident_audit_diagnose")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="afterwards_incident_audit_diagnose对象", description="afterwards_incident_audit_diagnose")
+public class AfterwardsIncidentAuditDiagnose implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键ID*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键ID")
+    private java.lang.Integer id;
+	/**事后监管工单ID*/
+	@Excel(name = "事后监管工单ID", width = 15)
+    @ApiModelProperty(value = "事后监管工单ID")
+    private java.lang.Integer afterwardsAuditId;
+	/**医院诊断编码*/
+	@Excel(name = "医院诊断编码", width = 15)
+    @ApiModelProperty(value = "医院诊断编码")
+    private java.lang.String diagnoseCode;
+	/**医院诊断描述*/
+	@Excel(name = "医院诊断描述", width = 15)
+    @ApiModelProperty(value = "医院诊断描述")
+    private java.lang.String diagnoseDesc;
+	/**医保诊断编码*/
+	@Excel(name = "医保诊断编码", width = 15)
+    @ApiModelProperty(value = "医保诊断编码")
+    private java.lang.String medDiagnoseCode;
+	/**医保诊断描述*/
+	@Excel(name = "医保诊断描述", width = 15)
+    @ApiModelProperty(value = "医保诊断描述")
+    private java.lang.String medDiagnoseDesc;
+	/**住院号/门诊号*/
+	@Excel(name = "住院号/门诊号", width = 15)
+    @ApiModelProperty(value = "住院号/门诊号")
+    private java.lang.String outpatientNumber;
+	/**医嘱号/处方号*/
+	@Excel(name = "医嘱号/处方号", width = 15)
+    @ApiModelProperty(value = "医嘱号/处方号")
+    private java.lang.String prescriptionNumber;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新时间")
+    private java.util.Date updateTime;
+}

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

@@ -44,6 +44,11 @@ public class ConsumableMaterial implements Serializable {
 	@Excel(name = "耗材编码", width = 15)
     @ApiModelProperty(value = "耗材编码")
     private java.lang.String consumableCode;
+
+    @Excel(name = "单价", width = 15)
+    @ApiModelProperty(value = "单价")
+    private BigDecimal price;
+
 	/**耗材版本*/
 	@Excel(name = "耗材版本", width = 15)
     @ApiModelProperty(value = "耗材版本")

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

@@ -80,6 +80,11 @@ public class DiagnosisTreatment implements Serializable {
 	@Excel(name = "项目内涵", width = 15)
     @ApiModelProperty(value = "项目内涵")
     private java.lang.String projectConnotation;
+
+    @Excel(name = "单价", width = 15)
+    @ApiModelProperty(value = "单价")
+    private BigDecimal price;
+
 	/**除外内容*/
 	@Excel(name = "除外内容", width = 15)
     @ApiModelProperty(value = "除外内容")

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

@@ -0,0 +1,67 @@
+package org.jeecg.modules.medical.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: medical_ins_rule_project_diagnose
+ * @Author: jeecg-boot
+ * @Date:   2023-05-21 16:21:29
+ * @Version: V1.0
+ */
+@Data
+@TableName("medical_ins_rule_project_diagnose")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="medical_ins_rule_project_diagnose对象", description="medical_ins_rule_project_diagnose")
+public class MedicalInsRuleProjectDiagnose implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键ID*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键ID")
+    private java.lang.Integer id;
+	/**医保规则id*/
+	@Excel(name = "医保规则id", width = 15)
+    @ApiModelProperty(value = "医保规则id")
+    private java.lang.Integer medicalInsRuleProjectId;
+	/**医保规则项目编码*/
+	@Excel(name = "医保规则项目编码", width = 15)
+    @ApiModelProperty(value = "医保规则项目编码")
+    private java.lang.String medicalInsProjectCode;
+	/**诊断编码*/
+	@Excel(name = "诊断编码", width = 15)
+    @ApiModelProperty(value = "诊断编码")
+    private java.lang.String medicalDiagnoseCode;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新时间")
+    private java.util.Date updateTime;
+}

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

@@ -52,6 +52,10 @@ public class Medicine implements Serializable {
     @Excel(name = "商品名称", width = 15)
     @ApiModelProperty(value = "商品名称")
     private java.lang.String commodityName;
+
+    @Excel(name = "单价", width = 15)
+    @ApiModelProperty(value = "单价")
+    private BigDecimal price;
     /**剂型*/
     @Excel(name = "剂型", width = 15)
     @ApiModelProperty(value = "剂型")

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

@@ -79,6 +79,10 @@ public class MidIncidentAudit implements Serializable {
 	@Excel(name = "医嘱号/处方号", width = 15)
     @ApiModelProperty(value = "医嘱号/处方号")
     private java.lang.String prescriptionNumber;
+    /**违规金额*/
+    @Excel(name = "违规金额", width = 15)
+    @ApiModelProperty(value = "违规金额")
+    private java.lang.Double amount;
 	/**反馈结果*/
 	@Excel(name = "反馈结果", width = 15)
     @ApiModelProperty(value = "反馈结果")

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

@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: mid_incident_visit_log
  * @Author: jeecg-boot
- * @Date:   2023-05-12 09:23:36
+ * @Date:   2023-05-21 18:30:54
  * @Version: V1.0
  */
 @Data
@@ -33,12 +33,12 @@ public class MidIncidentVisitLog implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键ID*/
-	@TableId(type = IdType.AUTO)
+	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键ID")
     private java.lang.Integer id;
 	/**就诊类别;住院/门诊*/
-	@Excel(name = "就诊类别;1：住院 2：门诊", width = 15)
-    @ApiModelProperty(value = "就诊类别;1：住院 2：门诊")
+	@Excel(name = "就诊类别;住院/门诊", width = 15)
+    @ApiModelProperty(value = "就诊类别;住院/门诊")
     private java.lang.String visitType;
 	/**科室编码*/
 	@Excel(name = "科室编码", width = 15)
@@ -72,10 +72,30 @@ public class MidIncidentVisitLog implements Serializable {
 	@Excel(name = "医嘱号/处方号", width = 15)
     @ApiModelProperty(value = "医嘱号/处方号")
     private java.lang.String doctorAdviceNo;
+	/**医师级别;*/
+	@Excel(name = "医师级别;", width = 15)
+    @ApiModelProperty(value = "医师级别;")
+    private java.lang.String doctorLevel;
+	/**离院方式;1.医嘱离院 2.医嘱转院、转社区、转卫生机构 3.非医嘱离院 4.死亡 9.其他*/
+	@Excel(name = "离院方式;1.医嘱离院 2.医嘱转院、转社区、转卫生机构 3.非医嘱离院 4.死亡 9.其他", width = 15)
+    @ApiModelProperty(value = "离院方式;1.医嘱离院 2.医嘱转院、转社区、转卫生机构 3.非医嘱离院 4.死亡 9.其他")
+    private java.lang.String dischargeStatus;
+	/**病人年龄;*/
+	@Excel(name = "病人年龄;", width = 15)
+    @ApiModelProperty(value = "病人年龄;")
+    private java.lang.String patientAge;
+	/**病人性别;*/
+	@Excel(name = "病人性别;", width = 15)
+    @ApiModelProperty(value = "病人性别;")
+    private java.lang.String patientGender;
+	/**项目总金额;*/
+	@Excel(name = "项目总金额;", width = 15)
+    @ApiModelProperty(value = "项目总金额;")
+    private java.lang.Double totoalAmount;
 	/**入院日期*/
-	@Excel(name = "入院日期", width = 15, format =  "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd")
-    @DateTimeFormat(pattern= "yyyy-MM-dd")
+	@Excel(name = "入院日期", width = 15, format =  "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "入院日期")
     private java.util.Date inHospDate;
 	/**诊断编码*/

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

@@ -40,6 +40,10 @@ public class MidIncidentWarningVO {
      * 医师级别
      */
     private String doctor_level;
+    /**
+     * 所有项目总金额
+     */
+    private Double totoal_amount;
 
     private List<AdviceDetailsVO> advice_details;//	true	Array	医嘱明细信息（多项）（内容说明参见advice_details(医嘱明细信息说明)）
 }

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

@@ -46,11 +46,11 @@ public class RuleAttr implements Serializable {
     private java.lang.String attrPath;
 	/**属性类型;属性类型*/
 	@Excel(name = "属性类型;属性类型", width = 15)
-    @ApiModelProperty(value = "属性类型;属性类型")
+    @ApiModelProperty(value = "属性类型;属性类型 1:以这个数据为明细主数据 2：附属属性")
     private java.lang.Integer attrType;
 	/**规则属性名;当有规则属性路径，属性类型时候,作为深度对象的属性*/
 	@Excel(name = "规则属性名;当有规则属性路径，属性类型时候,作为深度对象的属性", width = 15)
-    @ApiModelProperty(value = "规则属性名;当有规则属性路径，属性类型时候,作为深度对象的属性")
+    @ApiModelProperty(value = "规则属性名;当有规则属性路径，当有属性类型为2时候,作为深度对象的属性")
     private java.lang.String ruleAttr;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")

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

@@ -4,14 +4,18 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.ruleengine.RuleEngine;
 import org.jeecg.modules.medical.service.IAfterIncidentDetailLogService;
 import org.jeecg.modules.medical.service.IAfterIncidentLogService;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 事后触发监管
@@ -19,9 +23,10 @@ import java.util.List;
 public class AfterWaringJob implements Job {
     @Autowired
     IAfterIncidentLogService afterIncidentLogService;
-
     @Autowired
     IAfterIncidentDetailLogService afterIncidentDetailLogService;
+    @Autowired
+    RuleEngine ruleEngine;
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
@@ -32,10 +37,21 @@ public class AfterWaringJob implements Job {
             queryWrapper.last(" limit 1000");
             List<AfterIncidentLog> afterIncidentLogList = afterIncidentLogService.list(queryWrapper);
             for(AfterIncidentLog afterIncidentLog : afterIncidentLogList){
-                List<AfterIncidentDetailLog> afterIncidentDetailLogList = afterIncidentDetailLogService.lambdaQuery().in(AfterIncidentDetailLog::getAfterIncidentLogId, afterIncidentLog.getId()).list();
-
+                dealAftertask(afterIncidentLog);
             }
 
         }
     }
+
+
+    @Async("commonTaskAsyncPool")
+    public void dealAftertask(AfterIncidentLog afterIncidentLog){
+        AfterwardsAudit afterwardsAudit = ruleEngine.insertAfterWarning(afterIncidentLog);
+        afterIncidentLogService.lambdaUpdate().set(AfterIncidentLog::getState, Constant.DEALING).eq(AfterIncidentLog::getId, afterIncidentLog.getId()).update();
+        List<AfterIncidentDetailLog> afterIncidentDetailLogList = afterIncidentDetailLogService.lambdaQuery().eq(AfterIncidentDetailLog::getAfterIncidentLogId, afterIncidentLog.getId()).list();
+        for(AfterIncidentDetailLog afterIncidentDetailLog : afterIncidentDetailLogList) {
+            ruleEngine.dealAfterInterfaceEngin(afterwardsAudit, afterIncidentDetailLog);
+        }
+        afterIncidentLogService.lambdaUpdate().set(AfterIncidentLog::getState, Constant.SUCCESS).eq(AfterIncidentLog::getId, afterIncidentLog.getId()).update();
+    }
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/AfterwardsIncidentAuditDiagnoseMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.medical.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.medical.entity.AfterwardsIncidentAuditDiagnose;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: afterwards_incident_audit_diagnose
+ * @Author: jeecg-boot
+ * @Date:   2023-05-21 14:35:02
+ * @Version: V1.0
+ */
+public interface AfterwardsIncidentAuditDiagnoseMapper extends BaseMapper<AfterwardsIncidentAuditDiagnose> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/MedicalInsRuleProjectDiagnoseMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.medical.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.medical.entity.MedicalInsRuleProjectDiagnose;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: medical_ins_rule_project_diagnose
+ * @Author: jeecg-boot
+ * @Date:   2023-05-21 16:21:29
+ * @Version: V1.0
+ */
+public interface MedicalInsRuleProjectDiagnoseMapper extends BaseMapper<MedicalInsRuleProjectDiagnose> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/MidIncidentVisitLogMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: mid_incident_visit_log
  * @Author: jeecg-boot
- * @Date:   2023-05-12 09:23:36
+ * @Date:   2023-05-21 18:30:54
  * @Version: V1.0
  */
 public interface MidIncidentVisitLogMapper extends BaseMapper<MidIncidentVisitLog> {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/AfterwardsIncidentAuditDiagnoseMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.medical.mapper.AfterwardsIncidentAuditDiagnoseMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/MedicalInsRuleProjectDiagnoseMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.medical.mapper.MedicalInsRuleProjectDiagnoseMapper">
+
+</mapper>

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

@@ -11,6 +11,9 @@ import org.jeecg.common.util.dynamic.db.DynamicDBUtil;
 import org.jeecg.modules.medical.ColumnTypeEnum;
 import org.jeecg.modules.medical.Constant;
 import org.jeecg.modules.medical.EnchanceTypeEnum;
+import org.jeecg.modules.medical.entity.AfterIncidentLog;
+import org.jeecg.modules.medical.entity.AfterwardsAudit;
+import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
 import org.jeecg.modules.medical.entity.EventAttr;
 import org.jeecg.modules.medical.entity.FactorAttrRela;
 import org.jeecg.modules.medical.entity.FactorCondRela;
@@ -21,6 +24,8 @@ import org.jeecg.modules.medical.entity.MidIncidentAuditDetail;
 import org.jeecg.modules.medical.entity.MidIncidentWarningVO;
 import org.jeecg.modules.medical.entity.RuleFactorRela;
 import org.jeecg.modules.medical.ruleengine.dict.DictUtil;
+import org.jeecg.modules.medical.service.IAfterwardsAuditDetailService;
+import org.jeecg.modules.medical.service.IAfterwardsAuditService;
 import org.jeecg.modules.medical.service.IEventAttrService;
 import org.jeecg.modules.medical.service.IFactorAttrRelaService;
 import org.jeecg.modules.medical.service.IFactorCondRelaService;
@@ -32,6 +37,7 @@ import org.springframework.jdbc.support.rowset.SqlRowSet;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -63,6 +69,10 @@ public class FactorEnchangeFactory {
     IMidIncidentAuditService midIncidentAuditService;
     @Autowired
     IMidIncidentAuditDetailService midIncidentAuditDetailService;
+    @Autowired
+    IAfterwardsAuditService afterwardsAuditService;
+    @Autowired
+    IAfterwardsAuditDetailService afterwardsAuditDetailService;
 
     public static Map<Integer, EventAttr> enchanceAttrMap = new HashMap<>();
 
@@ -79,7 +89,7 @@ public class FactorEnchangeFactory {
 
     public boolean runFactorEnchange(Integer medicalInfoRuleInfoId, MedicalInsRuleInfo medicalInsRuleInfo, Object audit, Map<String, Object> localMap, List<RuleFactorRela> ruleFactorRelaList, List<FactorEnchance> factorEnchanceList) {
         Map<Integer, FactorEnchance> factorEnchanceMap = factorEnchanceList.stream().collect(Collectors.toMap(FactorEnchance::getId, v -> v, (v1, v2) -> v1));
-        boolean result = true;
+        boolean result = false;
         for (RuleFactorRela ruleFactorRela : ruleFactorRelaList) {
             Integer factorEnchanceId = ruleFactorRela.getFactorEnhanceId();
             FactorEnchance factorEnchance = factorEnchanceMap.get(factorEnchanceId);
@@ -112,7 +122,7 @@ public class FactorEnchangeFactory {
                     result = setLogicalExpressionResultByFactorEnchance(localMap, factorEnchance);
                     if (Constant.WARING_EVENT_ATTR_ID == factorEnchance.getEventAttrId()) {
                         if (result) {
-                            insertMidWarningDetail(localMap, medicalInsRuleInfo, audit);
+                            insertWarningDetail(localMap, medicalInsRuleInfo, audit);
                         }
                     } else {
                         localMap.put(getParamName(factorEnchance.getEventAttrId()), result);
@@ -146,9 +156,61 @@ public class FactorEnchangeFactory {
         return ioTypeMap;
     }
 
-    public void insertMidWarningDetail(Map<String, Object> itemMap, MedicalInsRuleInfo medicalInsRuleInfo, Object audit) {
+    public void insertWarningDetail(Map<String, Object> itemMap, MedicalInsRuleInfo medicalInsRuleInfo, Object audit){
         if(audit instanceof MidIncidentAudit) {
             MidIncidentAudit midIncidentAudit = (MidIncidentAudit) audit;
+            insertMidWarningDetail(itemMap, medicalInsRuleInfo, midIncidentAudit);
+        }else{
+            AfterwardsAudit afterwardsAudit = (AfterwardsAudit) audit;
+            insertAfterWarningDetail(itemMap, medicalInsRuleInfo, afterwardsAudit);
+        }
+    }
+
+    public void insertAfterWarningDetail(Map<String, Object> itemMap, MedicalInsRuleInfo medicalInsRuleInfo, AfterwardsAudit afterwardsAudit) {
+        Double amount = (Double) itemMap.get(Constant.AMOUNT_KEY);
+        if(Constant.VALIDATION_HANDER_METHOD_RETURN.equals(medicalInsRuleInfo.getViolationHandingMethod())) {
+            afterwardsAuditService.lambdaUpdate().set(AfterwardsAudit::getAmount, afterwardsAudit.getAmount()).eq(AfterwardsAudit::getId, afterwardsAudit.getId()).update();
+        }else {
+//            MidIncidentWarningVO midIncidentWarningVO = RuleEngine.midIncidentWarningVOThreadLocal.get();
+            AfterwardsAuditDetail afterwardsAuditDetail = new AfterwardsAuditDetail();
+            afterwardsAuditDetail.setMedicalDeptCode(afterwardsAudit.getMedicalDeptCode());
+            afterwardsAuditDetail.setMedicalDeptName(afterwardsAudit.getMedicalDeptName());
+            Date date = new Date(System.currentTimeMillis());
+            afterwardsAuditDetail.setCreateTime(date);
+            afterwardsAuditDetail.setDoctorName(afterwardsAudit.getDoctorName());
+            afterwardsAuditDetail.setDoctorId(afterwardsAudit.getDoctorId());
+            afterwardsAuditDetail.setPatientId(afterwardsAudit.getPatientId());
+            afterwardsAuditDetail.setPatientName(afterwardsAudit.getPatientName());
+            afterwardsAuditDetail.setTreatmentType(medicalInsRuleInfo.getTreatmentType());
+            afterwardsAuditDetail.setNoticeType("事后预警");
+            afterwardsAuditDetail.setMedicalInsRuleInfoCode(medicalInsRuleInfo.getRuleCode());
+            afterwardsAuditDetail.setMedicalInsRuleInfoId(medicalInsRuleInfo.getId());
+            afterwardsAuditDetail.setMedicalInsRuleInfoName(medicalInsRuleInfo.getRuleName());
+            afterwardsAuditDetail.setDescription(medicalInsRuleInfo.getDescription());
+            afterwardsAuditDetail.setProejctCode(itemMap.get(Constant.PROJECT_CODE_KEY).toString());
+            afterwardsAuditDetail.setProejctName(itemMap.get(Constant.PROJECT_NAME_KEY).toString());
+            afterwardsAuditDetail.setMedicalProjectCode(itemMap.get(Constant.MEDICAL_PROJECT_CODE_KEY).toString());
+            afterwardsAuditDetail.setMedicalProjectName(itemMap.get(Constant.MEDICAL_PROJECT_NAME_KEY).toString());
+            afterwardsAuditDetail.setOutpatientNumber(afterwardsAudit.getOutpatientNumber());
+            afterwardsAuditDetail.setPrescriptionNumber(afterwardsAudit.getPrescriptionNumber());
+            afterwardsAuditDetail.setProjectType(itemMap.getOrDefault(Constant.PROJECT_TYPE_KEY, "default").toString());
+            afterwardsAuditDetail.setViolationLevel(medicalInsRuleInfo.getViolationLevel());
+            afterwardsAuditDetail.setTreatmentType(medicalInsRuleInfo.getTreatmentType());
+            afterwardsAuditDetail.setAfterwardsAuditId(afterwardsAudit.getId());
+            afterwardsAuditDetail.setAmount(new BigDecimal(amount));
+            afterwardsAuditService.lambdaUpdate().setSql("amount +"+amount).eq(AfterwardsAudit::getId, afterwardsAudit.getId()).update();
+            afterwardsAuditDetailService.save(afterwardsAuditDetail);
+        }
+
+
+    }
+
+    public void insertMidWarningDetail(Map<String, Object> itemMap, MedicalInsRuleInfo medicalInsRuleInfo, MidIncidentAudit midIncidentAudit) {
+
+        Double amount = (Double) itemMap.get(Constant.AMOUNT_KEY);
+        if(Constant.VALIDATION_HANDER_METHOD_RETURN.equals(medicalInsRuleInfo.getViolationHandingMethod())) {
+            midIncidentAuditService.lambdaUpdate().set(MidIncidentAudit::getAmount, midIncidentAudit.getAmount()).eq(MidIncidentAudit::getId, midIncidentAudit.getId()).update();
+        }else {
             MidIncidentWarningVO midIncidentWarningVO = RuleEngine.midIncidentWarningVOThreadLocal.get();
             MidIncidentAuditDetail midIncidentAuditDetail = new MidIncidentAuditDetail();
             midIncidentAuditDetail.setMedicalDeptCode(midIncidentWarningVO.getMedical_dept_code());
@@ -175,9 +237,12 @@ public class FactorEnchangeFactory {
             midIncidentAuditDetail.setViolationLevel(medicalInsRuleInfo.getViolationLevel());
             midIncidentAuditDetail.setTreatmentType(medicalInsRuleInfo.getTreatmentType());
             midIncidentAuditDetail.setMidIncidentAuditId(midIncidentAudit.getId());
-            midIncidentAuditDetail.setAmount((Double) itemMap.get(Constant.AMOUNT_KEY));
+            midIncidentAuditDetail.setAmount(amount);
+            midIncidentAuditService.lambdaUpdate().setSql("amount +"+amount).eq(MidIncidentAudit::getId, midIncidentAudit.getId()).update();
             midIncidentAuditDetailService.save(midIncidentAuditDetail);
         }
+
+
     }
 
 

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

@@ -12,10 +12,15 @@ import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.medical.Constant;
 import org.jeecg.modules.medical.SystemEventAttrConstant;
 import org.jeecg.modules.medical.entity.AdviceDetailsVO;
+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.AfterwardsIncidentAuditDiagnose;
 import org.jeecg.modules.medical.entity.DiagnosesVO;
 import org.jeecg.modules.medical.entity.FactorEnchance;
 import org.jeecg.modules.medical.entity.MedicalInsRuleInfo;
 import org.jeecg.modules.medical.entity.MedicalInsRuleProject;
+import org.jeecg.modules.medical.entity.MedicalInsRuleProjectDiagnose;
 import org.jeecg.modules.medical.entity.MidIncidentAudit;
 import org.jeecg.modules.medical.entity.MidIncidentAuditDiagnose;
 import org.jeecg.modules.medical.entity.MidIncidentVisitDetailLog;
@@ -25,11 +30,12 @@ import org.jeecg.modules.medical.entity.RuleAttr;
 import org.jeecg.modules.medical.entity.RuleFactorRela;
 import org.jeecg.modules.medical.ruleengine.dict.DictUtil;
 import org.jeecg.modules.medical.ruleengine.plugin.InterfItemListPlugin;
-import org.jeecg.modules.medical.service.IEventAttrService;
-import org.jeecg.modules.medical.service.IFactorAttrRelaService;
-import org.jeecg.modules.medical.service.IFactorCondRelaService;
+import org.jeecg.modules.medical.service.IAfterwardsAuditDetailService;
+import org.jeecg.modules.medical.service.IAfterwardsAuditService;
+import org.jeecg.modules.medical.service.IAfterwardsIncidentAuditDiagnoseService;
 import org.jeecg.modules.medical.service.IFactorEnchanceService;
 import org.jeecg.modules.medical.service.IMedicalInsRuleInfoService;
+import org.jeecg.modules.medical.service.IMedicalInsRuleProjectDiagnoseService;
 import org.jeecg.modules.medical.service.IMedicalInsRuleProjectService;
 import org.jeecg.modules.medical.service.IMidIncidentAuditDiagnoseService;
 import org.jeecg.modules.medical.service.IMidIncidentAuditService;
@@ -46,6 +52,7 @@ import javax.annotation.PostConstruct;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -63,7 +70,7 @@ public class RuleEngine {
     private IMedicalInsRuleInfoService medicalInsRuleInfoService;
     @Autowired
     private IFactorEnchanceService factorEnchanceService;
-//    @Autowired
+    //    @Autowired
 //    private IEventAttrService eventAttrService;
 //    @Autowired
 //    private IFactorAttrRelaService factorAttrRelaService;
@@ -91,6 +98,14 @@ public class RuleEngine {
     @Autowired
     IMidIncidentVisitDetailLogService midIncidentVisitDetailLogService;
     @Autowired
+    IAfterwardsAuditService afterwardsAuditService;
+    @Autowired
+    IAfterwardsAuditDetailService afterwardsAuditDetailService;
+    @Autowired
+    IAfterwardsIncidentAuditDiagnoseService afterwardsIncidentAuditDiagnoseService;
+    @Autowired
+    IMedicalInsRuleProjectDiagnoseService medicalInsRuleProjectDiagnoseService;
+    @Autowired
     DictUtil dictUtil;
     @Autowired
     WebSocket webSocket;
@@ -152,6 +167,18 @@ public class RuleEngine {
                                 itemCodeAndRuleIdMap.put(medicalInsRuleProject.getCorrelationProjectCode(), ruleIdSet);
                             }
                         }
+                        List<MedicalInsRuleProjectDiagnose> medicalInsRuleProjectDiagnoseList = medicalInsRuleProjectDiagnoseService.lambdaQuery().eq(MedicalInsRuleProjectDiagnose::getMedicalInsRuleProjectId, medicalInsRuleProject.getMedicineInsRuleInfoId()).list();
+                        if (CollectionUtil.isNotEmpty(medicalInsRuleProjectDiagnoseList)) {
+                            for (MedicalInsRuleProjectDiagnose medicalInsRuleProjectDiagnose : medicalInsRuleProjectDiagnoseList) {
+                                if (itemCodeAndRuleIdMap.containsKey(medicalInsRuleProjectDiagnose.getMedicalDiagnoseCode())) {
+                                    itemCodeAndRuleIdMap.get(medicalInsRuleProjectDiagnose.getMedicalDiagnoseCode()).add(medicalInsRuleProject.getMedicineInsRuleInfoId());
+                                } else {
+                                    Set<Integer> ruleIdSet = new HashSet<>();
+                                    ruleIdSet.add(medicalInsRuleProject.getMedicineInsRuleInfoId());
+                                    itemCodeAndRuleIdMap.put(medicalInsRuleProjectDiagnose.getMedicalDiagnoseCode(), ruleIdSet);
+                                }
+                            }
+                        }
 //                        setMIDProjectCodeToRedis(medicalInsRuleProject);
                     }
                 }
@@ -181,14 +208,6 @@ public class RuleEngine {
         }
     }
 
-    public Integer getMIDMedicalId(String itemCode) {
-        Object medicineInsRuleId = redisTemplate.opsForHash().get(Constant.MEDICAL_RULE_CACHE_KEY, itemCode);
-//        redisTemplate.opsForSet().add(Constant.MEDICAL_RULE_CACHE_KEY)
-        if (null != medicineInsRuleId) {
-            return (Integer) medicineInsRuleId;
-        }
-        return null;
-    }
 
     public Result dealMidInterfaceEngin(String intefName, MidIncidentWarningVO midIncidentWarningVO, String ipStr) {
         midIncidentWarningVOThreadLocal.set(midIncidentWarningVO);
@@ -214,10 +233,13 @@ public class RuleEngine {
                 }
                 Object diagnose = itemMap.get(Constant.MEDICAL_DIAGNOSE_CODE_KEY);
                 if (null != diagnose) {
+                    List<Object> diagnoseList = (List<Object>) diagnose;
                     //获取诊断编码配置的规则ID，加入需要执行的规则
-                    Set<Integer> diagnoseMedicalInsRuleInfoIdList = itemCodeAndRuleIdMap.get(diagnose.toString());
-                    if (CollectionUtil.isNotEmpty(diagnoseMedicalInsRuleInfoIdList)) {
-                        medicalInsRuleInfoIdList.addAll(diagnoseMedicalInsRuleInfoIdList);
+                    for (Object diagnoseObject : diagnoseList) {
+                        Set<Integer> diagnoseMedicalInsRuleInfoIdList = itemCodeAndRuleIdMap.get(diagnoseObject.toString());
+                        if (CollectionUtil.isNotEmpty(diagnoseMedicalInsRuleInfoIdList)) {
+                            medicalInsRuleInfoIdList.addAll(diagnoseMedicalInsRuleInfoIdList);
+                        }
                     }
                 }
                 runMidEngine(auditDetailSet, itemMap, medicalInsRuleInfoIdList, midIncidentAudit, ipStr);
@@ -231,6 +253,55 @@ public class RuleEngine {
         return Result.ok();
     }
 
+
+    /**
+     * 事后明细
+     *
+     * @param intefName
+     * @param afterwardsAudit
+     * @param afterIncidentDetailLog
+     */
+    public void dealAfterInterfaceEngin(AfterwardsAudit afterwardsAudit, AfterIncidentDetailLog afterIncidentDetailLog) {
+
+        try {
+//            List<RuleAttr> ruleAttrList = interfRuleAttrList.get(intefName);
+//            if (null == ruleAttrList) {
+//
+//                return Result.error("接口：" + intefName + " 未配置 对应的规则属性");
+//            }
+            dictUtil.transferAfterIncidentWarning(afterIncidentDetailLog);
+            String jsonStr = JSON.toJSONString(afterIncidentDetailLog);
+            log.info("事后处理日志:{}", jsonStr);
+            JSONObject itemMap = JSON.parseObject(jsonStr);
+//            List<Map<String, Object>> itemList = interfItemListPlugin.findProIntersection(paramMap, ruleAttrList);
+
+//            insertAfterWarning(afterwardsAudit);
+//            midIncidentAudit.setInterfName(intefName);
+            Set<String> auditDetailSet = new HashSet<>();
+//            for (Map<String, Object> itemMap : itemList) {
+            Set<Integer> medicalInsRuleInfoIdList = itemCodeAndRuleIdMap.get(itemMap.get(Constant.MEDICAL_PROJECT_CODE_KEY));
+            if (CollectionUtil.isEmpty(medicalInsRuleInfoIdList)) {
+                log.error("项目编码未匹配到对应的医保规则:{}", itemMap.get(Constant.MEDICAL_PROJECT_CODE_KEY));
+                return;
+            }
+            Object diagnose = itemMap.get(Constant.MEDICAL_DIAGNOSE_CODE_KEY);
+            if (null != diagnose) {
+                //获取诊断编码配置的规则ID，加入需要执行的规则
+                Set<Integer> diagnoseMedicalInsRuleInfoIdList = itemCodeAndRuleIdMap.get(diagnose.toString());
+                if (CollectionUtil.isNotEmpty(diagnoseMedicalInsRuleInfoIdList)) {
+                    medicalInsRuleInfoIdList.addAll(diagnoseMedicalInsRuleInfoIdList);
+                }
+            }
+            runAfterEngine(auditDetailSet, itemMap, medicalInsRuleInfoIdList, afterwardsAudit);
+//            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+
+//        return Result.ok();
+    }
+
+
     public void insertLog(MidIncidentWarningVO midIncidentWarningVO) {
         MidIncidentVisitLog midIncidentVisitLog = new MidIncidentVisitLog();
         midIncidentVisitLog.setDoctorId(midIncidentWarningVO.getDoctor_code());
@@ -238,6 +309,11 @@ public class RuleEngine {
         midIncidentVisitLog.setVisitNo(midIncidentWarningVO.getVisit_no());
         midIncidentVisitLog.setPatientId(midIncidentWarningVO.getPatient_id());
         midIncidentVisitLog.setPatientName(midIncidentWarningVO.getPatient_name());
+        midIncidentVisitLog.setDoctorLevel(midIncidentWarningVO.getDoctor_level());
+        midIncidentVisitLog.setPatientAge(midIncidentWarningVO.getPatient_age());
+        midIncidentVisitLog.setPatientGender(midIncidentWarningVO.getPatient_gender());
+        midIncidentVisitLog.setDischargeStatus(midIncidentWarningVO.getDischarge_status());
+        midIncidentVisitLog.setTotoalAmount(midIncidentWarningVO.getTotoal_amount());
         if (CollectionUtil.isNotEmpty(midIncidentWarningVO.getDiagnoses())) {
             midIncidentVisitLog.setDiagnoses(JSON.toJSONString(midIncidentWarningVO.getDiagnoses()));
         }
@@ -293,6 +369,7 @@ public class RuleEngine {
                 midIncidentVisitDetailLog.setProejctName(adviceDetailsVO.getProject_name());
                 midIncidentVisitDetailLog.setPatientId(midIncidentWarningVO.getPatient_id());
                 midIncidentVisitDetailLog.setPatientId(midIncidentWarningVO.getPatient_name());
+                midIncidentVisitDetailLog.setAmount(new BigDecimal(adviceDetailsVO.getAmount()));
                 midIncidentVisitDetailLogList.add(midIncidentVisitDetailLog);
             }
             midIncidentVisitDetailLogService.saveBatch(midIncidentVisitDetailLogList);
@@ -312,7 +389,19 @@ public class RuleEngine {
         midIncidentAudit.setTreatmentType(midIncidentWarningVO.getVisit_type());
         midIncidentAudit.setPrescriptionNumber(midIncidentWarningVO.getDoctor_advice_no());
         midIncidentAudit.setNoticeType("事中预警");
+
         midIncidentAuditService.save(midIncidentAudit);
+        double allAmount = 0;
+        if (null != midIncidentWarningVO.getTotoal_amount() && midIncidentWarningVO.getTotoal_amount() > 0) {
+            allAmount = midIncidentWarningVO.getTotoal_amount();
+        } else {
+            if (CollectionUtil.isNotEmpty(midIncidentWarningVO.getAdvice_details())) {
+                for (AdviceDetailsVO adviceDetailsVO : midIncidentWarningVO.getAdvice_details()) {
+                    allAmount = allAmount + adviceDetailsVO.getAmount();
+                }
+            }
+        }
+        midIncidentAudit.setAmount(allAmount);
         if (CollectionUtil.isNotEmpty(midIncidentWarningVO.getDiagnoses())) {
             List<MidIncidentAuditDiagnose> midIncidentAuditDiagnoseList = new ArrayList<>();
             for (DiagnosesVO diagnosesVO : midIncidentWarningVO.getDiagnoses()) {
@@ -334,58 +423,95 @@ public class RuleEngine {
         return midIncidentAudit;
     }
 
-    public List<Integer> getMedicalInsRuleInfoIdByIntef(String intefName, Map<String, Object> paramMap, List<RuleAttr> ruleAttrList) {
-
-        List<Integer> medicalIdList = new ArrayList<>();
-        Map<String, List<Integer>> itemCodeAndRuleIdMap = new HashMap<>();
-        for (RuleAttr ruleAttr : ruleAttrList) {
-            String itemCode = null;
-            if (StringUtils.isNotBlank(ruleAttr.getAttrPath())) {
-                Object value = paramMap.get(ruleAttr.getAttrPath());
-                if (null == value) {
-                    log.error("接口调用:{} 不存在 属性路径:{}", intefName, ruleAttr.getAttrPath());
-                    break;
-                }
-                String attrName = ruleAttr.getRuleAttr();
-                if (value instanceof List) {
-                    List<Map<String, Object>> pathValueList = (List<Map<String, Object>>) value;
-                    for (Map<String, Object> itemMap : pathValueList) {
-                        Object itemCodeTemp = itemMap.get(attrName);
-                        if (null != itemCodeTemp) {
-                            itemCode = (String) itemCodeTemp;
-                            Integer medicineInsRuleId = getMIDMedicalId(itemCode);
-                            if (null != medicineInsRuleId) {
-                                medicalIdList.add(medicineInsRuleId);
-                            }
-                        }
-                    }
-                } else if (value instanceof Map) {
-                    Map<String, Object> pathValueMap = (Map) value;
-                    Object itemCodeTemp = pathValueMap.get(attrName);
-                    if (null != itemCodeTemp) {
-                        itemCode = (String) itemCodeTemp;
-                        Integer medicineInsRuleId = getMIDMedicalId(itemCode);
-                        if (null != medicineInsRuleId) {
-                            medicalIdList.add(medicineInsRuleId);
-                        }
-                    }
-                }
-            } else {
-                Object itemCodeObject = paramMap.get(ruleAttr.getRuleAttr());
-                if (null != itemCodeObject) {
-                    Integer medicineInsRuleId = getMIDMedicalId(itemCodeObject.toString());
-                    if (null != medicineInsRuleId) {
-                        medicalIdList.add(medicineInsRuleId);
-                    }
-                }
+
+    public AfterwardsAudit insertAfterWarning(AfterIncidentLog afterIncidentLog) {
+        AfterwardsAudit afterwardsAudit = new AfterwardsAudit();
+        afterwardsAudit.setMedicalDeptCode(afterIncidentLog.getMedicalDeptCode());
+        afterwardsAudit.setMedicalDeptName(afterIncidentLog.getMedicalDeptName());
+        Date date = new Date(System.currentTimeMillis());
+        afterwardsAudit.setCreateTime(date);
+        afterwardsAudit.setDoctorName(afterIncidentLog.getDoctorName());
+        afterwardsAudit.setDoctorId(afterIncidentLog.getDoctorId());
+        afterwardsAudit.setPatientId(afterIncidentLog.getPatientId());
+        afterwardsAudit.setPatientName(afterIncidentLog.getPatientName());
+        afterwardsAudit.setTreatmentType(afterIncidentLog.getVisitType());
+        afterwardsAudit.setPrescriptionNumber(afterIncidentLog.getDoctorAdviceNo());
+        afterwardsAudit.setOutpatientNumber(afterIncidentLog.getVisitNo());
+        afterwardsAudit.setNoticeType("事后预警");
+        afterwardsAuditService.save(afterwardsAudit);
+        if (StringUtils.isNotBlank(afterIncidentLog.getDiagnoses())) {
+            List<String> diagonseCodeList = Arrays.asList(afterIncidentLog.getDiagnoses().split(","));
+//            List<String> diagonseNameList = Arrays.asList(afterIncidentDetailLog.getDiagnose_desc().split(","));
+            List<AfterwardsIncidentAuditDiagnose> afterIncidentAuditDiagnoseList = new ArrayList<>();
+            for (int i = 0; i < diagonseCodeList.size(); i++) {
+                String diagonseCode = diagonseCodeList.get(i);
+//                String diagonseName = diagonseNameList.get(i);
+//                Object value = redisTemplate.opsForHash().get(Constant.HIS_MEDICAL_DICT_KEY, afterIncidentDetailLog.getDiagnose_code());
+                String medicalDiagonseCode = dictUtil.getMedicalDiagnoseCode(diagonseCode);
+                String medicalDiagnoseName = dictUtil.getMedicalDiagnoseName(medicalDiagonseCode);
+                AfterwardsIncidentAuditDiagnose afterIncidentAuditDiagnose = new AfterwardsIncidentAuditDiagnose();
+                afterIncidentAuditDiagnose.setAfterwardsAuditId(afterwardsAudit.getId());
+                afterIncidentAuditDiagnose.setDiagnoseCode(diagonseCode);
+//                afterIncidentAuditDiagnose.setDiagnoseDesc(diagonseName);
+                afterIncidentAuditDiagnose.setMedDiagnoseCode(medicalDiagonseCode);
+                afterIncidentAuditDiagnose.setMedDiagnoseDesc(medicalDiagnoseName);
+                afterIncidentAuditDiagnose.setCreateTime(date);
+                afterIncidentAuditDiagnose.setOutpatientNumber(afterwardsAudit.getOutpatientNumber());
+                afterIncidentAuditDiagnose.setPrescriptionNumber(afterwardsAudit.getPrescriptionNumber());
+                afterIncidentAuditDiagnoseList.add(afterIncidentAuditDiagnose);
             }
+
+
+            afterwardsIncidentAuditDiagnoseService.saveBatch(afterIncidentAuditDiagnoseList);
         }
 
-//        paramMap.put("itemList", itemList);
-        return medicalIdList;
+
+        return afterwardsAudit;
     }
 
 
+    /**
+     * 事中跑批规则引擎
+     *
+     * @param paramMap
+     */
+    public void runAfterEngine(Set<String> auditDetailSet, Map<String, Object> paramMap, Set<Integer> medicalInsRuleInfoIdList, AfterwardsAudit afterIncidentAudit) {
+        if (CollectionUtil.isEmpty(medicalInsRuleInfoIdList)) {
+            log.error("未有对应的规则，接口数据:{}", paramMap);
+            return;
+        }
+        LambdaQueryWrapper<RuleFactorRela> query = new LambdaQueryWrapper<RuleFactorRela>();
+        query.eq(RuleFactorRela::getDelFlag, CommonConstant.DEL_FLAG_0);
+        query.in(RuleFactorRela::getMedicalInsRuleInfoId, medicalInsRuleInfoIdList);
+        query.orderByAsc(RuleFactorRela::getSeqNum);
+        List<RuleFactorRela> ruleFactorRelaList = ruleFactorRelaService.list(query);
+
+        if (CollectionUtil.isNotEmpty(ruleFactorRelaList)) {
+            Map<Integer, List<RuleFactorRela>> ruleIdAndFatorEnchanceIdMap = ruleFactorRelaList.stream().collect(Collectors.groupingBy(RuleFactorRela::getMedicalInsRuleInfoId));
+            Set<Integer> factorEnchangeIdList = ruleFactorRelaList.stream().map(RuleFactorRela::getFactorEnhanceId).collect(Collectors.toSet());
+            List<FactorEnchance> factorEnchanceList = factorEnchanceService.listByIds(factorEnchangeIdList);
+            Map<Integer, List<FactorEnchance>> enchanceTypeMap = factorEnchanceList.stream().collect(Collectors.groupingBy(FactorEnchance::getFactorCatalog));
+            for (Integer medicalRuleInsInfoId : enchanceTypeMap.keySet()) {
+                String auditDetailKeyStr = paramMap.get(Constant.MEDICAL_PROJECT_NAME_KEY) + "_" + medicalRuleInsInfoId;
+                if (auditDetailSet.contains(auditDetailKeyStr)) {
+                    log.error("项目编码:{} 规则ID:{} 已经执行过规则引擎，此次忽略", paramMap.get(Constant.MEDICAL_PROJECT_NAME_KEY), medicalRuleInsInfoId);
+                    continue;
+                }
+                auditDetailSet.add(auditDetailKeyStr);
+                MedicalInsRuleInfo medicalInsRuleInfo = medicalInsRuleInfoService.getById(medicalRuleInsInfoId);
+                List<FactorEnchance> factorEnchanceListTemp = enchanceTypeMap.get(medicalRuleInsInfoId);
+                paramMap.put(SystemEventAttrConstant.MEDICAL_INS_RULE_INFO_ID, medicalRuleInsInfoId);
+                List<RuleFactorRela> ruleFactorRelaSortList = ruleIdAndFatorEnchanceIdMap.get(medicalRuleInsInfoId);
+
+                boolean auditFlag = factorEnchangeFactory.runFactorEnchange(medicalRuleInsInfoId, medicalInsRuleInfo, afterIncidentAudit, paramMap, ruleFactorRelaSortList, factorEnchanceListTemp);
+                if (Constant.VALIDATION_HANDER_METHOD_RETURN.equals(medicalInsRuleInfo.getViolationHandingMethod()) && auditFlag) {
+                    log.error("事后提醒数据：{} 规则名：{} 触发诊断类规则，直接全金额，后续规则无需再跑", paramMap, medicalInsRuleInfo);
+                    return;
+                }
+            }
+        }
+    }
+
     /**
      * 事中跑批规则引擎
      *
@@ -420,7 +546,12 @@ public class RuleEngine {
                 paramMap.put(SystemEventAttrConstant.MEDICAL_INS_RULE_INFO_ID, medicalRuleInsInfoId);
                 List<RuleFactorRela> ruleFactorRelaSortList = ruleIdAndFatorEnchanceIdMap.get(medicalRuleInsInfoId);
 
-                factorEnchangeFactory.runFactorEnchange(medicalRuleInsInfoId, medicalInsRuleInfo, midIncidentAudit, paramMap, ruleFactorRelaSortList, factorEnchanceListTemp);
+//                factorEnchangeFactory.runFactorEnchange(medicalRuleInsInfoId, medicalInsRuleInfo, midIncidentAudit, paramMap, ruleFactorRelaSortList, factorEnchanceListTemp);
+                boolean auditFlag = factorEnchangeFactory.runFactorEnchange(medicalRuleInsInfoId, medicalInsRuleInfo, midIncidentAudit, paramMap, ruleFactorRelaSortList, factorEnchanceListTemp);
+                if (Constant.VALIDATION_HANDER_METHOD_RETURN.equals(medicalInsRuleInfo.getViolationHandingMethod()) && auditFlag) {
+                    log.error("事中提醒数据：{} 规则名：{} 触发诊断类规则，直接全金额，后续规则无需再跑", paramMap, medicalInsRuleInfo);
+                    return;
+                }
             }
         }
         webSocket.pushMessage(ipStr, JSON.toJSONString(midIncidentAudit));

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

@@ -5,6 +5,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.modules.medical.Constant;
 import org.jeecg.modules.medical.entity.AdviceDetailsVO;
+import org.jeecg.modules.medical.entity.AfterIncidentDetailLog;
 import org.jeecg.modules.medical.entity.DiagnosesVO;
 import org.jeecg.modules.medical.entity.FactorEnchance;
 import org.jeecg.modules.medical.entity.MidIncidentWarningVO;
@@ -13,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -137,6 +140,83 @@ public class DictUtil {
         }
     }
 
+    public String getMedicalDiagnoseCode(String diagnoseCode){
+        Object value = redisTemplate.opsForHash().get(Constant.HIS_MEDICAL_DICT_KEY, diagnoseCode);
+        if(value == null){
+            return diagnoseCode;
+        }
+        return value.toString();
+    }
+
+    public String getMedicalDiagnoseName(String medicalDiagnoseCode){
+        Object value = redisTemplate.opsForHash().get(Constant.MEDICAL_CODE_NAME_KEY, medicalDiagnoseCode);
+        if(value == null){
+            return null;
+        }
+        return value.toString();
+    }
+
+
+    /**
+     * 转换医保和医院编码
+     *
+     * @param afterIncidentDetailLog
+     */
+    public void transferAfterIncidentWarning(AfterIncidentDetailLog afterIncidentDetailLog) {
+        if (StringUtils.isNotBlank(afterIncidentDetailLog.getDiagnose_code_str())) {
+
+            String[] diagnoseCodeArr = afterIncidentDetailLog.getDiagnose_code_str().split(Constant.SPLIT_STR);
+            StringBuffer medicalDiagnoseNameStr = new StringBuffer();
+            StringBuffer medicalDiagnoseCodeStr = new StringBuffer();
+            List<String> medicalDiagnoseNameList = new ArrayList<>();
+            List<String> medicalDiagnoseCodeList = new ArrayList<>();
+            for(String diagnose_code : diagnoseCodeArr) {
+                Object value = redisTemplate.opsForHash().get(Constant.HIS_MEDICAL_DICT_KEY, diagnose_code);
+                if (value == null) {
+                    log.error("字段未配置该诊断编码映射的医保记录,项目:{}", afterIncidentDetailLog);
+//                    value = diagnose_code;
+//                    medicalDiagnoseCodeStr.append(value).append(Constant.SPLIT_STR);
+//                    medicalDiagnoseNameStr.append(afterIncidentDetailLog.getDiagnose_desc())
+//                    afterIncidentDetailLog.setMedical_diagnose_code(value.toString());
+//                    afterIncidentDetailLog.setMedical_diagnose_name(afterIncidentDetailLog.getDiagnose_desc());
+                } else {
+                    medicalDiagnoseCodeStr.append(value).append(Constant.SPLIT_STR);
+                    medicalDiagnoseCodeList.add(value.toString());
+
+//                    medicalDiagnoseNameStr.append(afterIncidentDetailLog.getDiagnose_desc())
+//                    afterIncidentDetailLog.setMedical_diagnose_code(value.toString());
+//                        itemMap.put(Constant.MEDICAL_DIAGNOSE_CODE_KEY, value);
+                    Object name = redisTemplate.opsForHash().get(Constant.MEDICAL_CODE_NAME_KEY, value.toString());
+                    if (null != name) {
+                        medicalDiagnoseNameStr.append(name).append(Constant.SPLIT_STR);
+                        medicalDiagnoseNameList.add(name.toString());
+                    }
+                }
+            }
+            afterIncidentDetailLog.setMedical_diagnose_code_str(medicalDiagnoseCodeStr.toString());
+            afterIncidentDetailLog.setMedical_diagnose_name_str(medicalDiagnoseNameStr.toString());
+            afterIncidentDetailLog.setMedical_diagnose_code(medicalDiagnoseCodeList);
+            afterIncidentDetailLog.setMedical_diagnose_name(medicalDiagnoseNameList);
+        }
+
+
+        Object value = redisTemplate.opsForHash().get(Constant.HIS_MEDICAL_DICT_KEY, afterIncidentDetailLog.getProject_code());
+        if (value == null) {
+            log.error("字段未配置该项目编码映射的医保记录,项目:{}", afterIncidentDetailLog);
+            value = afterIncidentDetailLog.getProject_code();
+            afterIncidentDetailLog.setMedical_project_code(value.toString());
+            afterIncidentDetailLog.setMedical_project_name(afterIncidentDetailLog.getProject_name());
+        }else {
+            afterIncidentDetailLog.setMedical_project_code(value.toString());
+//                        itemMap.put(Constant.MEDICAL_DIAGNOSE_CODE_KEY, value);
+            Object name = redisTemplate.opsForHash().get(Constant.MEDICAL_CODE_NAME_KEY, value.toString());
+            if (null != name) {
+                afterIncidentDetailLog.setMedical_project_name(name.toString());
+            }
+        }
+
+    }
+
     /**
      * 转换医保和医院编码
      *

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

@@ -30,12 +30,22 @@ public class InterfItemListPlugin {
                     break;
                 }
                 String attrName = ruleAttr.getRuleAttr();
+                Integer attrType = ruleAttr.getAttrType();
                 if (value instanceof List) {
                     List<Map<String, Object>> pathValueList = (List<Map<String, Object>>) value;
                     if(CollectionUtil.isEmpty(itemList)){
-                        itemList = pathValueList;
+                        if(1 == attrType) {
+                            itemList = pathValueList;
+                        }else{
+                            log.error("项目编码未排序在最前端，请调整rule_attr表配置");
+                        }
+
                     }else {
-                        itemList = setListToList(itemList, pathValueList, attrName);
+                        if(2 == attrType){
+                            setListAttrToList(itemList, pathValueList, attrName);
+                        }else {
+                            itemList = setListToList(itemList, pathValueList, attrName);
+                        }
                     }
                 }else if(value instanceof Map){
                     Map<String,Object> pathValueMap = (Map) value;
@@ -57,6 +67,20 @@ public class InterfItemListPlugin {
         return itemList;
     }
 
+    public void setListAttrToList(List<Map<String,Object>> srcItemList, List<Map<String,Object>> itemTempList, String attrName){
+        List<Map<String,Object>> resultList = new ArrayList<>();
+        Map<String,Object> temMap = null;
+        List<Object> itemTempObjectList = new ArrayList<>();
+        for(Map<String,Object> itemTempMap : itemTempList){
+
+            itemTempObjectList.add(itemTempMap.get(attrName));
+        }
+        for(Map<String,Object> itemMap : srcItemList){
+
+            itemMap.put(attrName, itemTempObjectList);
+        }
+    }
+
     public List<Map<String,Object>> setListToList(List<Map<String,Object>> itemList, List<Map<String,Object>> itemTempList, String attrName){
         List<Map<String,Object>> resultList = new ArrayList<>();
         Map<String,Object> temMap = null;

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.medical.service;
+
+import org.jeecg.modules.medical.entity.AfterwardsIncidentAuditDiagnose;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: afterwards_incident_audit_diagnose
+ * @Author: jeecg-boot
+ * @Date:   2023-05-21 14:35:02
+ * @Version: V1.0
+ */
+public interface IAfterwardsIncidentAuditDiagnoseService extends IService<AfterwardsIncidentAuditDiagnose> {
+
+}

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.medical.service;
+
+import org.jeecg.modules.medical.entity.MedicalInsRuleProjectDiagnose;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: medical_ins_rule_project_diagnose
+ * @Author: jeecg-boot
+ * @Date:   2023-05-21 16:21:29
+ * @Version: V1.0
+ */
+public interface IMedicalInsRuleProjectDiagnoseService extends IService<MedicalInsRuleProjectDiagnose> {
+
+}

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: mid_incident_visit_log
  * @Author: jeecg-boot
- * @Date:   2023-05-12 09:23:36
+ * @Date:   2023-05-21 18:30:54
  * @Version: V1.0
  */
 public interface IMidIncidentVisitLogService extends IService<MidIncidentVisitLog> {

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.medical.service.impl;
+
+import org.jeecg.modules.medical.entity.AfterwardsIncidentAuditDiagnose;
+import org.jeecg.modules.medical.mapper.AfterwardsIncidentAuditDiagnoseMapper;
+import org.jeecg.modules.medical.service.IAfterwardsIncidentAuditDiagnoseService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: afterwards_incident_audit_diagnose
+ * @Author: jeecg-boot
+ * @Date:   2023-05-21 14:35:02
+ * @Version: V1.0
+ */
+@Service
+public class AfterwardsIncidentAuditDiagnoseServiceImpl extends ServiceImpl<AfterwardsIncidentAuditDiagnoseMapper, AfterwardsIncidentAuditDiagnose> implements IAfterwardsIncidentAuditDiagnoseService {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.medical.service.impl;
+
+import org.jeecg.modules.medical.entity.MedicalInsRuleProjectDiagnose;
+import org.jeecg.modules.medical.mapper.MedicalInsRuleProjectDiagnoseMapper;
+import org.jeecg.modules.medical.service.IMedicalInsRuleProjectDiagnoseService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: medical_ins_rule_project_diagnose
+ * @Author: jeecg-boot
+ * @Date:   2023-05-21 16:21:29
+ * @Version: V1.0
+ */
+@Service
+public class MedicalInsRuleProjectDiagnoseServiceImpl extends ServiceImpl<MedicalInsRuleProjectDiagnoseMapper, MedicalInsRuleProjectDiagnose> implements IMedicalInsRuleProjectDiagnoseService {
+
+}

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: mid_incident_visit_log
  * @Author: jeecg-boot
- * @Date:   2023-05-12 09:23:36
+ * @Date:   2023-05-21 18:30:54
  * @Version: V1.0
  */
 @Service

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/threadpool/CommonExecutePool.java

@@ -0,0 +1,39 @@
+package org.jeecg.modules.medical.threadpool;
+
+import org.jeecg.modules.medical.CommonThreadPoolConfig;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor;
+
+/**
+ * @author lindong
+ * @version CdrExecutePool v 0.1 2019/4/2 9:39
+ */
+
+@Configuration
+@EnableAsync
+public class CommonExecutePool {
+
+    @Autowired
+    private CommonThreadPoolConfig config;
+
+    @Bean
+    public Executor commonTaskAsyncPool() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(config.getCorePoolSize());
+        executor.setMaxPoolSize(config.getMaxPoolSize());
+        executor.setQueueCapacity(config.getQueueCapacity());
+        executor.setKeepAliveSeconds(config.getKeepAliveSeconds());
+        executor.setThreadNamePrefix("CdrExecutor-");
+        // CALLER_RUNS：不在新线程中执行任务，而是由调用者所在的线程来执行
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        executor.initialize();
+        return executor;
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/vue/AfterwardsIncidentAuditDiagnoseList.vue

@@ -0,0 +1,207 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('afterwards_incident_audit_diagnose')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <afterwards-incident-audit-diagnose-modal ref="modalForm" @ok="modalFormOk"></afterwards-incident-audit-diagnose-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import AfterwardsIncidentAuditDiagnoseModal from './modules/AfterwardsIncidentAuditDiagnoseModal'
+
+  export default {
+    name: 'AfterwardsIncidentAuditDiagnoseList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      AfterwardsIncidentAuditDiagnoseModal
+    },
+    data () {
+      return {
+        description: 'afterwards_incident_audit_diagnose管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'事后监管工单ID',
+            align:"center",
+            dataIndex: 'afterwardsAuditId'
+          },
+          {
+            title:'医院诊断编码',
+            align:"center",
+            dataIndex: 'diagnoseCode'
+          },
+          {
+            title:'医院诊断描述',
+            align:"center",
+            dataIndex: 'diagnoseDesc'
+          },
+          {
+            title:'医保诊断编码',
+            align:"center",
+            dataIndex: 'medDiagnoseCode'
+          },
+          {
+            title:'医保诊断描述',
+            align:"center",
+            dataIndex: 'medDiagnoseDesc'
+          },
+          {
+            title:'住院号/门诊号',
+            align:"center",
+            dataIndex: 'outpatientNumber'
+          },
+          {
+            title:'医嘱号/处方号',
+            align:"center",
+            dataIndex: 'prescriptionNumber'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/medical/afterwardsIncidentAuditDiagnose/list",
+          delete: "/medical/afterwardsIncidentAuditDiagnose/delete",
+          deleteBatch: "/medical/afterwardsIncidentAuditDiagnose/deleteBatch",
+          exportXlsUrl: "/medical/afterwardsIncidentAuditDiagnose/exportXls",
+          importExcelUrl: "medical/afterwardsIncidentAuditDiagnose/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'int',value:'afterwardsAuditId',text:'事后监管工单ID'})
+        fieldList.push({type:'string',value:'diagnoseCode',text:'医院诊断编码'})
+        fieldList.push({type:'string',value:'diagnoseDesc',text:'医院诊断描述'})
+        fieldList.push({type:'string',value:'medDiagnoseCode',text:'医保诊断编码'})
+        fieldList.push({type:'string',value:'medDiagnoseDesc',text:'医保诊断描述'})
+        fieldList.push({type:'string',value:'outpatientNumber',text:'住院号/门诊号'})
+        fieldList.push({type:'string',value:'prescriptionNumber',text:'医嘱号/处方号'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/vue/AfterwardsIncidentAuditDiagnose_menu_insert.sql

@@ -0,0 +1,26 @@
+-- 注意：该页面对应的前台目录为views/medical文件夹下
+-- 如果你想更改到其他目录，请修改sql中component字段对应的值
+
+
+INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
+VALUES ('2023052102353040020', NULL, 'afterwards_incident_audit_diagnose', '/medical/afterwardsIncidentAuditDiagnoseList', 'medical/AfterwardsIncidentAuditDiagnoseList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-05-21 14:35:02', NULL, NULL, 0);
+
+-- 权限控制sql
+-- 新增
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023052102353050021', '2023052102353040020', '添加afterwards_incident_audit_diagnose', NULL, NULL, 0, NULL, NULL, 2, 'medical:afterwards_incident_audit_diagnose:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-21 14:35:02', NULL, NULL, 0, 0, '1', 0);
+-- 编辑
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023052102353050022', '2023052102353040020', '编辑afterwards_incident_audit_diagnose', NULL, NULL, 0, NULL, NULL, 2, 'medical:afterwards_incident_audit_diagnose:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-21 14:35:02', NULL, NULL, 0, 0, '1', 0);
+-- 删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023052102353050023', '2023052102353040020', '删除afterwards_incident_audit_diagnose', NULL, NULL, 0, NULL, NULL, 2, 'medical:afterwards_incident_audit_diagnose:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-21 14:35:02', NULL, NULL, 0, 0, '1', 0);
+-- 批量删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023052102353050024', '2023052102353040020', '批量删除afterwards_incident_audit_diagnose', NULL, NULL, 0, NULL, NULL, 2, 'medical:afterwards_incident_audit_diagnose:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-21 14:35:02', NULL, NULL, 0, 0, '1', 0);
+-- 导出excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023052102353050025', '2023052102353040020', '导出excel_afterwards_incident_audit_diagnose', NULL, NULL, 0, NULL, NULL, 2, 'medical:afterwards_incident_audit_diagnose:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-21 14:35:02', NULL, NULL, 0, 0, '1', 0);
+-- 导入excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023052102353050026', '2023052102353040020', '导入excel_afterwards_incident_audit_diagnose', NULL, NULL, 0, NULL, NULL, 2, 'medical:afterwards_incident_audit_diagnose:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-21 14:35:02', NULL, NULL, 0, 0, '1', 0);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/vue/MedicalInsRuleProjectDiagnoseList.vue

@@ -0,0 +1,183 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('medical_ins_rule_project_diagnose')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <medical-ins-rule-project-diagnose-modal ref="modalForm" @ok="modalFormOk"></medical-ins-rule-project-diagnose-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import MedicalInsRuleProjectDiagnoseModal from './modules/MedicalInsRuleProjectDiagnoseModal'
+
+  export default {
+    name: 'MedicalInsRuleProjectDiagnoseList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      MedicalInsRuleProjectDiagnoseModal
+    },
+    data () {
+      return {
+        description: 'medical_ins_rule_project_diagnose管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'医保规则id',
+            align:"center",
+            dataIndex: 'medicalInsRuleProjectId'
+          },
+          {
+            title:'医保规则项目编码',
+            align:"center",
+            dataIndex: 'medicalInsProjectCode'
+          },
+          {
+            title:'诊断编码',
+            align:"center",
+            dataIndex: 'medicalDiagnoseCode'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/medical/medicalInsRuleProjectDiagnose/list",
+          delete: "/medical/medicalInsRuleProjectDiagnose/delete",
+          deleteBatch: "/medical/medicalInsRuleProjectDiagnose/deleteBatch",
+          exportXlsUrl: "/medical/medicalInsRuleProjectDiagnose/exportXls",
+          importExcelUrl: "medical/medicalInsRuleProjectDiagnose/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'int',value:'medicalInsRuleProjectId',text:'医保规则id'})
+        fieldList.push({type:'string',value:'medicalInsProjectCode',text:'医保规则项目编码'})
+        fieldList.push({type:'string',value:'medicalDiagnoseCode',text:'诊断编码'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/vue/MedicalInsRuleProjectDiagnose_menu_insert.sql

@@ -0,0 +1,26 @@
+-- 注意：该页面对应的前台目录为views/medical文件夹下
+-- 如果你想更改到其他目录，请修改sql中component字段对应的值
+
+
+INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
+VALUES ('2023052104211750290', NULL, 'medical_ins_rule_project_diagnose', '/medical/medicalInsRuleProjectDiagnoseList', 'medical/MedicalInsRuleProjectDiagnoseList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-05-21 16:21:29', NULL, NULL, 0);
+
+-- 权限控制sql
+-- 新增
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023052104211750291', '2023052104211750290', '添加medical_ins_rule_project_diagnose', NULL, NULL, 0, NULL, NULL, 2, 'medical:medical_ins_rule_project_diagnose:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-21 16:21:29', NULL, NULL, 0, 0, '1', 0);
+-- 编辑
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023052104211750292', '2023052104211750290', '编辑medical_ins_rule_project_diagnose', NULL, NULL, 0, NULL, NULL, 2, 'medical:medical_ins_rule_project_diagnose:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-21 16:21:29', NULL, NULL, 0, 0, '1', 0);
+-- 删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023052104211750293', '2023052104211750290', '删除medical_ins_rule_project_diagnose', NULL, NULL, 0, NULL, NULL, 2, 'medical:medical_ins_rule_project_diagnose:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-21 16:21:29', NULL, NULL, 0, 0, '1', 0);
+-- 批量删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023052104211750294', '2023052104211750290', '批量删除medical_ins_rule_project_diagnose', NULL, NULL, 0, NULL, NULL, 2, 'medical:medical_ins_rule_project_diagnose:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-21 16:21:29', NULL, NULL, 0, 0, '1', 0);
+-- 导出excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023052104211750295', '2023052104211750290', '导出excel_medical_ins_rule_project_diagnose', NULL, NULL, 0, NULL, NULL, 2, 'medical:medical_ins_rule_project_diagnose:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-21 16:21:29', NULL, NULL, 0, 0, '1', 0);
+-- 导入excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023052104211750296', '2023052104211750290', '导入excel_medical_ins_rule_project_diagnose', NULL, NULL, 0, NULL, NULL, 2, 'medical:medical_ins_rule_project_diagnose:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-21 16:21:29', NULL, NULL, 0, 0, '1', 0);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/vue/modules/AfterwardsIncidentAuditDiagnoseForm.vue

@@ -0,0 +1,134 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="事后监管工单ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="afterwardsAuditId">
+              <a-input-number v-model="model.afterwardsAuditId" placeholder="请输入事后监管工单ID" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="医院诊断编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="diagnoseCode">
+              <a-input v-model="model.diagnoseCode" placeholder="请输入医院诊断编码"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="医院诊断描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="diagnoseDesc">
+              <a-input v-model="model.diagnoseDesc" placeholder="请输入医院诊断描述"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="医保诊断编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="medDiagnoseCode">
+              <a-input v-model="model.medDiagnoseCode" placeholder="请输入医保诊断编码"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="医保诊断描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="medDiagnoseDesc">
+              <a-input v-model="model.medDiagnoseDesc" placeholder="请输入医保诊断描述"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="住院号/门诊号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="outpatientNumber">
+              <a-input v-model="model.outpatientNumber" placeholder="请输入住院号/门诊号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="医嘱号/处方号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="prescriptionNumber">
+              <a-input v-model="model.prescriptionNumber" placeholder="请输入医嘱号/处方号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'AfterwardsIncidentAuditDiagnoseForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/medical/afterwardsIncidentAuditDiagnose/add",
+          edit: "/medical/afterwardsIncidentAuditDiagnose/edit",
+          queryById: "/medical/afterwardsIncidentAuditDiagnose/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/vue/modules/AfterwardsIncidentAuditDiagnoseModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <afterwards-incident-audit-diagnose-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></afterwards-incident-audit-diagnose-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import AfterwardsIncidentAuditDiagnoseForm from './AfterwardsIncidentAuditDiagnoseForm'
+
+  export default {
+    name: 'AfterwardsIncidentAuditDiagnoseModal',
+    components: {
+      AfterwardsIncidentAuditDiagnoseForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/vue/modules/AfterwardsIncidentAuditDiagnoseModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <afterwards-incident-audit-diagnose-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></afterwards-incident-audit-diagnose-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import AfterwardsIncidentAuditDiagnoseForm from './AfterwardsIncidentAuditDiagnoseForm'
+  export default {
+    name: 'AfterwardsIncidentAuditDiagnoseModal',
+    components: {
+      AfterwardsIncidentAuditDiagnoseForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/vue/modules/MedicalInsRuleProjectDiagnoseModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <medical-ins-rule-project-diagnose-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></medical-ins-rule-project-diagnose-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import MedicalInsRuleProjectDiagnoseForm from './MedicalInsRuleProjectDiagnoseForm'
+
+  export default {
+    name: 'MedicalInsRuleProjectDiagnoseModal',
+    components: {
+      MedicalInsRuleProjectDiagnoseForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/vue/modules/MedicalInsRuleProjectDiagnoseModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <medical-ins-rule-project-diagnose-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></medical-ins-rule-project-diagnose-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import MedicalInsRuleProjectDiagnoseForm from './MedicalInsRuleProjectDiagnoseForm'
+  export default {
+    name: 'MedicalInsRuleProjectDiagnoseModal',
+    components: {
+      MedicalInsRuleProjectDiagnoseForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

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

@@ -46,6 +46,9 @@ public class SysUser implements Serializable {
     @Excel(name = "登录账号", width = 15)
     private String username;
 
+    @Excel(name = "医生编码")
+    private String doctorId;
+
     /**
      * 真实姓名
      */

jeecg-module-system/jeecg-system-start/src/main/resources/application.yml

@@ -2,4 +2,23 @@ spring:
   application:
     name: jeecg-system
   profiles:
-    active: dev
+    active: dev
+
+
+cdr:
+
+  threadpool: #线程池配置
+
+    corePoolSize: 6
+
+    maxPoolSize: 100
+
+    keepAliveSeconds: 60
+
+    queueCapacity: 500
+
+  record:
+
+    batchSize: 10000 #记录批次，达到这个数量就进行数据发送，不用等到全部解析
+
+    bigFileSize: 10000 #单位是M