事中、事后BUG修复

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/common/bo/before/PatientInformationResponse.java

@@ -49,4 +49,5 @@ public class PatientInformationResponse implements Serializable {
 
     @ApiModelProperty(value = "科室编码")
     private String medicalDeptCode;
+    private String feedbackResult;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/common/bo/mid/AuditMidDetailListResponse.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.medical.common.bo.mid;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -74,7 +75,9 @@ public class AuditMidDetailListResponse implements Serializable {
     @Excel(name = "规则管理级别", width = 15)
     @ApiModelProperty(value = "规则管理级别")
     @Dict(dicCode = "violation_level")
-    private String reminderLevel;
+    private Integer reminderLevel;
+    @Dict(dicCode = "violation_level")
+    private Integer violationLevel;
 
     @Excel(name = "参保人姓名", width = 15)
     @ApiModelProperty(value = "患者姓名")
@@ -153,4 +156,6 @@ public class AuditMidDetailListResponse implements Serializable {
 //    @Excel(name = "数量", width = 15)
     @ApiModelProperty(value = "数量")
     private Integer medicalNumber;
+    @Dict(dicCode = "categories_items")
+    private String expenseCategory;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/common/bo/mid/response/MidAuditDetailResponse.java

@@ -31,7 +31,7 @@ public class MidAuditDetailResponse implements Serializable {
     private String doctorName;
     @Dict(dicCode = "violation_level")
     @ApiModelProperty(value = "规则管理级别")
-    private String violationLevel;
+    private Integer violationLevel;
     @ApiModelProperty(value = "医保规则编码")
     private String medicalInsRuleInfoCode;
 

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

@@ -324,14 +324,14 @@ public class ViolationAnalysisController {
 
     @ApiOperation(value="违规分析-事中规则类型统计-列表", notes="违规分析-事中规则类型统计-列表")
     @GetMapping(value = "/mid/rule/list")
-    public Result<IPage<MidAuditDetailResponse>> midViolateRuleTypePageList(
+    public Result<IPage<MidAuditDetailResponse>> midViolateRuleTypePageList(BigDecimal errorAmountTotal,
             String medicalInsRuleInfoName, String projectType, String startTime, String endTime,
             @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
             @RequestParam(name="pageSize", defaultValue="10") Integer pageSize
     ) {
         IPage<AuditAdvanceWarningAuditDetailResponse> page = new Page<>(pageNo, pageSize);
         IPage<MidAuditDetailResponse> result = violationAnalysisService.midViolateRuleTypePageList(page,
-                medicalInsRuleInfoName, projectType, startTime, endTime);
+                medicalInsRuleInfoName, projectType, startTime, endTime,errorAmountTotal);
         return Result.OK(result);
     }
 

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

@@ -66,6 +66,8 @@ public class AdvanceWarningAuditDetail implements Serializable {
     @ApiModelProperty(value = "警示级别")
     @Dict(dicCode = "violation_level")
     private java.lang.String reminderLevel;
+    @Dict(dicCode = "violation_level")
+    private Integer violationLevel;
 	/**提醒类别;事前提醒，事中预警，事后监管*/
 	@Excel(name = "提醒类别;事前提醒，事中预警，事后监管", width = 15)
     @ApiModelProperty(value = "提醒类别;事前提醒，事中预警，事后监管")

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

@@ -182,4 +182,11 @@ public class AfterwardsAuditDetail implements Serializable {
     private String endTime;
     @TableField(exist = false) // 项目编码，名称
     private String searchContent;
+    @TableField(exist = false) // 项目编码，名称
+
+
+
+    @ApiModelProperty(value = "医生处理意见")
+    private String feedbackResult;
+
 }

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

@@ -136,11 +136,9 @@ public class DiagnosisTreatment implements Serializable {
 
 
 	/**执行日期*/
-	@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)
     @ApiModelProperty(value = "执行日期")
-    private java.util.Date executionDate;
+    private String executionDate;
     /**备注说明*/
     @Excel(name = "备注说明", width = 15)
     @ApiModelProperty(value = "备注说明")

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

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
+
+import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -208,4 +210,7 @@ public class MidIncidentAuditDetail implements Serializable {
     private String patientAge;
 
     private Double patientAgeDays;
+    @ApiModelProperty(value = "项目所属类别")
+    @Dict(dicCode = "categories_items")
+    private String expenseCategory;
 }

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.medical.mapper;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,12 +19,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: mid_incident_audit_detail
  * @Author: jeecg-boot
- * @Date:   2023-05-09 14:37:06
+ * @Date: 2023-05-09 14:37:06
  * @Version: V1.0
  */
 public interface MidIncidentAuditDetailMapper extends BaseMapper<MidIncidentAuditDetail> {
 
     PatientInformationResponse loadPatientInfoById(@Param("id") String id);
+
     PatientInformationResponse loadBeforePatientInfoById(@Param("id") String id);
 
     List<ViolationInfo> loadViolationInfoList(@Param("id") Integer id);
@@ -39,25 +41,27 @@ public interface MidIncidentAuditDetailMapper extends BaseMapper<MidIncidentAudi
     List<MidDeptAuditDetailResponse> midDeptAuditList(@Param("medicalDeptCode") String medicalDeptCode,
                                                       @Param("deptName") String deptName,
                                                       @Param("startTime") String startTime, @Param("endTime") String endTime);
+
     IPage<MidDeptAuditDetailResponse> afterDeptAuditList(IPage<AuditAdvanceWarningAuditDetailResponse> page,
                                                          @Param("medicalDeptCode") String medicalDeptCode,
                                                          @Param("deptName") String deptName,
-                                                       @Param("startTime") String startTime, @Param("endTime") String endTime);
+                                                         @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-    IPage<MidAuditViolateProjectStatisticsResponse> violateProjectStatisticsList(IPage<AuditAdvanceWarningAuditDetailResponse> page, @Param("projectSearch")String projectSearch,
+    IPage<MidAuditViolateProjectStatisticsResponse> violateProjectStatisticsList(IPage<AuditAdvanceWarningAuditDetailResponse> page, @Param("projectSearch") String projectSearch,
                                                                                  @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-    List<MidAuditViolateProjectStatisticsResponse> violateProjectStatisticsList(@Param("projectSearch")String projectSearch,
-                                                                                 @Param("startTime") String startTime, @Param("endTime") String endTime);
+    List<MidAuditViolateProjectStatisticsResponse> violateProjectStatisticsList(@Param("projectSearch") String projectSearch,
+                                                                                @Param("startTime") String startTime, @Param("endTime") String endTime);
 
     IPage<MidAuditDetailResponse> midViolateRuleTypePageList(IPage<AuditAdvanceWarningAuditDetailResponse> page, @Param("medicalInsRuleInfoName") String medicalInsRuleInfoName,
-                                                             @Param("projectType") String projectType, @Param("startTime")  String startTime, @Param("endTime") String endTime);
+                                                             @Param("projectType") String projectType, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("errorAmountTotal") BigDecimal errorAmountTotal);
 
     List<MidAuditDetailResponse> midViolateRuleTypePageList(@Param("medicalInsRuleInfoName") String medicalInsRuleInfoName,
-                                                             @Param("projectType") String projectType, @Param("startTime")  String startTime, @Param("endTime") String endTime);
+                                                            @Param("projectType") String projectType, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
     IPage<MidAuditDetailResponse> afterViolateRuleTypePageList(IPage<AuditAdvanceWarningAuditDetailResponse> page, @Param("medicalInsRuleInfoName") String medicalInsRuleInfoName,
-                                                             @Param("projectType") String projectType, @Param("startTime")  String startTime, @Param("endTime") String endTime);
+                                                               @Param("projectType") String projectType, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
     List<MidAuditDetailResponse> afterViolateRuleTypePageList(@Param("medicalInsRuleInfoName") String medicalInsRuleInfoName,
-                                                               @Param("projectType") String projectType, @Param("startTime")  String startTime, @Param("endTime") String endTime);
+                                                              @Param("projectType") String projectType, @Param("startTime") String startTime, @Param("endTime") String endTime);
 }

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

@@ -16,6 +16,7 @@
             ad.medical_dept_name AS medicalDeptName, -- 科室名称
             ad.medical_dept_code AS medicalDeptCode -- 科室编码
                 ,ad.treatment_type as treatmentType -- 就诊类型
+        ad.feedback_result
         FROM afterwards_audit as ad
 --                  LEFT JOIN his_patient as p on ad.patient_id = p.patient_no
         WHERE ad.id = #{id,jdbcType=INTEGER}

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

@@ -21,16 +21,18 @@
             ,doctor_name,
             doctor_id,
             create_time,
+        error_relatively_many_amt,
+        error_relatively_few_amt,
             amount
             ,(SELECT feedback_code from mid_incident_audit WHERE id = mid_incident_audit_id) as feedback_code
             ,(SELECT feedback_result from mid_incident_audit WHERE id = mid_incident_audit_id) as feedback_result
-            ,description
+            ,description,expense_category
         FROM
             mid_incident_audit_detail
         <where> 1=1
             <if test="ew.projectSearch != null and ew.projectSearch != '' ">
                 AND(
-                    proejct_code LIKE concat(concat('%',#{ew.projectSearch}),'%')
+                proejct_code LIKE concat(concat('%',#{ew.projectSearch}),'%')
                     or
                     proejct_name LIKE concat(concat('%',#{ew.projectSearch}),'%')
                 )
@@ -235,6 +237,7 @@
         mia.feedback_result,
         mid.description,
         mid.reminder_level,
+        mid.violation_level,
         mid.medical_ins_rule_info_code,
         mid.medical_ins_rule_info_name,
         mid.medical_insurance_mark,

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

@@ -13,6 +13,7 @@ import org.jeecg.modules.medical.common.bo.mid.response.MidDeptAuditDetailRespon
 import org.jeecg.modules.medical.entity.MidIncidentAuditDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -59,7 +60,7 @@ public interface IMidIncidentAuditDetailService extends IService<MidIncidentAudi
 
     List<MidAuditViolateProjectStatisticsResponse> violateProjectStatisticsList(String projectSearch, String startTime, String endTime);
 
-    IPage<MidAuditDetailResponse> midViolateRuleTypePageList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String medicalInsRuleInfoName, String projectType, String startTime, String endTime);
+    IPage<MidAuditDetailResponse> midViolateRuleTypePageList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String medicalInsRuleInfoName, String projectType, String startTime, String endTime, BigDecimal errorAmountTotal);
 
     List<MidAuditDetailResponse> midViolateRuleTypePageList(String medicalInsRuleInfoName, String projectType, String startTime, String endTime);
     IPage<MidAuditDetailResponse> afterViolateRuleTypePageList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String medicalInsRuleInfoName, String projectType, String startTime, String endTime);

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

@@ -68,7 +68,7 @@ public interface IViolationAnalysisService {
 
 
     MidAuditDetailResponse beforeAuditDetail(Integer detailId);
-    IPage<MidAuditDetailResponse> midViolateRuleTypePageList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String medicalInsRuleInfoName, String projectType, String startTime, String endTime);
+    IPage<MidAuditDetailResponse> midViolateRuleTypePageList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String medicalInsRuleInfoName, String projectType, String startTime, String endTime,BigDecimal errorAmountTotal);
     IPage<MidAuditDetailResponse> afterViolateRuleTypePageList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String medicalInsRuleInfoName, String projectType, String startTime, String endTime);
 
     MidAuditDetailResponse afterAllDetail(Integer detailId);

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

@@ -30,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
+import java.math.BigDecimal;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.ZoneId;
@@ -165,8 +166,8 @@ public class MidIncidentAuditDetailServiceImpl extends ServiceImpl<MidIncidentAu
     }
 
     @Override
-    public IPage<MidAuditDetailResponse> midViolateRuleTypePageList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String medicalInsRuleInfoName, String projectType, String startTime, String endTime) {
-        return baseMapper.midViolateRuleTypePageList(page, medicalInsRuleInfoName, projectType, startTime, endTime);
+    public IPage<MidAuditDetailResponse> midViolateRuleTypePageList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String medicalInsRuleInfoName, String projectType, String startTime, String endTime,BigDecimal errorAmountTotal) {
+        return baseMapper.midViolateRuleTypePageList(page, medicalInsRuleInfoName, projectType, startTime, endTime,errorAmountTotal);
     }
 
     @Override

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

@@ -119,20 +119,20 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
     public IPage<AuditMidDetailListResponse> loadMidAuditPageList(AuditMidDetailListRequest request, Integer pageNo, Integer pageSize, Map<String, String[]> parameterMap) {
         Page<AuditMidDetailListResponse> page = new Page<>(pageNo, pageSize);
         IPage<AuditMidDetailListResponse> resultPage = midIncidentAuditService.loadMidAuditPageList(page, request);
-        List<AuditMidDetailListResponse> records = resultPage.getRecords();
-        records.stream().map(item -> {
-            BigDecimal detailTotalAmt = midIncidentAuditService.statissticsErrAmtByMidAuditRecordId(item.getId());
-            item.setErrorRelativelyFewAmt(new BigDecimal("0.00"));
-            item.setErrorRelativelyManyAmt(new BigDecimal("0.00"));
-            if (null != detailTotalAmt) {
-                if (detailTotalAmt.compareTo(BigDecimal.ZERO) > 0) { // 异常金额大于0，就是多收
-                    item.setErrorRelativelyManyAmt(detailTotalAmt);
-                } else if (detailTotalAmt.compareTo(BigDecimal.ZERO) < 0) {
-                    item.setErrorRelativelyFewAmt(detailTotalAmt);
-                }
-            }
-            return item;
-        }).collect(Collectors.toList());
+//        List<AuditMidDetailListResponse> records = resultPage.getRecords();
+//        records.stream().map(item -> {
+//            BigDecimal detailTotalAmt = midIncidentAuditService.statissticsErrAmtByMidAuditRecordId(item.getId());
+//            item.setErrorRelativelyFewAmt(new BigDecimal("0.00"));
+//            item.setErrorRelativelyManyAmt(new BigDecimal("0.00"));
+//            if (null != detailTotalAmt) {
+//                if (detailTotalAmt.compareTo(BigDecimal.ZERO) > 0) { // 异常金额大于0，就是多收
+//                    item.setErrorRelativelyManyAmt(detailTotalAmt);
+//                } else if (detailTotalAmt.compareTo(BigDecimal.ZERO) < 0) {
+//                    item.setErrorRelativelyFewAmt(detailTotalAmt);
+//                }
+//            }
+//            return item;
+//        }).collect(Collectors.toList());
         return resultPage;
     }
 
@@ -227,7 +227,7 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
         }
         result.setDescription(detailInfo.getDescription());
         result.setDoctorName(detailInfo.getDoctorName());
-        result.setViolationLevel(detailInfo.getReminderLevel());
+        result.setViolationLevel(detailInfo.getViolationLevel());
         result.setMedicalInsRuleInfoCode(detailInfo.getMedicalInsRuleInfoCode());
         result.setMedicalInsRuleInfoName(detailInfo.getMedicalInsRuleInfoName());
         result.setCreateTime(detailInfo.getCreateTime());
@@ -295,8 +295,8 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
     }
 
     @Override
-    public IPage<MidAuditDetailResponse> midViolateRuleTypePageList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String medicalInsRuleInfoName, String projectType, String startTime, String endTime) {
-        return midIncidentAuditDetailService.midViolateRuleTypePageList(page, medicalInsRuleInfoName, projectType, startTime, endTime);
+    public IPage<MidAuditDetailResponse> midViolateRuleTypePageList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String medicalInsRuleInfoName, String projectType, String startTime, String endTime,BigDecimal errorAmountTotal) {
+        return midIncidentAuditDetailService.midViolateRuleTypePageList(page, medicalInsRuleInfoName, projectType, startTime, endTime,errorAmountTotal);
     }
     @Override
     public IPage<MidAuditDetailResponse> afterViolateRuleTypePageList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String medicalInsRuleInfoName, String projectType, String startTime, String endTime) {
@@ -314,7 +314,7 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
         }
         result.setDescription(detailInfo.getDescription());
         result.setDoctorName(detailInfo.getDoctorName());
-        result.setViolationLevel(detailInfo.getReminderLevel());
+        result.setViolationLevel(detailInfo.getViolationLevel());
         result.setMedicalInsRuleInfoCode(detailInfo.getMedicalInsRuleInfoCode());
         result.setMedicalInsRuleInfoName(detailInfo.getMedicalInsRuleInfoName());
         result.setCreateTime(detailInfo.getCreateTime());
@@ -363,7 +363,7 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
         result.setDoctorName(detailInfo.getDoctorName());
         result.setMedicalInsRuleInfoName(detailInfo.getMedicalInsRuleInfoName());
         result.setDescription(detailInfo.getDescription());
-        result.setViolationLevel(detailInfo.getReminderLevel());
+        result.setViolationLevel(detailInfo.getViolationLevel());
         result.setMedicalInsRuleInfoCode(detailInfo.getMedicalInsRuleInfoCode());
         result.setProjectName(detailInfo.getProejctName());
         result.setProjectCode(detailInfo.getProejctCode());
@@ -407,7 +407,7 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
         midAuditDoctorInfo.setMedicalDeptName(detailInfo.getMedicalDeptName());
         midAuditDoctorInfo.setDoctorId(detailInfo.getDoctorId());
         midAuditDoctorInfo.setDoctorName(detailInfo.getDoctorName());
-        midAuditDoctorInfo.setFeedbackResult("无");
+        midAuditDoctorInfo.setFeedbackResult(patientInformationResponse.getFeedbackResult());
         result.setDoctorInfo(midAuditDoctorInfo);
 
 

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

@@ -131,7 +131,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://124.220.224.184:3306/medical_fy?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://124.220.224.184:3306/medical?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
           password: G@7NYpxInsxLOn%l
           driver-class-name: com.mysql.cj.jdbc.Driver
@@ -234,7 +234,7 @@ cas:
 #Mybatis输出sql日志
 logging:
   level:
-    org.jeecg.modules.system.mapper: info
+    org.jeecg.modules.system.mapper: debug
 #swagger
 knife4j:
   #开启增强配置

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

@@ -131,7 +131,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://124.220.224.184:3306/medical?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://124.220.224.184:3306/medical_fy?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
           password: G@7NYpxInsxLOn%l
           driver-class-name: com.mysql.cj.jdbc.Driver