事后监管

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

@@ -13,11 +13,11 @@ public class Constant {
      * 规则缓存前缀key
      */
     public static final String MEDICAL_RULE_CACHE_KEY = "MEDICAL_RULE";
-    //事前提醒1=事前  2=事后  3=事前/事后 4=事中 5=事后/事中
+    //事前提醒1=事前
     public static final String TREATMEN_TYPE_ADVANCE_WARNING = "1";
-    //事中预警1=事前  2=事后  3=事前/事后 4=事中 5=事后/事中
+    //4=事中
     public static final String TREATMEN_TYPE_MID_INCIDENT_WARNING = "4";
-    //事后监管1=事前  2=事后  3=事前/事后 4=事中 5=事后/事中
+    //2=事后
     public static final String TREATMEN_TYPE_EX_POST_SUPERVISION = "2";
     //5=事后/事中
     public static final String TREATMEN_TYPE_MID_EX_POST_SUPERVISION = "5";
@@ -72,4 +72,13 @@ public class Constant {
     public static final String AMOUNT_KEY = "amount";
 //    public static final String PROJECT_CODE_KEY = "project_code";
 
+
+    public static final String WATING = "WAITING";
+
+    public static final String DEALING = "DEALING";
+
+    public static final String SUCCESS = "SUCCESS";
+
+    public static final String FAIL = "FAIL";
+
 }

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

@@ -40,7 +40,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  /**
  * @Description: after_incident_detail_log
  * @Author: jeecg-boot
- * @Date:   2023-05-19 15:41:15
+ * @Date:   2023-05-20 23:07:43
  * @Version: V1.0
  */
 @Api(tags="after_incident_detail_log")

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

@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: after_incident_detail_log
  * @Author: jeecg-boot
- * @Date:   2023-05-19 15:41:15
+ * @Date:   2023-05-20 23:07:43
  * @Version: V1.0
  */
 @Data
@@ -52,9 +52,9 @@ public class AfterIncidentDetailLog implements Serializable {
 	@Excel(name = "事后日志表ID", width = 15)
     @ApiModelProperty(value = "事后日志表ID")
     private java.lang.Integer afterIncidentLogId;
-	/**就诊类别;住院/门诊*/
-	@Excel(name = "就诊类别;住院/门诊", width = 15)
-    @ApiModelProperty(value = "就诊类别;住院/门诊")
+	/**就诊类别;1：住院 2：门诊*/
+	@Excel(name = "就诊类别;1：住院 2：门诊", width = 15)
+    @ApiModelProperty(value = "就诊类别;1：住院 2：门诊")
     private java.lang.String visitType;
 	/**科室编码*/
 	@Excel(name = "科室编码", width = 15)
@@ -72,6 +72,10 @@ public class AfterIncidentDetailLog implements Serializable {
 	@Excel(name = "主诊医师编码", width = 15)
     @ApiModelProperty(value = "主诊医师编码")
     private java.lang.String doctorId;
+	/**医生级别;*/
+	@Excel(name = "医生级别;", width = 15)
+    @ApiModelProperty(value = "医生级别;")
+    private java.lang.String doctorLevel;
 	/**个人编号*/
 	@Excel(name = "个人编号", width = 15)
     @ApiModelProperty(value = "个人编号")
@@ -80,6 +84,14 @@ public class AfterIncidentDetailLog implements Serializable {
 	@Excel(name = "患者姓名", width = 15)
     @ApiModelProperty(value = "患者姓名")
     private java.lang.String patientName;
+	/**患者性别;*/
+	@Excel(name = "患者性别;", width = 15)
+    @ApiModelProperty(value = "患者性别;")
+    private java.lang.String patientGender;
+	/**患者年龄;*/
+	@Excel(name = "患者年龄;", width = 15)
+    @ApiModelProperty(value = "患者年龄;")
+    private java.lang.String patientAge;
 	/**住院号/门诊号*/
 	@Excel(name = "住院号/门诊号", width = 15)
     @ApiModelProperty(value = "住院号/门诊号")
@@ -88,6 +100,12 @@ public class AfterIncidentDetailLog implements Serializable {
 	@Excel(name = "医嘱号/处方号", width = 15)
     @ApiModelProperty(value = "医嘱号/处方号")
     private java.lang.String recipeNo;
+	/**入院时间;*/
+	@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;
 	/**项目类型*/
 	@Excel(name = "项目类型", width = 15)
     @ApiModelProperty(value = "项目类型")
@@ -112,9 +130,23 @@ public class AfterIncidentDetailLog implements Serializable {
 	@Excel(name = "发票项目编号", width = 15)
     @ApiModelProperty(value = "发票项目编号")
     private java.lang.String invoiceProject;
-	/**费用类别;床位费、诊查费、检查费、化验费、治疗费、手术费、护理费、卫生材料费、西药费、中药饮片费*/
-	@Excel(name = "费用类别;床位费、诊查费、检查费、化验费、治疗费、手术费、护理费、卫生材料费、西药费、中药饮片费", width = 15)
-    @ApiModelProperty(value = "费用类别;床位费、诊查费、检查费、化验费、治疗费、手术费、护理费、卫生材料费、西药费、中药饮片费")
+	/**离院方式;*/
+	@Excel(name = "离院方式;", width = 15)
+    @ApiModelProperty(value = "离院方式;")
+    private java.lang.String dischargeStatus;
+	/**出院床位;*/
+	@Excel(name = "出院床位;", width = 15)
+    @ApiModelProperty(value = "出院床位;")
+    private java.lang.String dscgBed;
+	/**出院日期;*/
+	@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 outHospDate;
+	/**费用类别;01	床位费 02	诊察费 03	检查费 04	化验费 05	治疗费 06	手术费 07	护理费 08	卫生材料费 09	西药费 10	中药饮片费 11	中成药费 12	一般诊疗费 13	挂号费 14	其他费 14012	单病种除外内容 14013	单病种超标准床位费 14014	单病种定额标准费 1407	救护车费 1408	MRI费 1409	CT费 1410	彩超费 1411	输氧费 1412	输血费 1413	麻醉费 1414	麻醉相关项目费 1415	其他医疗费*/
+	@Excel(name = "费用类别;01	床位费 02	诊察费 03	检查费 04	化验费 05	治疗费 06	手术费 07	护理费 08	卫生材料费 09	西药费 10	中药饮片费 11	中成药费 12	一般诊疗费 13	挂号费 14	其他费 14012	单病种除外内容 14013	单病种超标准床位费 14014	单病种定额标准费 1407	救护车费 1408	MRI费 1409	CT费 1410	彩超费 1411	输氧费 1412	输血费 1413	麻醉费 1414	麻醉相关项目费 1415	其他医疗费", width = 15)
+    @ApiModelProperty(value = "费用类别;01	床位费 02	诊察费 03	检查费 04	化验费 05	治疗费 06	手术费 07	护理费 08	卫生材料费 09	西药费 10	中药饮片费 11	中成药费 12	一般诊疗费 13	挂号费 14	其他费 14012	单病种除外内容 14013	单病种超标准床位费 14014	单病种定额标准费 1407	救护车费 1408	MRI费 1409	CT费 1410	彩超费 1411	输氧费 1412	输血费 1413	麻醉费 1414	麻醉相关项目费 1415	其他医疗费")
     private java.lang.String expenseCategory;
 	/**剂型*/
 	@Excel(name = "剂型", width = 15)
@@ -176,6 +208,26 @@ public class AfterIncidentDetailLog implements Serializable {
 	@Excel(name = "医嘱类别", width = 15)
     @ApiModelProperty(value = "医嘱类别")
     private java.lang.String orderType;
+	/**医院诊断编码;*/
+	@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;
+	/**状态;WAITING,DEALING,SUCCESS,FAIL*/
+	@Excel(name = "状态;WAITING,DEALING,SUCCESS,FAIL", width = 15)
+    @ApiModelProperty(value = "状态;WAITING,DEALING,SUCCESS,FAIL")
+    private java.lang.String state;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;

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

@@ -39,8 +39,8 @@ public class MidIncidentAudit implements Serializable {
     private java.lang.Integer id;
 
 	/**就诊类别;住院/门诊*/
-	@Excel(name = "就诊类别;住院/门诊", width = 15)
-    @ApiModelProperty(value = "就诊类别;住院/门诊")
+	@Excel(name = "就诊类别;1：住院 2：门诊", width = 15)
+    @ApiModelProperty(value = "就诊类别;1：住院 2：门诊")
     private java.lang.String treatmentType;
 
 	/**提醒类别;事前提醒，事中预警，事后监管*/

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

@@ -55,8 +55,8 @@ public class MidIncidentAuditDetail implements Serializable {
     private java.lang.Integer midIncidentAuditId;
 
 	/**就诊类别;住院/门诊*/
-	@Excel(name = "就诊类别;住院/门诊", width = 15)
-    @ApiModelProperty(value = "就诊类别;住院/门诊")
+	@Excel(name = "就诊类别;1：住院 2：门诊", width = 15)
+    @ApiModelProperty(value = "就诊类别;1：住院 2：门诊")
     private java.lang.String treatmentType;
 	/**警示级别*/
 	@Excel(name = "警示级别", width = 15)

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

@@ -53,8 +53,8 @@ public class MidIncidentVisitDetailLog implements Serializable {
     @ApiModelProperty(value = "事中门诊日志表ID")
     private java.lang.Integer midIncidentVisitLogId;
 	/**就诊类别;住院/门诊*/
-	@Excel(name = "就诊类别;住院/门诊", width = 15)
-    @ApiModelProperty(value = "就诊类别;住院/门诊")
+	@Excel(name = "就诊类别;1：住院 2：门诊", width = 15)
+    @ApiModelProperty(value = "就诊类别;1：住院 2：门诊")
     private java.lang.String visitType;
 	/**科室编码*/
 	@Excel(name = "科室编码", width = 15)
@@ -114,7 +114,32 @@ public class MidIncidentVisitDetailLog implements Serializable {
     private java.lang.String invoiceProject;
 	/**费用类别;床位费、诊查费、检查费、化验费、治疗费、手术费、护理费、卫生材料费、西药费、中药饮片费*/
 	@Excel(name = "费用类别;床位费、诊查费、检查费、化验费、治疗费、手术费、护理费、卫生材料费、西药费、中药饮片费", width = 15)
-    @ApiModelProperty(value = "费用类别;床位费、诊查费、检查费、化验费、治疗费、手术费、护理费、卫生材料费、西药费、中药饮片费")
+    @ApiModelProperty(value = "01\t床位费\n" +
+            "02\t诊察费\n" +
+            "03\t检查费\n" +
+            "04\t化验费\n" +
+            "05\t治疗费\n" +
+            "06\t手术费\n" +
+            "07\t护理费\n" +
+            "08\t卫生材料费\n" +
+            "09\t西药费\n" +
+            "10\t中药饮片费\n" +
+            "11\t中成药费\n" +
+            "12\t一般诊疗费\n" +
+            "13\t挂号费\n" +
+            "14\t其他费\n" +
+            "14012\t单病种除外内容\n" +
+            "14013\t单病种超标准床位费\n" +
+            "14014\t单病种定额标准费\n" +
+            "1407\t救护车费\n" +
+            "1408\tMRI费\n" +
+            "1409\tCT费\n" +
+            "1410\t彩超费\n" +
+            "1411\t输氧费\n" +
+            "1412\t输血费\n" +
+            "1413\t麻醉费\n" +
+            "1414\t麻醉相关项目费\n" +
+            "1415\t其他医疗费")
     private java.lang.String expenseCategory;
 	/**剂型*/
 	@Excel(name = "剂型", width = 15)

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

@@ -37,8 +37,8 @@ public class MidIncidentVisitLog implements Serializable {
     @ApiModelProperty(value = "主键ID")
     private java.lang.Integer id;
 	/**就诊类别;住院/门诊*/
-	@Excel(name = "就诊类别;住院/门诊", width = 15)
-    @ApiModelProperty(value = "就诊类别;住院/门诊")
+	@Excel(name = "就诊类别;1：住院 2：门诊", width = 15)
+    @ApiModelProperty(value = "就诊类别;1：住院 2：门诊")
     private java.lang.String visitType;
 	/**科室编码*/
 	@Excel(name = "科室编码", width = 15)
@@ -73,9 +73,9 @@ public class MidIncidentVisitLog implements Serializable {
     @ApiModelProperty(value = "医嘱号/处方号")
     private java.lang.String doctorAdviceNo;
 	/**入院日期*/
-	@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")
+	@Excel(name = "入院日期", width = 15, format =  "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd")
+    @DateTimeFormat(pattern= "yyyy-MM-dd")
     @ApiModelProperty(value = "入院日期")
     private java.util.Date inHospDate;
 	/**诊断编码*/

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

@@ -1,5 +1,9 @@
 package org.jeecg.modules.medical.job;
 
+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.service.IAfterIncidentDetailLogService;
 import org.jeecg.modules.medical.service.IAfterIncidentLogService;
 import org.quartz.Job;
@@ -7,6 +11,8 @@ import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.List;
+
 /**
  * 事后触发监管
  */
@@ -19,6 +25,17 @@ public class AfterWaringJob implements Job {
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+        QueryWrapper queryWrapper = new QueryWrapper(AfterIncidentLog.class);
+        queryWrapper.eq("state", Constant.WATING);
+        long count = afterIncidentLogService.count(queryWrapper);
+        if(count>0){
+            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();
+
+            }
 
+        }
     }
 }

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: after_incident_detail_log
  * @Author: jeecg-boot
- * @Date:   2023-05-19 15:41:15
+ * @Date:   2023-05-20 23:07:43
  * @Version: V1.0
  */
 public interface AfterIncidentDetailLogMapper extends BaseMapper<AfterIncidentDetailLog> {

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

@@ -58,17 +58,17 @@ import java.util.stream.Collectors;
 @Component
 //@ConditionalOnProperty(name = "module", havingValue = Constant.MODULE_RULEENGINE_NAME)
 public class RuleEngine {
-    private List<MedicalInsRuleInfo> medicalInsRuleInfoList = new ArrayList();
+
     @Autowired
     private IMedicalInsRuleInfoService medicalInsRuleInfoService;
     @Autowired
     private IFactorEnchanceService factorEnchanceService;
-    @Autowired
-    private IEventAttrService eventAttrService;
-    @Autowired
-    private IFactorAttrRelaService factorAttrRelaService;
-    @Autowired
-    private IFactorCondRelaService factorCondRelaService;
+//    @Autowired
+//    private IEventAttrService eventAttrService;
+//    @Autowired
+//    private IFactorAttrRelaService factorAttrRelaService;
+//    @Autowired
+//    private IFactorCondRelaService factorCondRelaService;
     @Autowired
     private IMedicalInsRuleProjectService medicalInsRuleProjectService;
     @Autowired
@@ -121,7 +121,8 @@ public class RuleEngine {
             if (Constant.TREATMEN_TYPE_ADVANCE_WARNING.equals(medicalInsRuleInfo.getCallScenario())) {
                 redisTemplate.opsForHash().put(Constant.MEDICAL_RULE_CACHE_KEY + "_" + Constant.TREATMEN_TYPE_ADVANCE_WARNING,
                         medicalInsRuleInfo.getId(), medicalInsRuleInfo.getDegreeSuspicion());
-            } else if (Constant.TREATMEN_TYPE_MID_INCIDENT_WARNING.equals(medicalInsRuleInfo.getCallScenario())) {
+            } else if (Constant.TREATMEN_TYPE_MID_INCIDENT_WARNING.equals(medicalInsRuleInfo.getCallScenario())
+                    || Constant.TREATMEN_TYPE_MID_EX_POST_SUPERVISION.equals(medicalInsRuleInfo.getCallScenario())) {
                 medicalInsRuleInfoIdList.add(medicalInsRuleInfo.getId());
             }
         }
@@ -221,9 +222,9 @@ public class RuleEngine {
                 }
                 runMidEngine(auditDetailSet, itemMap, medicalInsRuleInfoIdList, midIncidentAudit, ipStr);
             }
-        } catch (Exception e){
+        } catch (Exception e) {
             log.error(e.getMessage(), e);
-        } finally{
+        } finally {
             midIncidentWarningVOThreadLocal.remove();
         }
 
@@ -242,7 +243,7 @@ public class RuleEngine {
         }
         midIncidentVisitLog.setDoctorAdviceNo(midIncidentWarningVO.getDoctor_advice_no());
         try {
-            if(StringUtils.isNotBlank(midIncidentWarningVO.getIn_hosp_date())) {
+            if (StringUtils.isNotBlank(midIncidentWarningVO.getIn_hosp_date())) {
                 Date inHospDate = DateUtils.parseDate(midIncidentWarningVO.getIn_hosp_date(), "yyyyMMdd");
                 midIncidentVisitLog.setInHospDate(inHospDate);
             }
@@ -280,6 +281,7 @@ public class RuleEngine {
                 midIncidentVisitDetailLog.setSingleDoseNumber(adviceDetailsVO.getSingle_dose_number());
                 midIncidentVisitDetailLog.setSingleDoseUnit(adviceDetailsVO.getSingle_dose_unit());
                 midIncidentVisitDetailLog.setMedicalDeptCode(adviceDetailsVO.getMedical_project_code());
+                midIncidentVisitDetailLog.setMedicalDeptName(adviceDetailsVO.getMedical_project_name());
                 midIncidentVisitDetailLog.setMedicalProjectName(adviceDetailsVO.getMedical_project_name());
                 midIncidentVisitDetailLog.setTakeFrequence(adviceDetailsVO.getTake_frequence());
                 midIncidentVisitDetailLog.setMedicalSpecification(adviceDetailsVO.getMedical_specification());
@@ -289,6 +291,8 @@ public class RuleEngine {
                 midIncidentVisitDetailLog.setProjectType(adviceDetailsVO.getProject_type());
                 midIncidentVisitDetailLog.setProejctCode(adviceDetailsVO.getProject_code());
                 midIncidentVisitDetailLog.setProejctName(adviceDetailsVO.getProject_name());
+                midIncidentVisitDetailLog.setPatientId(midIncidentWarningVO.getPatient_id());
+                midIncidentVisitDetailLog.setPatientId(midIncidentWarningVO.getPatient_name());
                 midIncidentVisitDetailLogList.add(midIncidentVisitDetailLog);
             }
             midIncidentVisitDetailLogService.saveBatch(midIncidentVisitDetailLogList);
@@ -406,7 +410,7 @@ public class RuleEngine {
             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)){
+                if (auditDetailSet.contains(auditDetailKeyStr)) {
                     log.error("项目编码:{} 规则ID:{} 已经执行过规则引擎，此次忽略", paramMap.get(Constant.MEDICAL_PROJECT_NAME_KEY), medicalRuleInsInfoId);
                     continue;
                 }

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: after_incident_detail_log
  * @Author: jeecg-boot
- * @Date:   2023-05-19 15:41:15
+ * @Date:   2023-05-20 23:07:43
  * @Version: V1.0
  */
 public interface IAfterIncidentDetailLogService extends IService<AfterIncidentDetailLog> {

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: after_incident_detail_log
  * @Author: jeecg-boot
- * @Date:   2023-05-19 15:41:15
+ * @Date:   2023-05-20 23:07:43
  * @Version: V1.0
  */
 @Service

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

@@ -142,7 +142,7 @@
             dataIndex: 'afterIncidentLogId'
           },
           {
-            title:'就诊类别;住院/门诊',
+            title:'就诊类别;1：住院 2：门诊',
             align:"center",
             dataIndex: 'visitType'
           },
@@ -166,6 +166,11 @@
             align:"center",
             dataIndex: 'doctorId'
           },
+          {
+            title:'医生级别;',
+            align:"center",
+            dataIndex: 'doctorLevel'
+          },
           {
             title:'个人编号',
             align:"center",
@@ -176,6 +181,16 @@
             align:"center",
             dataIndex: 'patientName'
           },
+          {
+            title:'患者性别;',
+            align:"center",
+            dataIndex: 'patientGender'
+          },
+          {
+            title:'患者年龄;',
+            align:"center",
+            dataIndex: 'patientAge'
+          },
           {
             title:'住院号/门诊号',
             align:"center",
@@ -186,6 +201,14 @@
             align:"center",
             dataIndex: 'recipeNo'
           },
+          {
+            title:'入院时间;',
+            align:"center",
+            dataIndex: 'inHospDate',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
           {
             title:'项目类型',
             align:"center",
@@ -217,7 +240,25 @@
             dataIndex: 'invoiceProject'
           },
           {
-            title:'费用类别;床位费、诊查费、检查费、化验费、治疗费、手术费、护理费、卫生材料费、西药费、中药饮片费',
+            title:'离院方式;',
+            align:"center",
+            dataIndex: 'dischargeStatus'
+          },
+          {
+            title:'出院床位;',
+            align:"center",
+            dataIndex: 'dscgBed'
+          },
+          {
+            title:'出院日期;',
+            align:"center",
+            dataIndex: 'outHospDate',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'费用类别;01	床位费 02	诊察费 03	检查费 04	化验费 05	治疗费 06	手术费 07	护理费 08	卫生材料费 09	西药费 10	中药饮片费 11	中成药费 12	一般诊疗费 13	挂号费 14	其他费 14012	单病种除外内容 14013	单病种超标准床位费 14014	单病种定额标准费 1407	救护车费 1408	MRI费 1409	CT费 1410	彩超费 1411	输氧费 1412	输血费 1413	麻醉费 1414	麻醉相关项目费 1415	其他医疗费',
             align:"center",
             dataIndex: 'expenseCategory'
           },
@@ -296,6 +337,31 @@
             align:"center",
             dataIndex: 'orderType'
           },
+          {
+            title:'医院诊断编码;',
+            align:"center",
+            dataIndex: 'diagnoseCode'
+          },
+          {
+            title:'医院诊断描述;',
+            align:"center",
+            dataIndex: 'diagnoseDesc'
+          },
+          {
+            title:'医保诊断编码;',
+            align:"center",
+            dataIndex: 'medDiagnoseCode'
+          },
+          {
+            title:'医保诊断描述;',
+            align:"center",
+            dataIndex: 'medDiagnoseDesc'
+          },
+          {
+            title:'状态;WAITING,DEALING,SUCCESS,FAIL',
+            align:"center",
+            dataIndex: 'state'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -334,22 +400,29 @@
         fieldList.push({type:'string',value:'medicalInsRuleInfoCode',text:'医保规则编码'})
         fieldList.push({type:'string',value:'medicalInsRuleInfoName',text:'医保规则名称'})
         fieldList.push({type:'int',value:'afterIncidentLogId',text:'事后日志表ID'})
-        fieldList.push({type:'string',value:'visitType',text:'就诊类别;住院/门诊'})
+        fieldList.push({type:'string',value:'visitType',text:'就诊类别;1：住院 2：门诊'})
         fieldList.push({type:'string',value:'medicalDeptCode',text:'科室编码'})
         fieldList.push({type:'string',value:'medicalDeptName',text:'科室名称'})
         fieldList.push({type:'string',value:'doctorName',text:'医生姓名'})
         fieldList.push({type:'string',value:'doctorId',text:'主诊医师编码'})
+        fieldList.push({type:'string',value:'doctorLevel',text:'医生级别;'})
         fieldList.push({type:'string',value:'patientId',text:'个人编号'})
         fieldList.push({type:'string',value:'patientName',text:'患者姓名'})
+        fieldList.push({type:'string',value:'patientGender',text:'患者性别;'})
+        fieldList.push({type:'string',value:'patientAge',text:'患者年龄;'})
         fieldList.push({type:'string',value:'visitNo',text:'住院号/门诊号'})
         fieldList.push({type:'string',value:'recipeNo',text:'医嘱号/处方号'})
+        fieldList.push({type:'date',value:'inHospDate',text:'入院时间;'})
         fieldList.push({type:'string',value:'projectType',text:'项目类型'})
         fieldList.push({type:'string',value:'proejctCode',text:'项目编码'})
         fieldList.push({type:'string',value:'proejctName',text:'项目名称'})
         fieldList.push({type:'string',value:'medicalProjectCode',text:'医保项目编码'})
         fieldList.push({type:'string',value:'medicalProjectName',text:'医保项目名称'})
         fieldList.push({type:'string',value:'invoiceProject',text:'发票项目编号'})
-        fieldList.push({type:'string',value:'expenseCategory',text:'费用类别;床位费、诊查费、检查费、化验费、治疗费、手术费、护理费、卫生材料费、西药费、中药饮片费'})
+        fieldList.push({type:'string',value:'dischargeStatus',text:'离院方式;'})
+        fieldList.push({type:'string',value:'dscgBed',text:'出院床位;'})
+        fieldList.push({type:'date',value:'outHospDate',text:'出院日期;'})
+        fieldList.push({type:'string',value:'expenseCategory',text:'费用类别;01	床位费 02	诊察费 03	检查费 04	化验费 05	治疗费 06	手术费 07	护理费 08	卫生材料费 09	西药费 10	中药饮片费 11	中成药费 12	一般诊疗费 13	挂号费 14	其他费 14012	单病种除外内容 14013	单病种超标准床位费 14014	单病种定额标准费 1407	救护车费 1408	MRI费 1409	CT费 1410	彩超费 1411	输氧费 1412	输血费 1413	麻醉费 1414	麻醉相关项目费 1415	其他医疗费'})
         fieldList.push({type:'string',value:'doseForm',text:'剂型'})
         fieldList.push({type:'string',value:'medicalSpecification',text:'规格'})
         fieldList.push({type:'number',value:'price',text:'价格;单价，必须使用数值型，如”12.5”'})
@@ -365,6 +438,11 @@
         fieldList.push({type:'string',value:'inspectionSite',text:'检查部位'})
         fieldList.push({type:'string',value:'orderCatalog',text:'医嘱大类'})
         fieldList.push({type:'string',value:'orderType',text:'医嘱类别'})
+        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:'state',text:'状态;WAITING,DEALING,SUCCESS,FAIL'})
         this.superFieldList = fieldList
       }
     }

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

@@ -3,24 +3,24 @@
 
 
 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 ('2023051903411670150', NULL, 'after_incident_detail_log', '/medical/afterIncidentDetailLogList', 'medical/AfterIncidentDetailLogList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-05-19 15:41:15', NULL, NULL, 0);
+VALUES ('2023052011074720430', NULL, 'after_incident_detail_log', '/medical/afterIncidentDetailLogList', 'medical/AfterIncidentDetailLogList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-05-20 23:07:43', 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 ('2023051903411670151', '2023051903411670150', '添加after_incident_detail_log', NULL, NULL, 0, NULL, NULL, 2, 'medical:after_incident_detail_log:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-19 15:41:15', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2023052011074720431', '2023052011074720430', '添加after_incident_detail_log', NULL, NULL, 0, NULL, NULL, 2, 'medical:after_incident_detail_log:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-20 23:07:43', 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 ('2023051903411670152', '2023051903411670150', '编辑after_incident_detail_log', NULL, NULL, 0, NULL, NULL, 2, 'medical:after_incident_detail_log:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-19 15:41:15', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2023052011074720432', '2023052011074720430', '编辑after_incident_detail_log', NULL, NULL, 0, NULL, NULL, 2, 'medical:after_incident_detail_log:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-20 23:07:43', 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 ('2023051903411670153', '2023051903411670150', '删除after_incident_detail_log', NULL, NULL, 0, NULL, NULL, 2, 'medical:after_incident_detail_log:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-19 15:41:15', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2023052011074720433', '2023052011074720430', '删除after_incident_detail_log', NULL, NULL, 0, NULL, NULL, 2, 'medical:after_incident_detail_log:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-20 23:07:43', 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 ('2023051903411670154', '2023051903411670150', '批量删除after_incident_detail_log', NULL, NULL, 0, NULL, NULL, 2, 'medical:after_incident_detail_log:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-19 15:41:15', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2023052011074720434', '2023052011074720430', '批量删除after_incident_detail_log', NULL, NULL, 0, NULL, NULL, 2, 'medical:after_incident_detail_log:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-20 23:07:43', 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 ('2023051903411670155', '2023051903411670150', '导出excel_after_incident_detail_log', NULL, NULL, 0, NULL, NULL, 2, 'medical:after_incident_detail_log:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-19 15:41:15', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2023052011074720435', '2023052011074720430', '导出excel_after_incident_detail_log', NULL, NULL, 0, NULL, NULL, 2, 'medical:after_incident_detail_log:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-20 23:07:43', 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 ('2023051903411670156', '2023051903411670150', '导入excel_after_incident_detail_log', NULL, NULL, 0, NULL, NULL, 2, 'medical:after_incident_detail_log:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-19 15:41:15', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2023052011074720436', '2023052011074720430', '导入excel_after_incident_detail_log', NULL, NULL, 0, NULL, NULL, 2, 'medical:after_incident_detail_log:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-20 23:07:43', NULL, NULL, 0, 0, '1', 0);

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

@@ -24,8 +24,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="就诊类别;住院/门诊" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="visitType">
-              <a-input v-model="model.visitType" placeholder="请输入就诊类别;住院/门诊"  ></a-input>
+            <a-form-model-item label="就诊类别;1：住院 2：门诊" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="visitType">
+              <a-input v-model="model.visitType" placeholder="请输入就诊类别;1：住院 2：门诊"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -48,6 +48,11 @@
               <a-input v-model="model.doctorId" placeholder="请输入主诊医师编码"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="医生级别;" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="doctorLevel">
+              <a-input v-model="model.doctorLevel" placeholder="请输入医生级别;"  ></a-input>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="个人编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="patientId">
               <a-input v-model="model.patientId" placeholder="请输入个人编号"  ></a-input>
@@ -58,6 +63,16 @@
               <a-input v-model="model.patientName" placeholder="请输入患者姓名"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="患者性别;" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="patientGender">
+              <a-input v-model="model.patientGender" placeholder="请输入患者性别;"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="患者年龄;" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="patientAge">
+              <a-input v-model="model.patientAge" placeholder="请输入患者年龄;"  ></a-input>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="住院号/门诊号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="visitNo">
               <a-input v-model="model.visitNo" placeholder="请输入住院号/门诊号"  ></a-input>
@@ -68,6 +83,11 @@
               <a-input v-model="model.recipeNo" placeholder="请输入医嘱号/处方号"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="入院时间;" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inHospDate">
+              <j-date placeholder="请选择入院时间;" v-model="model.inHospDate"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="项目类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="projectType">
               <a-input v-model="model.projectType" placeholder="请输入项目类型"  ></a-input>
@@ -99,8 +119,23 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="费用类别;床位费、诊查费、检查费、化验费、治疗费、手术费、护理费、卫生材料费、西药费、中药饮片费" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="expenseCategory">
-              <a-input v-model="model.expenseCategory" placeholder="请输入费用类别;床位费、诊查费、检查费、化验费、治疗费、手术费、护理费、卫生材料费、西药费、中药饮片费"  ></a-input>
+            <a-form-model-item label="离院方式;" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dischargeStatus">
+              <a-input v-model="model.dischargeStatus" placeholder="请输入离院方式;"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="出院床位;" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dscgBed">
+              <a-input v-model="model.dscgBed" placeholder="请输入出院床位;"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="出院日期;" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="outHospDate">
+              <j-date placeholder="请选择出院日期;" v-model="model.outHospDate"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="费用类别;01	床位费 02	诊察费 03	检查费 04	化验费 05	治疗费 06	手术费 07	护理费 08	卫生材料费 09	西药费 10	中药饮片费 11	中成药费 12	一般诊疗费 13	挂号费 14	其他费 14012	单病种除外内容 14013	单病种超标准床位费 14014	单病种定额标准费 1407	救护车费 1408	MRI费 1409	CT费 1410	彩超费 1411	输氧费 1412	输血费 1413	麻醉费 1414	麻醉相关项目费 1415	其他医疗费" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="expenseCategory">
+              <a-input v-model="model.expenseCategory" placeholder="请输入费用类别;01	床位费 02	诊察费 03	检查费 04	化验费 05	治疗费 06	手术费 07	护理费 08	卫生材料费 09	西药费 10	中药饮片费 11	中成药费 12	一般诊疗费 13	挂号费 14	其他费 14012	单病种除外内容 14013	单病种超标准床位费 14014	单病种定额标准费 1407	救护车费 1408	MRI费 1409	CT费 1410	彩超费 1411	输氧费 1412	输血费 1413	麻醉费 1414	麻醉相关项目费 1415	其他医疗费"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -178,6 +213,31 @@
               <a-input v-model="model.orderType" placeholder="请输入医嘱类别"  ></a-input>
             </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="状态;WAITING,DEALING,SUCCESS,FAIL" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+              <a-input v-model="model.state" placeholder="请输入状态;WAITING,DEALING,SUCCESS,FAIL"  ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>