表结构更新

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/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,7 +33,7 @@ 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*/
@@ -56,6 +56,10 @@ public class AfterwardsAudit 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 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*/
@@ -71,7 +71,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

@@ -67,7 +67,7 @@ public class Audit 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/AuditDetail.java

@@ -67,7 +67,7 @@ public class AuditDetail 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/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

@@ -71,7 +71,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/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/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,33 @@ 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.setMedicalInsRuleInfoId(medicalInsRuleInfo.getId());
+        midIncidentAudit.setMedicalInsRuleInfoCode(medicalInsRuleInfo.getRuleCode());
+        midIncidentAudit.setMedicalInsRuleInfoName(medicalInsRuleInfo.getRuleName());
+        midIncidentAudit.setViolationLevel(medicalInsRuleInfo.getViolationLevel());
+        midIncidentAudit.setTreatmentType(medicalInsRuleInfo.getTreatmentType());
+        midIncidentAudit.setNoticeType("事中预警");
+        midIncidentAuditService.save(midIncidentAudit);
+    }
+
 
     /**
      * 逻辑表达式
@@ -155,6 +190,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,43 @@ 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(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.setMedicalInsRuleInfoId(medicalInsRuleInfo.getId());
+        midIncidentAudit.setMedicalInsRuleInfoCode(medicalInsRuleInfo.getRuleCode());
+        midIncidentAudit.setMedicalInsRuleInfoName(medicalInsRuleInfo.getRuleName());
+        midIncidentAudit.setViolationLevel(medicalInsRuleInfo.getViolationLevel());
+        midIncidentAudit.setTreatmentType(medicalInsRuleInfo.getTreatmentType());
+        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/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专用配置