Merge remote-tracking branch 'origin/master'

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

@@ -43,4 +43,6 @@ public class Constant {
     public static final String AND = "&&";
 
     public static final String OR = "||";
+
+    public static final Integer WARING_EVENT_ATTR_ID = -1;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/MidIncidentAuditDiagnoseController.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.MidIncidentAuditDiagnose;
+import org.jeecg.modules.medical.service.IMidIncidentAuditDiagnoseService;
+
+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: mid_incident_audit_diagnose
+ * @Author: jeecg-boot
+ * @Date:   2023-05-10 09:43:26
+ * @Version: V1.0
+ */
+@Api(tags="mid_incident_audit_diagnose")
+@RestController
+@RequestMapping("/medical/midIncidentAuditDiagnose")
+@Slf4j
+public class MidIncidentAuditDiagnoseController extends JeecgController<MidIncidentAuditDiagnose, IMidIncidentAuditDiagnoseService> {
+	@Autowired
+	private IMidIncidentAuditDiagnoseService midIncidentAuditDiagnoseService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param midIncidentAuditDiagnose
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "mid_incident_audit_diagnose-分页列表查询")
+	@ApiOperation(value="mid_incident_audit_diagnose-分页列表查询", notes="mid_incident_audit_diagnose-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<MidIncidentAuditDiagnose>> queryPageList(MidIncidentAuditDiagnose midIncidentAuditDiagnose,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<MidIncidentAuditDiagnose> queryWrapper = QueryGenerator.initQueryWrapper(midIncidentAuditDiagnose, req.getParameterMap());
+		Page<MidIncidentAuditDiagnose> page = new Page<MidIncidentAuditDiagnose>(pageNo, pageSize);
+		IPage<MidIncidentAuditDiagnose> pageList = midIncidentAuditDiagnoseService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param midIncidentAuditDiagnose
+	 * @return
+	 */
+	@AutoLog(value = "mid_incident_audit_diagnose-添加")
+	@ApiOperation(value="mid_incident_audit_diagnose-添加", notes="mid_incident_audit_diagnose-添加")
+	@RequiresPermissions("medical:mid_incident_audit_diagnose:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody MidIncidentAuditDiagnose midIncidentAuditDiagnose) {
+		midIncidentAuditDiagnoseService.save(midIncidentAuditDiagnose);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param midIncidentAuditDiagnose
+	 * @return
+	 */
+	@AutoLog(value = "mid_incident_audit_diagnose-编辑")
+	@ApiOperation(value="mid_incident_audit_diagnose-编辑", notes="mid_incident_audit_diagnose-编辑")
+	@RequiresPermissions("medical:mid_incident_audit_diagnose:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody MidIncidentAuditDiagnose midIncidentAuditDiagnose) {
+		midIncidentAuditDiagnoseService.updateById(midIncidentAuditDiagnose);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "mid_incident_audit_diagnose-通过id删除")
+	@ApiOperation(value="mid_incident_audit_diagnose-通过id删除", notes="mid_incident_audit_diagnose-通过id删除")
+	@RequiresPermissions("medical:mid_incident_audit_diagnose:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		midIncidentAuditDiagnoseService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "mid_incident_audit_diagnose-批量删除")
+	@ApiOperation(value="mid_incident_audit_diagnose-批量删除", notes="mid_incident_audit_diagnose-批量删除")
+	@RequiresPermissions("medical:mid_incident_audit_diagnose:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.midIncidentAuditDiagnoseService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "mid_incident_audit_diagnose-通过id查询")
+	@ApiOperation(value="mid_incident_audit_diagnose-通过id查询", notes="mid_incident_audit_diagnose-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<MidIncidentAuditDiagnose> queryById(@RequestParam(name="id",required=true) String id) {
+		MidIncidentAuditDiagnose midIncidentAuditDiagnose = midIncidentAuditDiagnoseService.getById(id);
+		if(midIncidentAuditDiagnose==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(midIncidentAuditDiagnose);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param midIncidentAuditDiagnose
+    */
+    @RequiresPermissions("medical:mid_incident_audit_diagnose:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, MidIncidentAuditDiagnose midIncidentAuditDiagnose) {
+        return super.exportXls(request, midIncidentAuditDiagnose, MidIncidentAuditDiagnose.class, "mid_incident_audit_diagnose");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("medical:mid_incident_audit_diagnose:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, MidIncidentAuditDiagnose.class);
+    }
+
+}

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

@@ -33,7 +33,7 @@ public class AdvanceWarningAudit implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键ID*/
-	@TableId(type = IdType.ASSIGN_ID)
+	@TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键ID")
     private java.lang.Integer id;
 	/**医保规则ID*/
@@ -53,8 +53,8 @@ public class AdvanceWarningAudit implements Serializable {
     @ApiModelProperty(value = "就诊类别;住院/门诊")
     private java.lang.String treatmentType;
 	/**警示级别*/
-	@Excel(name = "警示级别", width = 15)
-    @ApiModelProperty(value = "警示级别")
+	@Excel(name = "违规等级", width = 15)
+    @ApiModelProperty(value = "违规等级")
     private java.lang.String reminderLevel;
 	/**提醒类别;事前提醒，事中预警，事后监管*/
 	@Excel(name = "提醒类别;事前提醒，事中预警，事后监管", width = 15)
@@ -71,7 +71,7 @@ public class AdvanceWarningAudit implements Serializable {
 	/**医生姓名*/
 	@Excel(name = "医生姓名", width = 15)
     @ApiModelProperty(value = "医生姓名")
-    private java.lang.String dockerName;
+    private java.lang.String doctorName;
 	/**主诊医师编码*/
 	@Excel(name = "主诊医师编码", width = 15)
     @ApiModelProperty(value = "主诊医师编码")

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

@@ -33,7 +33,7 @@ public class AdvanceWarningAuditDetail implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键ID*/
-	@TableId(type = IdType.ASSIGN_ID)
+	@TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键ID")
     private java.lang.Integer id;
 	/**医保规则ID*/
@@ -71,7 +71,7 @@ public class AdvanceWarningAuditDetail implements Serializable {
 	/**医生姓名*/
 	@Excel(name = "医生姓名", width = 15)
     @ApiModelProperty(value = "医生姓名")
-    private java.lang.String dockerName;
+    private java.lang.String doctorName;
 	/**主诊医师编码*/
 	@Excel(name = "主诊医师编码", width = 15)
     @ApiModelProperty(value = "主诊医师编码")

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

@@ -33,29 +33,13 @@ public class AfterwardsAudit implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键ID*/
-	@TableId(type = IdType.ASSIGN_ID)
+	@TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键ID")
     private java.lang.Integer id;
-	/**医保规则ID*/
-	@Excel(name = "医保规则ID", width = 15)
-    @ApiModelProperty(value = "医保规则ID")
-    private java.lang.Integer medicalInsRuleInfoId;
-	/**医保规则编码*/
-	@Excel(name = "医保规则编码", width = 15)
-    @ApiModelProperty(value = "医保规则编码")
-    private java.lang.String medicalInsRuleInfoCode;
-	/**医保规则名称*/
-	@Excel(name = "医保规则名称", width = 15)
-    @ApiModelProperty(value = "医保规则名称")
-    private java.lang.String medicalInsRuleInfoName;
 	/**就诊类别;住院/门诊*/
 	@Excel(name = "就诊类别;住院/门诊", width = 15)
     @ApiModelProperty(value = "就诊类别;住院/门诊")
     private java.lang.String treatmentType;
-	/**警示级别*/
-	@Excel(name = "警示级别", width = 15)
-    @ApiModelProperty(value = "警示级别")
-    private java.lang.String reminderLevel;
 	/**提醒类别;事前提醒，事中预警，事后监管*/
 	@Excel(name = "提醒类别;事前提醒，事中预警，事后监管", width = 15)
     @ApiModelProperty(value = "提醒类别;事前提醒，事中预警，事后监管")
@@ -71,7 +55,7 @@ public class AfterwardsAudit implements Serializable {
 	/**医生姓名*/
 	@Excel(name = "医生姓名", width = 15)
     @ApiModelProperty(value = "医生姓名")
-    private java.lang.String dockerName;
+    private java.lang.String doctorName;
 	/**主诊医师编码*/
 	@Excel(name = "主诊医师编码", width = 15)
     @ApiModelProperty(value = "主诊医师编码")

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

@@ -33,7 +33,7 @@ public class AfterwardsAuditDetail implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键ID*/
-	@TableId(type = IdType.ASSIGN_ID)
+	@TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键ID")
     private java.lang.Integer id;
 	/**医保规则ID*/
@@ -56,6 +56,10 @@ public class AfterwardsAuditDetail implements Serializable {
 	@Excel(name = "警示级别", width = 15)
     @ApiModelProperty(value = "警示级别")
     private java.lang.String reminderLevel;
+    /**违规等级;0:直接违规  1:重度可疑  2:轻度可疑  3：仅提醒展示*/
+    @Excel(name = "违规等级", width = 15)
+    @ApiModelProperty(value = "违规等级")
+    private java.lang.Integer violationLevel;
 	/**提醒类别;事前提醒，事中预警，事后监管*/
 	@Excel(name = "提醒类别;事前提醒，事中预警，事后监管", width = 15)
     @ApiModelProperty(value = "提醒类别;事前提醒，事中预警，事后监管")
@@ -71,7 +75,7 @@ public class AfterwardsAuditDetail implements Serializable {
 	/**医生姓名*/
 	@Excel(name = "医生姓名", width = 15)
     @ApiModelProperty(value = "医生姓名")
-    private java.lang.String dockerName;
+    private java.lang.String doctorName;
 	/**主诊医师编码*/
 	@Excel(name = "主诊医师编码", width = 15)
     @ApiModelProperty(value = "主诊医师编码")

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

@@ -64,10 +64,6 @@ public class Audit implements Serializable {
 	@Excel(name = "医生姓名;", width = 15)
     @ApiModelProperty(value = "医生姓名;")
     private java.lang.String doctorName;
-	/**医生姓名*/
-	@Excel(name = "医生姓名", width = 15)
-    @ApiModelProperty(value = "医生姓名")
-    private java.lang.String dockerName;
 	/**主诊医师编码*/
 	@Excel(name = "主诊医师编码", width = 15)
     @ApiModelProperty(value = "主诊医师编码")

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

@@ -64,10 +64,6 @@ public class AuditDetail implements Serializable {
 	@Excel(name = "医生姓名;", width = 15)
     @ApiModelProperty(value = "医生姓名;")
     private java.lang.String doctorName;
-	/**医生姓名*/
-	@Excel(name = "医生姓名", width = 15)
-    @ApiModelProperty(value = "医生姓名")
-    private java.lang.String dockerName;
 	/**主诊医师编码*/
 	@Excel(name = "主诊医师编码", width = 15)
     @ApiModelProperty(value = "主诊医师编码")

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

@@ -40,6 +40,11 @@ public class MedicalInsRuleInfo implements Serializable {
 	@Excel(name = "规则名称", width = 15)
     @ApiModelProperty(value = "规则名称")
     private java.lang.String ruleName;
+
+    /**规则名称*/
+    @Excel(name = "规则编码", width = 15)
+    @ApiModelProperty(value = "规则编码")
+    private java.lang.String ruleCode;
 	/**功能*/
 	@Excel(name = "功能", width = 15)
     @ApiModelProperty(value = "功能")

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

@@ -33,7 +33,7 @@ public class MedicalInsRuleProject implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键ID*/
-	@TableId(type = IdType.ASSIGN_ID)
+	@TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键ID")
     private java.lang.Integer id;
 	/**医保规则ID*/

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

@@ -33,29 +33,33 @@ public class MidIncidentAudit implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键ID*/
-	@TableId(type = IdType.ASSIGN_ID)
+	@TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键ID")
     private java.lang.Integer id;
-	/**医保规则ID*/
-	@Excel(name = "医保规则ID", width = 15)
-    @ApiModelProperty(value = "医保规则ID")
-    private java.lang.Integer medicalInsRuleInfoId;
-	/**医保规则编码*/
-	@Excel(name = "医保规则编码", width = 15)
-    @ApiModelProperty(value = "医保规则编码")
-    private java.lang.String medicalInsRuleInfoCode;
-	/**医保规则名称*/
-	@Excel(name = "医保规则名称", width = 15)
-    @ApiModelProperty(value = "医保规则名称")
-    private java.lang.String medicalInsRuleInfoName;
+//	/**医保规则ID*/
+//	@Excel(name = "医保规则ID", width = 15)
+//    @ApiModelProperty(value = "医保规则ID")
+//    private java.lang.Integer medicalInsRuleInfoId;
+//	/**医保规则编码*/
+//	@Excel(name = "医保规则编码", width = 15)
+//    @ApiModelProperty(value = "医保规则编码")
+//    private java.lang.String medicalInsRuleInfoCode;
+//	/**医保规则名称*/
+//	@Excel(name = "医保规则名称", width = 15)
+//    @ApiModelProperty(value = "医保规则名称")
+//    private java.lang.String medicalInsRuleInfoName;
 	/**就诊类别;住院/门诊*/
 	@Excel(name = "就诊类别;住院/门诊", width = 15)
     @ApiModelProperty(value = "就诊类别;住院/门诊")
     private java.lang.String treatmentType;
-	/**警示级别*/
-	@Excel(name = "警示级别", width = 15)
-    @ApiModelProperty(value = "警示级别")
-    private java.lang.String reminderLevel;
+//	/**警示级别*/
+//	@Excel(name = "警示级别", width = 15)
+//    @ApiModelProperty(value = "警示级别")
+//    private java.lang.String reminderLevel;
+//    /**违规等级;0:直接违规  1:重度可疑  2:轻度可疑  3：仅提醒展示*/
+//    @Excel(name = "违规等级", width = 15)
+//    @ApiModelProperty(value = "违规等级")
+//    private java.lang.Integer violationLevel;
 	/**提醒类别;事前提醒，事中预警，事后监管*/
 	@Excel(name = "提醒类别;事前提醒，事中预警，事后监管", width = 15)
     @ApiModelProperty(value = "提醒类别;事前提醒，事中预警，事后监管")
@@ -71,7 +75,7 @@ public class MidIncidentAudit implements Serializable {
 	/**医生姓名*/
 	@Excel(name = "医生姓名", width = 15)
     @ApiModelProperty(value = "医生姓名")
-    private java.lang.String dockerName;
+    private java.lang.String doctorName;
 	/**主诊医师编码*/
 	@Excel(name = "主诊医师编码", width = 15)
     @ApiModelProperty(value = "主诊医师编码")

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

@@ -56,6 +56,10 @@ public class MidIncidentAuditDetail implements Serializable {
 	@Excel(name = "警示级别", width = 15)
     @ApiModelProperty(value = "警示级别")
     private java.lang.String reminderLevel;
+    /**违规等级;0:直接违规  1:重度可疑  2:轻度可疑  3：仅提醒展示*/
+    @Excel(name = "违规等级", width = 15)
+    @ApiModelProperty(value = "违规等级")
+    private java.lang.Integer violationLevel;
 	/**提醒类别;事前提醒，事中预警，事后监管*/
 	@Excel(name = "提醒类别;事前提醒，事中预警，事后监管", width = 15)
     @ApiModelProperty(value = "提醒类别;事前提醒，事中预警，事后监管")
@@ -71,7 +75,7 @@ public class MidIncidentAuditDetail implements Serializable {
 	/**医生姓名*/
 	@Excel(name = "医生姓名", width = 15)
     @ApiModelProperty(value = "医生姓名")
-    private java.lang.String dockerName;
+    private java.lang.String doctorName;
 	/**主诊医师编码*/
 	@Excel(name = "主诊医师编码", width = 15)
     @ApiModelProperty(value = "主诊医师编码")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/MidIncidentAuditDiagnose.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: mid_incident_audit_diagnose
+ * @Author: jeecg-boot
+ * @Date:   2023-05-10 09:43:26
+ * @Version: V1.0
+ */
+@Data
+@TableName("mid_incident_audit_diagnose")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="mid_incident_audit_diagnose对象", description="mid_incident_audit_diagnose")
+public class MidIncidentAuditDiagnose 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 midIncidentAuditId;
+	/**医院诊断编码*/
+	@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/MidIncidentWarningVO.java

@@ -18,6 +18,7 @@ public class MidIncidentWarningVO {
     private String visit_type;//就诊类型（1住院、2门诊）
     private String in_hosp_date;//入院日期（就诊类型是住院的非空,格式：YYYYMMDD）
     private String patient_id;//病人ID
+    private String patient_name;//病人姓名
     private List<DiagnosesVO> diagnoses;	//true	Array	诊断信息（多项）（内容说明参见Diagnoses（诊断信息说明）
     private String doctor_advice_no;//true	char	处方流水号（医院内部唯一号）
     private String doctor_code;//	true	char	医师编号

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/MidIncidentAuditDiagnoseMapper.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.MidIncidentAuditDiagnose;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: mid_incident_audit_diagnose
+ * @Author: jeecg-boot
+ * @Date:   2023-05-10 09:43:26
+ * @Version: V1.0
+ */
+public interface MidIncidentAuditDiagnoseMapper extends BaseMapper<MidIncidentAuditDiagnose> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/MidIncidentAuditDiagnoseMapper.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.MidIncidentAuditDiagnoseMapper">
+
+</mapper>

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

@@ -16,10 +16,14 @@ import org.jeecg.modules.medical.entity.FactorAttrRela;
 import org.jeecg.modules.medical.entity.FactorCondRela;
 import org.jeecg.modules.medical.entity.FactorEnchance;
 import org.jeecg.modules.medical.entity.MedicalInsRuleInfo;
+import org.jeecg.modules.medical.entity.MidIncidentAudit;
+import org.jeecg.modules.medical.entity.MidIncidentWarningVO;
 import org.jeecg.modules.medical.ruleengine.dict.DictUtil;
 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.IMidIncidentAuditDetailService;
+import org.jeecg.modules.medical.service.IMidIncidentAuditService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.support.rowset.SqlRowSet;
@@ -52,6 +56,10 @@ public class FactorEnchangeFactory {
     IFactorCondRelaService factorCondRelaService;
     @Autowired
     DictUtil dictUtil;
+    @Autowired
+    IMidIncidentAuditService midIncidentAuditService;
+    @Autowired
+    IMidIncidentAuditDetailService midIncidentAuditDetailService;
 
     private Map<Integer, EventAttr> enchanceAttrMap = new HashMap<>();
 
@@ -103,6 +111,13 @@ public class FactorEnchangeFactory {
                     break;
                 case LOGICAL_EXPRESSION:
                     result = setLogicalExpressionResultByFactorEnchance(localMap, ioTypeMap, factorEnchance, medicalInsRuleInfo);
+                    if(Constant.WARING_EVENT_ATTR_ID == factorEnchance.getEventAttrId()){
+                        if(result){
+
+                        }
+                    }else {
+                        localMap.put(factorEnchance.getEventAttrId().toString(), result);
+                    }
                     break;
                 case PROPERTIES:
                     Object valueTemp = localMap.get(factorEnchance.getExtAttr1());
@@ -113,13 +128,29 @@ public class FactorEnchangeFactory {
                     }
                     break;
                 default:
-
+                    log.error("有配置的未处理类型");
                     break;
             }
         }
         return result;
     }
 
+    public void insertMidWarning(MedicalInsRuleInfo medicalInsRuleInfo){
+        MidIncidentWarningVO midIncidentWarningVO = RuleEngine.midIncidentWarningVOThreadLocal.get();
+        MidIncidentAudit midIncidentAudit = new MidIncidentAudit();
+        midIncidentAudit.setMedicalDeptCode(midIncidentWarningVO.getMedical_dept_code());
+        midIncidentAudit.setMedicalDeptName(midIncidentWarningVO.getMedical_dept_name());
+        Date date = new Date(System.currentTimeMillis());
+        midIncidentAudit.setCreateTime(date);
+        midIncidentAudit.setDoctorName(midIncidentWarningVO.getDoctor_name());
+        midIncidentAudit.setDoctorId(midIncidentWarningVO.getDoctor_code());
+        midIncidentAudit.setPatientId(midIncidentWarningVO.getPatient_id());
+        midIncidentAudit.setPatientName(midIncidentWarningVO.getPatient_name());
+        midIncidentAudit.setTreatmentType(medicalInsRuleInfo.getTreatmentType());
+        midIncidentAudit.setNoticeType("事中预警");
+        midIncidentAuditService.save(midIncidentAudit);
+    }
+
 
     /**
      * 逻辑表达式
@@ -155,6 +186,7 @@ public class FactorEnchangeFactory {
             }
             return result;
         }
+
         return false;
     }
 

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

@@ -10,6 +10,8 @@ import org.jeecg.modules.medical.Constant;
 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.MidIncidentAudit;
+import org.jeecg.modules.medical.entity.MidIncidentWarningVO;
 import org.jeecg.modules.medical.entity.RuleAttr;
 import org.jeecg.modules.medical.entity.RuleFactorRela;
 import org.jeecg.modules.medical.ruleengine.plugin.InterfItemListPlugin;
@@ -19,6 +21,7 @@ import org.jeecg.modules.medical.service.IFactorCondRelaService;
 import org.jeecg.modules.medical.service.IFactorEnchanceService;
 import org.jeecg.modules.medical.service.IMedicalInsRuleInfoService;
 import org.jeecg.modules.medical.service.IMedicalInsRuleProjectService;
+import org.jeecg.modules.medical.service.IMidIncidentAuditService;
 import org.jeecg.modules.medical.service.IRuleAttrService;
 import org.jeecg.modules.medical.service.IRuleFactorRelaService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +31,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -61,6 +65,10 @@ public class RuleEngine {
     private RedisTemplate redisTemplate;
     @Autowired
     InterfItemListPlugin interfItemListPlugin;
+    @Autowired
+    IMidIncidentAuditService midIncidentAuditService;
+
+    public static ThreadLocal<MidIncidentWarningVO> midIncidentWarningVOThreadLocal = new ThreadLocal<>();
 
     @PostConstruct
     public void initMedicalInsRule() {
@@ -124,17 +132,40 @@ public class RuleEngine {
         return null;
     }
 
-    public Result dealInterfaceEngin(String intefName, Map<String, Object> paramMap) {
-        List<RuleAttr> ruleAttrList = ruleAttrService.lambdaQuery().eq(RuleAttr::getInterfName, intefName).list();
-        List<Integer> medicalInsRuleInfoIdList = getMedicalInsRuleInfoIdByIntef(intefName, paramMap, ruleAttrList);
-        List<Map<String, Object>> itemList = interfItemListPlugin.findProIntersection(paramMap, ruleAttrList);
-        for(Map<String, Object> itemMap : itemList){
-            runEngine(itemMap, medicalInsRuleInfoIdList);
+    public Result dealMidInterfaceEngin(String intefName, Map<String, Object> paramMap, MidIncidentWarningVO midIncidentWarningVO) {
+        midIncidentWarningVOThreadLocal.set(midIncidentWarningVO);
+        try {
+            List<RuleAttr> ruleAttrList = ruleAttrService.lambdaQuery().eq(RuleAttr::getInterfName, intefName).list();
+            List<Integer> medicalInsRuleInfoIdList = getMedicalInsRuleInfoIdByIntef(intefName, paramMap, ruleAttrList);
+            List<Map<String, Object>> itemList = interfItemListPlugin.findProIntersection(paramMap, ruleAttrList);
+
+            for (Map<String, Object> itemMap : itemList) {
+                runEngine(itemMap, medicalInsRuleInfoIdList);
+            }
+        }finally {
+            midIncidentWarningVOThreadLocal.remove();
         }
 
         return Result.ok();
     }
 
+    public void insertMidWarning(){
+        MidIncidentWarningVO midIncidentWarningVO = RuleEngine.midIncidentWarningVOThreadLocal.get();
+        MidIncidentAudit midIncidentAudit = new MidIncidentAudit();
+        midIncidentAudit.setMedicalDeptCode(midIncidentWarningVO.getMedical_dept_code());
+        midIncidentAudit.setMedicalDeptName(midIncidentWarningVO.getMedical_dept_name());
+        Date date = new Date(System.currentTimeMillis());
+        midIncidentAudit.setCreateTime(date);
+        midIncidentAudit.setDoctorName(midIncidentWarningVO.getDoctor_name());
+        midIncidentAudit.setDoctorId(midIncidentWarningVO.getDoctor_code());
+        midIncidentAudit.setPatientId(midIncidentWarningVO.getPatient_id());
+        midIncidentAudit.setPatientName(midIncidentWarningVO.getPatient_name());
+        midIncidentAudit.setTreatmentType(midIncidentWarningVO.getVisit_type());
+        midIncidentAudit.setPrescriptionNumber(midIncidentWarningVO.getDoctor_advice_no());
+        midIncidentAudit.setNoticeType("事中预警");
+        midIncidentAuditService.save(midIncidentAudit);
+    }
+
     public List<Integer> getMedicalInsRuleInfoIdByIntef(String intefName, Map<String, Object> paramMap, List<RuleAttr> ruleAttrList) {
 
         List<Integer> medicalIdList = new ArrayList<>();

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.medical.service;
+
+import org.jeecg.modules.medical.entity.MidIncidentAuditDiagnose;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: mid_incident_audit_diagnose
+ * @Author: jeecg-boot
+ * @Date:   2023-05-10 09:43:26
+ * @Version: V1.0
+ */
+public interface IMidIncidentAuditDiagnoseService extends IService<MidIncidentAuditDiagnose> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.medical.service.impl;
+
+import org.jeecg.modules.medical.entity.MidIncidentAuditDiagnose;
+import org.jeecg.modules.medical.mapper.MidIncidentAuditDiagnoseMapper;
+import org.jeecg.modules.medical.service.IMidIncidentAuditDiagnoseService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: mid_incident_audit_diagnose
+ * @Author: jeecg-boot
+ * @Date:   2023-05-10 09:43:26
+ * @Version: V1.0
+ */
+@Service
+public class MidIncidentAuditDiagnoseServiceImpl extends ServiceImpl<MidIncidentAuditDiagnoseMapper, MidIncidentAuditDiagnose> implements IMidIncidentAuditDiagnoseService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/vue/MidIncidentAuditDiagnoseList.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('mid_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>
+
+    <mid-incident-audit-diagnose-modal ref="modalForm" @ok="modalFormOk"></mid-incident-audit-diagnose-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import MidIncidentAuditDiagnoseModal from './modules/MidIncidentAuditDiagnoseModal'
+
+  export default {
+    name: 'MidIncidentAuditDiagnoseList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      MidIncidentAuditDiagnoseModal
+    },
+    data () {
+      return {
+        description: 'mid_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: 'midIncidentAuditId'
+          },
+          {
+            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/midIncidentAuditDiagnose/list",
+          delete: "/medical/midIncidentAuditDiagnose/delete",
+          deleteBatch: "/medical/midIncidentAuditDiagnose/deleteBatch",
+          exportXlsUrl: "/medical/midIncidentAuditDiagnose/exportXls",
+          importExcelUrl: "medical/midIncidentAuditDiagnose/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:'midIncidentAuditId',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/MidIncidentAuditDiagnose_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 ('2023051009435550260', NULL, 'mid_incident_audit_diagnose', '/medical/midIncidentAuditDiagnoseList', 'medical/MidIncidentAuditDiagnoseList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-05-10 09:43:26', 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 ('2023051009435560261', '2023051009435550260', '添加mid_incident_audit_diagnose', NULL, NULL, 0, NULL, NULL, 2, 'medical:mid_incident_audit_diagnose:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-10 09:43:26', 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 ('2023051009435560262', '2023051009435550260', '编辑mid_incident_audit_diagnose', NULL, NULL, 0, NULL, NULL, 2, 'medical:mid_incident_audit_diagnose:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-10 09:43:26', 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 ('2023051009435560263', '2023051009435550260', '删除mid_incident_audit_diagnose', NULL, NULL, 0, NULL, NULL, 2, 'medical:mid_incident_audit_diagnose:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-10 09:43:26', 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 ('2023051009435560264', '2023051009435550260', '批量删除mid_incident_audit_diagnose', NULL, NULL, 0, NULL, NULL, 2, 'medical:mid_incident_audit_diagnose:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-10 09:43:26', 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 ('2023051009435560265', '2023051009435550260', '导出excel_mid_incident_audit_diagnose', NULL, NULL, 0, NULL, NULL, 2, 'medical:mid_incident_audit_diagnose:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-10 09:43:26', 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 ('2023051009435560266', '2023051009435550260', '导入excel_mid_incident_audit_diagnose', NULL, NULL, 0, NULL, NULL, 2, 'medical:mid_incident_audit_diagnose:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-10 09:43:26', NULL, NULL, 0, 0, '1', 0);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/vue/modules/MidIncidentAuditDiagnoseForm.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="midIncidentAuditId">
+              <a-input-number v-model="model.midIncidentAuditId" 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: 'MidIncidentAuditDiagnoseForm',
+    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/midIncidentAuditDiagnose/add",
+          edit: "/medical/midIncidentAuditDiagnose/edit",
+          queryById: "/medical/midIncidentAuditDiagnose/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/MidIncidentAuditDiagnoseModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <mid-incident-audit-diagnose-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></mid-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 MidIncidentAuditDiagnoseForm from './MidIncidentAuditDiagnoseForm'
+
+  export default {
+    name: 'MidIncidentAuditDiagnoseModal',
+    components: {
+      MidIncidentAuditDiagnoseForm
+    },
+    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/MidIncidentAuditDiagnoseModal.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="关闭">
+    <mid-incident-audit-diagnose-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></mid-incident-audit-diagnose-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import MidIncidentAuditDiagnoseForm from './MidIncidentAuditDiagnoseForm'
+  export default {
+    name: 'MidIncidentAuditDiagnoseModal',
+    components: {
+      MidIncidentAuditDiagnoseForm
+    },
+    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/vue3/AdvanceWarningAudit.data.ts

@@ -47,7 +47,7 @@ export const columns: BasicColumn[] = [
    {
     title: '医生姓名',
     align:"center",
-    dataIndex: 'dockerName'
+    dataIndex: 'doctorName'
    },
    {
     title: '主诊医师编码',
@@ -147,7 +147,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     label: '医生姓名',
-    field: 'dockerName',
+    field: 'doctorName',
     component: 'Input',
   },
   {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/vue3/AdvanceWarningAuditDetail.data.ts

@@ -47,7 +47,7 @@ export const columns: BasicColumn[] = [
    {
     title: '医生姓名',
     align:"center",
-    dataIndex: 'dockerName'
+    dataIndex: 'doctorName'
    },
    {
     title: '主诊医师编码',
@@ -142,7 +142,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     label: '医生姓名',
-    field: 'dockerName',
+    field: 'doctorName',
     component: 'Input',
   },
   {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/vue3/AfterwardsAudit.data.ts

@@ -47,7 +47,7 @@ export const columns: BasicColumn[] = [
    {
     title: '医生姓名',
     align:"center",
-    dataIndex: 'dockerName'
+    dataIndex: 'doctorName'
    },
    {
     title: '主诊医师编码',
@@ -147,7 +147,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     label: '医生姓名',
-    field: 'dockerName',
+    field: 'doctorName',
     component: 'Input',
   },
   {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/vue3/AfterwardsAuditDetail.data.ts

@@ -47,7 +47,7 @@ export const columns: BasicColumn[] = [
    {
     title: '医生姓名',
     align:"center",
-    dataIndex: 'dockerName'
+    dataIndex: 'doctorName'
    },
    {
     title: '主诊医师编码',
@@ -142,7 +142,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     label: '医生姓名',
-    field: 'dockerName',
+    field: 'doctorName',
     component: 'Input',
   },
   {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/vue3/Audit.data.ts

@@ -42,7 +42,7 @@ export const columns: BasicColumn[] = [
    {
     title: '医生姓名',
     align:"center",
-    dataIndex: 'dockerName'
+    dataIndex: 'doctorName'
    },
    {
     title: '主诊医师编码',
@@ -147,7 +147,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     label: '医生姓名',
-    field: 'dockerName',
+    field: 'doctorName',
     component: 'Input',
   },
   {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/vue3/AuditDetail.data.ts

@@ -42,7 +42,7 @@ export const columns: BasicColumn[] = [
    {
     title: '医生姓名',
     align:"center",
-    dataIndex: 'dockerName'
+    dataIndex: 'doctorName'
    },
    {
     title: '主诊医师编码',
@@ -132,7 +132,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     label: '医生姓名',
-    field: 'dockerName',
+    field: 'doctorName',
     component: 'Input',
   },
   {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/vue3/MidIncidentAudit.data.ts

@@ -47,7 +47,7 @@ export const columns: BasicColumn[] = [
    {
     title: '医生姓名',
     align:"center",
-    dataIndex: 'dockerName'
+    dataIndex: 'doctorName'
    },
    {
     title: '主诊医师编码',
@@ -147,7 +147,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     label: '医生姓名',
-    field: 'dockerName',
+    field: 'doctorName',
     component: 'Input',
   },
   {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/vue3/MidIncidentAuditDetail.data.ts

@@ -47,7 +47,7 @@ export const columns: BasicColumn[] = [
    {
     title: '医生姓名',
     align:"center",
-    dataIndex: 'dockerName'
+    dataIndex: 'doctorName'
    },
    {
     title: '主诊医师编码',
@@ -142,7 +142,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     label: '医生姓名',
-    field: 'dockerName',
+    field: 'doctorName',
     component: 'Input',
   },
   {

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

@@ -155,12 +155,12 @@ mybatis-plus:
     banner: false
     db-config:
       #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
-      id-type: ASSIGN_ID
+      id-type: AUTO
       # 默认数据库表下划线命名
       table-underline: true
   configuration:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
 #jeecg专用配置