Explorar el Código

add: 审核端-审核列表导出

Scott hace 1 año
padre
commit
491a92419b
Se han modificado 15 ficheros con 459 adiciones y 8 borrados
  1. 2 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/common/bo/ReportAfterQueryDetailResponseBO.java
  2. 126 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/common/bo/ViolateDeptChildDetailExportResponse.java
  3. 81 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/common/bo/ViolateProjectChildDetailExportResponse.java
  4. 83 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/common/bo/mid/ViolateRuleChildExportResponse.java
  5. 46 1
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/ViolationAnalysisController.java
  6. 5 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/AfterwardsAuditDetailMapper.java
  7. 2 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/AfterwardsAuditMapper.java
  8. 65 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/AfterwardsAuditDetailMapper.xml
  9. 0 3
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/AfterwardsAuditMapper.xml
  10. 5 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/IAfterwardsAuditDetailService.java
  11. 7 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/IAfterwardsAuditService.java
  12. 5 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/IViolationAnalysisService.java
  13. 8 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/AfterwardsAuditDetailServiceImpl.java
  14. 14 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/AfterwardsAuditServiceImpl.java
  15. 10 4
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/ViolationAnalysisServiceImpl.java

+ 2 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/common/bo/ReportAfterQueryDetailResponseBO.java

@@ -22,8 +22,10 @@ public class ReportAfterQueryDetailResponseBO implements Serializable {
     @ApiModelProperty(value = "事中工单id")
     private Integer id;
 
+    @Excel(name = "科室", width = 15)
     @ApiModelProperty(value = "科室名称")
     private String medicalDeptName;
+
     @ApiModelProperty(value = "科室编码")
     private String medicalDeptCode;
     @Excel(name = "医生姓名", width = 15)

+ 126 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/common/bo/ViolateDeptChildDetailExportResponse.java

@@ -0,0 +1,126 @@
+package org.jeecg.modules.medical.common.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+
+/**
+ * @author yaowei
+ * @time 2023/11/15 22:50 星期三
+ * @description '事后-科室稽核统计-明细详情-导出响应'
+ * @parentProject medical-java
+ */
+@Data
+public class ViolateDeptChildDetailExportResponse {
+
+    @Excel(name = "科室", width = 15)
+    @ApiModelProperty(value = "科室名称")
+    private String medicalDeptName;
+
+    @Excel(name = "医生", width = 15)
+    @ApiModelProperty(value = "医生姓名")
+    private java.lang.String doctorName;
+
+    @Excel(name = "异常-多收", width = 15)
+    @ApiModelProperty(value = "异常多收")
+    private BigDecimal errorRelativelyManyAmt;
+
+    @Excel(name = "异常-少收", width = 15)
+    @ApiModelProperty(value = "异常少收")
+    private BigDecimal errorRelativelyFewAmt;
+
+    @Excel(name = "就诊类型", width = 15)
+    @ApiModelProperty(value = "就诊类别;住院/门诊")
+    @Dict(dicCode = "treatment_type")
+    private java.lang.String treatmentType;
+
+    @Excel(name = "项目编码", width = 15)
+    @ApiModelProperty(value = "医保项目编码")
+    private java.lang.String medicalProjectCode;
+
+    /**项目名称*/
+    @Excel(name = "项目名称", width = 15)
+    @ApiModelProperty(value = "医保项目名称")
+    private java.lang.String medicalProjectName;
+
+    @Excel(name = "参保人编号", width = 15)
+    @ApiModelProperty(value = "个人编号")
+    private java.lang.String patientId;
+
+    /**医保规则名称*/
+    @Excel(name = "违反规则名称", width = 15)
+    @ApiModelProperty(value = "医保规则名称")
+    private java.lang.String medicalInsRuleInfoName;
+
+    @Excel(name = "违规级别", width = 15)
+    @ApiModelProperty(value = "规则管理级别")
+    @Dict(dicCode = "violation_level")
+    private String reminderLevel;
+
+    /**患者姓名*/
+    @Excel(name = "参保人姓名", width = 15)
+    @ApiModelProperty(value = "患者姓名")
+    private java.lang.String patientName;
+
+    @Excel(name = "提醒时间", width = 15)
+    @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;
+
+
+    @Excel(name = "违反规则编号", width = 15)
+    @ApiModelProperty(value = "医保规则编码")
+    private java.lang.String medicalInsRuleInfoCode;
+
+    /**反馈结果*/
+    @Excel(name = "医生处理意见", width = 15)
+    @ApiModelProperty(value = "反馈结果|医生处理意见")
+    private java.lang.String feedbackResult;
+
+
+    @ApiModelProperty(value = "事中工单id")
+    private Integer id;
+
+
+
+    @ApiModelProperty(value = "科室编码")
+    private String medicalDeptCode;
+
+    /**主诊医师编码*/
+//    @Excel(name = "主诊医师编码", width = 15)
+    @ApiModelProperty(value = "主诊医师编码")
+    private java.lang.String doctorId;
+
+    @ApiModelProperty(value = "单价")
+    private BigDecimal price;
+
+    @ApiModelProperty(value = "数量")
+    private BigDecimal quantity;
+    @ApiModelProperty(value = "异常金额")
+    private BigDecimal errorTotalAmt;
+
+
+
+
+
+
+
+
+
+
+
+    @ApiModelProperty(value = "是否医保")
+    private String medicalInsurance;
+
+
+    /**反馈编码*/
+//    @Excel(name = "反馈编码", width = 15)
+    @ApiModelProperty(value = "反馈编码")
+    private java.lang.String feedbackCode;
+}

+ 81 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/common/bo/ViolateProjectChildDetailExportResponse.java

@@ -0,0 +1,81 @@
+package org.jeecg.modules.medical.common.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author yaowei
+ * @time 2023/11/15 22:41 星期三
+ * @description '这里写类描述'
+ * @parentProject medical-java
+ */
+@Data
+public class ViolateProjectChildDetailExportResponse implements Serializable {
+
+    @Excel(name = "科室", width = 15)
+    @ApiModelProperty(value = "科室名称")
+    private String medicalDeptName;
+
+    @Excel(name = "项目编号", width = 15)
+    @ApiModelProperty(value = "医保项目编码")
+    private java.lang.String medicalProjectCode;
+
+    @Excel(name = "项目名称", width = 15)
+    @ApiModelProperty(value = "医保项目名称")
+    private java.lang.String medicalProjectName;
+
+    @Excel(name = "医生", width = 15)
+    @ApiModelProperty(value = "医生姓名")
+    private java.lang.String doctorName;
+
+    @Excel(name = "异常-多收", width = 15)
+    @ApiModelProperty(value = "异常多收")
+    private BigDecimal errorRelativelyManyAmt;
+
+    @Excel(name = "异常-多收", width = 15)
+    @ApiModelProperty(value = "异常多收")
+    private BigDecimal errorRelativelyFewAmt;
+
+    @Excel(name = "就诊类型", width = 15)
+    @ApiModelProperty(value = "就诊类别;住院/门诊")
+//    @Dict(dicCode = "treatment_type")
+    private java.lang.String treatmentType;
+
+    @Excel(name = "参保人编号", width = 15)
+    @ApiModelProperty(value = "个人编号")
+    private java.lang.String patientId;
+
+    @Excel(name = "违反规则名称", width = 15)
+    @ApiModelProperty(value = "医保规则名称")
+    private java.lang.String medicalInsRuleInfoName;
+
+    @Excel(name = "违规级别", width = 15)
+    @ApiModelProperty(value = "规则管理级别")
+    @Dict(dicCode = "violation_level")
+    private String reminderLevel;
+
+    @Excel(name = "参保人姓名", width = 15)
+    @ApiModelProperty(value = "患者姓名")
+    private java.lang.String patientName;
+
+    @Excel(name = "提醒时间", width = 15)
+    @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;
+
+    @Excel(name = "违反规则编号", width = 15)
+    @ApiModelProperty(value = "医保规则编码")
+    private java.lang.String medicalInsRuleInfoCode;
+
+    @Excel(name = "医生意见处理", width = 15)
+    @ApiModelProperty(value = "反馈结果|医生处理意见")
+    private java.lang.String feedbackResult;
+}

+ 83 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/common/bo/mid/ViolateRuleChildExportResponse.java

@@ -0,0 +1,83 @@
+package org.jeecg.modules.medical.common.bo.mid;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author Scott
+ * @time 2023/11/15 23:08 星期三
+ * @description '事后-规则类型-明细详情-导出'
+ * @parentProject medical-java
+ */
+@Data
+public class ViolateRuleChildExportResponse implements Serializable {
+
+    @Excel(name = "违反规则名称", width = 15)
+    @ApiModelProperty(value = "医保规则名称")
+    private String medicalInsRuleInfoName;
+
+    @Excel(name = "规则管理级别", width = 15)
+    @ApiModelProperty(value = "规则管理级别")
+    @Dict(dicCode = "violation_level")
+    private String reminderLevel;
+
+    @Excel(name = "医保项目编码(违规项目编码)", width = 15)
+    @ApiModelProperty(value = "医保项目编码(违规项目编码)")
+    private java.lang.String medicalProjectCode;
+
+    @Excel(name = "医保项目名称(项目名称)", width = 15)
+    @ApiModelProperty(value = "医保项目名称(项目名称)")
+    private java.lang.String medicalProjectName;
+
+
+    @Excel(name = "医生", width = 15)
+    @ApiModelProperty(value = "医生名称")
+    private String doctorName;
+
+    @Excel(name = "科室", width = 15)
+    @ApiModelProperty(value = "科室名称")
+    private String medicalDeptName;
+
+    @Excel(name = "异常-多收", width = 15)
+    @ApiModelProperty(value = "异常-多收")
+    private BigDecimal errorRelativelyManyAmt;
+
+    @Excel(name = "异常-少收", width = 15)
+    @ApiModelProperty(value = "异常-少收")
+    private BigDecimal errorRelativelyFewAmt;
+
+    @Excel(name = "就诊类型", width = 15)
+    @ApiModelProperty(value = "就诊类型")
+    @Dict(dicCode = "treatment_type")
+    private String treatmentType;
+
+    @Excel(name = "参保人编号", width = 15)
+    @ApiModelProperty(value = "患者编码|参保人编码")
+    private String patientId;
+
+    @Excel(name = "参保人姓名", width = 15)
+    @ApiModelProperty(value = "患者姓名")
+    private String patientName;
+
+    @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 Date createTime;
+
+    @Excel(name = "违反规则编号", width = 15)
+    @ApiModelProperty(value = "医保规则编码")
+    private String medicalInsRuleInfoCode;
+
+    @Excel(name = "医生处理意见", width = 15)
+    @ApiModelProperty(value = "医生处理意见")
+    private String feedbackResult;
+}

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

@@ -8,12 +8,14 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.medical.common.bo.*;
 import org.jeecg.modules.medical.common.bo.after.response.AfterDeptDetailRequest;
 import org.jeecg.modules.medical.common.bo.before.AuditAdvanceWarningAuditDetailResponse;
 import org.jeecg.modules.medical.common.bo.mid.AuditMidDetailListResponse;
 import org.jeecg.modules.medical.common.bo.mid.MidDeptAuditListPageRequest;
+import org.jeecg.modules.medical.common.bo.mid.ViolateRuleChildExportResponse;
 import org.jeecg.modules.medical.common.bo.mid.request.AuditMidDetailListRequest;
 import org.jeecg.modules.medical.common.bo.mid.response.MidAuditDetailResponse;
 import org.jeecg.modules.medical.common.bo.mid.response.MidAuditViolateProjectStatisticsResponse;
@@ -414,6 +416,16 @@ public class ViolationAnalysisController {
         return ok;
     }
 
+    @ApiOperation(value="事后-科室稽核统计-明细详情-导出", notes="科室稽核统计-明细详情-导出")
+    @RequestMapping(value = "/after/group/department/exportXls")
+    public ModelAndView afterDepartmentDetailExportXls(HttpServletRequest req, AfterDeptDetailRequest deptDetailRequest) {
+        try {
+            return afterwardsAuditService.afterDepartmentDetailExportXls(req, deptDetailRequest, ViolateDeptChildDetailExportResponse.class, "事后-科室稽核统计-明细详情");
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
 
     @ApiOperation(value="违规分析-事后违规项目统计-列表", notes="违规分析-事后违规项目统计")
     @GetMapping(value = "/after/project/list")
@@ -444,7 +456,7 @@ public class ViolationAnalysisController {
 
     @ApiOperation(value = "事后-事后违规项目统计-列表-子列表",notes = "事后-事后违规项目统计-列表-子列表")
     @GetMapping(value = "/after/project/child/list")
-    public Result<IPage<ReportAfterQueryDetailResponseBO>> afterDepartmentDetail(String medicalProjectCode,
+    public Result<IPage<ReportAfterQueryDetailResponseBO>> afterProjectChildList(String medicalProjectCode,
                                                                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                                                  HttpServletRequest req) {
@@ -460,6 +472,18 @@ public class ViolationAnalysisController {
         return ok;
     }
 
+    @ApiOperation(value="事后-违规项目统计-明细详情-导出", notes="事后-违规项目统计-明细详情")
+    @RequestMapping(value = "/after/project/child/exportXls")
+    public ModelAndView afterProjectChildExportXls(HttpServletRequest req, String medicalProjectCode) {
+        try {
+            AfterDeptDetailRequest deptDetailRequest = new AfterDeptDetailRequest();
+            deptDetailRequest.setMedicalProjectSearch(medicalProjectCode);
+            return afterwardsAuditService.afterProjectChildExportXls(req, deptDetailRequest, ViolateProjectChildDetailExportResponse.class, "事后-违规项目统计-明细详情");
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
 
     @ApiOperation(value="违规分析-事后规则类型统计-列表", notes="违规分析-事后规则类型统计-列表")
     @GetMapping(value = "/after/rule/list")
@@ -511,6 +535,27 @@ public class ViolationAnalysisController {
     }
 
 
+
+    @ApiOperation(value="事后-规则类型统计-明细详情-导出", notes="事后-规则类型统计-明细详情")
+    @RequestMapping(value = "/after/rule/child/exportXls")
+    public ModelAndView afterRuleChildExportXls(HttpServletRequest req, @RequestParam("medicalInsRuleInfoCode") String medicalInsRuleInfoCode) {
+        try {
+            if (!StringUtils.hasText(medicalInsRuleInfoCode)) {
+                throw new JeecgBootException("违反规则代码不可为空");
+            }
+            AuditMidDetailListRequest request = new AuditMidDetailListRequest();
+            request.setMedicalInsRuleInfoCode(medicalInsRuleInfoCode);
+            AfterDeptDetailRequest afterDeptDetailRequest = new AfterDeptDetailRequest();
+            afterDeptDetailRequest.setMedicalInsRuleInfoCode(medicalInsRuleInfoCode);
+            Map<String, String[]> parameterMap = req.getParameterMap();
+            List<AuditMidDetailListResponse> exportList = violationAnalysisService.loadAfterAuditPageList(request, parameterMap);
+            return exportUtilHelperService.commonExportXml(e -> ViolateRuleChildExportResponse.class,  "事后-规则类型统计-明细详情", exportList);
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
     @ApiOperation(value = "违规分析-医院结算明细")
     @GetMapping(value = "/audit/settlement/detail")
     public Result<InpatientSettlementDetailResponse> loadInpatientSettlementDetail(HttpServletRequest request,

+ 5 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/AfterwardsAuditDetailMapper.java

@@ -3,9 +3,12 @@ package org.jeecg.modules.medical.mapper;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.medical.common.bo.before.AuditAdvanceWarningAuditDetailResponse;
 import org.jeecg.modules.medical.common.bo.before.PatientInformationResponse;
+import org.jeecg.modules.medical.common.bo.mid.AuditMidDetailListResponse;
+import org.jeecg.modules.medical.common.bo.mid.request.AuditMidDetailListRequest;
 import org.jeecg.modules.medical.common.bo.mid.response.MidAuditViolateProjectStatisticsResponse;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -26,4 +29,6 @@ public interface AfterwardsAuditDetailMapper extends BaseMapper<AfterwardsAuditD
 
     List<MidAuditViolateProjectStatisticsResponse> afterViolateProjectStatisticsList(@Param("projectCode")  String projectCode,
                                                                                       @Param("medicalProjectSearch")String medicalProjectSearch,@Param("startTime") String startTime,@Param("endTime") String endTime);
+
+    IPage<AuditMidDetailListResponse> loadAfterAuditPageList(Page<AuditMidDetailListResponse> page, @Param("ew") AuditMidDetailListRequest request);
 }

+ 2 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/AfterwardsAuditMapper.java

@@ -40,6 +40,8 @@ public interface AfterwardsAuditMapper extends BaseMapper<AfterwardsAudit> {
     IPage<ReportAfterQueryDetailResponseBO> departmentDetailStatistics(Page<AfterwardsAuditDetail> page,
                                                                        @Param("ew") AfterDeptDetailRequest afterwardsAuditDetail);
 
+    List<ReportAfterQueryDetailResponseBO> departmentDetailStatistics(@Param("ew") AfterDeptDetailRequest afterwardsAuditDetail);
+
     /**
      * 统计时候主表对应一条记录的违规金额
      * @param id

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

@@ -80,5 +80,70 @@
 
 
 
+    </select>
+    <select id="loadAfterAuditPageList"
+            resultType="org.jeecg.modules.medical.common.bo.mid.AuditMidDetailListResponse">
+        SELECT
+            id
+            ,proejct_code as projectCode
+            ,proejct_name as projectName
+            ,patient_id,
+            violation_level,
+            reminder_level,
+            patient_name,
+            treatment_type,
+            medical_dept_name
+            ,medical_ins_rule_info_code as medicalInsRuleInfoCode
+            ,medical_ins_rule_info_name as medicalInsRuleInfoName
+            ,medical_project_code
+            ,medical_project_code
+            ,doctor_name,
+            doctor_id,
+            create_time,
+            amount
+            ,(SELECT feedback_code from afterwards_audit WHERE id = afterwards_audit_id) as feedback_code
+            ,(SELECT feedback_result from afterwards_audit WHERE id = afterwards_audit_id) as feedback_result
+            ,description
+            FROM
+            afterwards_audit_detail
+        <where> 1=1
+            <if test="ew.projectSearch != null and ew.projectSearch != '' ">
+                AND(
+                proejct_code LIKE concat(concat('%',#{ew.projectSearch}),'%')
+                or
+                proejct_name LIKE concat(concat('%',#{ew.projectSearch}),'%')
+                )
+            </if>
+            <if test="ew.treatmentType != null and ew.treatmentType != '' ">
+                AND treatment_type = #{ew.treatmentType}
+            </if>
+            <if test="ew.doctorName != null and ew.doctorName != '' ">
+                AND doctor_name LIKE concat(concat('%',#{ew.doctorName}),'%')
+            </if>
+            <if test="ew.medicalDeptName != null and ew.medicalDeptName != ''">
+                AND medical_dept_name = #{ew.medicalDeptName}
+            </if>
+            <if test="ew.medicalDeptCode != null and ew.medicalDeptCode != ''">
+                AND medical_dept_code = #{ew.medicalDeptCode}
+            </if>
+            <if test="ew.startTime != null and ew.startTime != '' ">
+                AND <![CDATA[ create_time >= #{ew.startTime} ]]>
+            </if>
+            <if test="ew.endTime != null and ew.endTime != '' ">
+                AND <![CDATA[  create_time <= #{ew.endTime} ]]>
+            </if>
+            <if test="ew.medicalProjectCode != null and ew.medicalProjectCode != '' " >
+                AND medical_project_code = #{ew.medicalProjectCode}
+            </if>
+            <if test="ew.medicalInsRuleInfoCode != null and ew.medicalInsRuleInfoCode != ''">
+                AND medical_ins_rule_info_code = #{ew.medicalInsRuleInfoCode}
+            </if>
+            <if test="ew.medicalInsRuleInfoName != null and ew.medicalInsRuleInfoName != ''">
+                AND medical_ins_rule_info_name = #{ew.medicalInsRuleInfoName}
+            </if>
+            <if test="ew.reminderLevel != null and ew.reminderLevel != ''">
+                AND reminder_level = #{reminderLevel}
+            </if>
+        </where>
     </select>
 </mapper>

+ 0 - 3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/AfterwardsAuditMapper.xml

@@ -377,9 +377,6 @@
                 AND violation_level = #{ew.violationLevel}
             </if>
         </where>
-
-
-
     </select>
 
 </mapper>

+ 5 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/IAfterwardsAuditDetailService.java

@@ -1,9 +1,12 @@
 package org.jeecg.modules.medical.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.medical.common.bo.after.response.AfterwardsAuditDetailResponse;
 import org.jeecg.modules.medical.common.bo.before.AuditAdvanceWarningAuditDetailResponse;
 import org.jeecg.modules.medical.common.bo.before.PatientInformationResponse;
+import org.jeecg.modules.medical.common.bo.mid.AuditMidDetailListResponse;
+import org.jeecg.modules.medical.common.bo.mid.request.AuditMidDetailListRequest;
 import org.jeecg.modules.medical.common.bo.mid.response.MidAuditViolateProjectStatisticsResponse;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -32,4 +35,6 @@ public interface IAfterwardsAuditDetailService extends IService<AfterwardsAuditD
     IPage<MidAuditViolateProjectStatisticsResponse> afterViolateProjectStatisticsList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String projectCode, String medicalProjectSearch, String startTime, String endTime);
 
     List<MidAuditViolateProjectStatisticsResponse> afterViolateProjectStatisticsList(String projectCode, String medicalProjectSearch, String startTime, String endTime);
+
+    IPage<AuditMidDetailListResponse> loadAfterAuditPageList(Page<AuditMidDetailListResponse> page, AuditMidDetailListRequest request);
 }

+ 7 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/IAfterwardsAuditService.java

@@ -43,6 +43,12 @@ public interface IAfterwardsAuditService extends IService<AfterwardsAudit> {
      */
     IPage<ReportAfterQueryDetailResponseBO> departmentDetailStatistics(Page<AfterwardsAuditDetail> page, AfterDeptDetailRequest afterwardsAuditDetail);
 
+    ModelAndView afterDepartmentDetailExportXls(HttpServletRequest req, AfterDeptDetailRequest deptDetailRequest, Class<ViolateDeptChildDetailExportResponse> clazz, String title) throws UnsupportedEncodingException;
+
+    ModelAndView afterProjectChildExportXls(HttpServletRequest req, AfterDeptDetailRequest afterwardsAuditDetail, Class<ViolateProjectChildDetailExportResponse> clazz, String title) throws UnsupportedEncodingException;
+
+
+
     /**
      * 获取审核列表
      * @param page
@@ -130,4 +136,5 @@ public interface IAfterwardsAuditService extends IService<AfterwardsAudit> {
     ModelAndView auditExportXls(HttpServletRequest req, AfterwardsAudit afterwardsAudit, Class<AfterwardsAuditExportResponse> clazz, String title) throws UnsupportedEncodingException;
 
 
+
 }

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

@@ -2,6 +2,7 @@ package org.jeecg.modules.medical.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.jeecg.modules.medical.BiFunction;
+import org.jeecg.modules.medical.common.bo.ReportAfterQueryDetailResponseBO;
 import org.jeecg.modules.medical.common.bo.ReportAfterQueryResponseBO;
 import org.jeecg.modules.medical.common.bo.after.response.AfterDeptDetailRequest;
 import org.jeecg.modules.medical.common.bo.before.AuditAdvanceWarningAuditDetailResponse;
@@ -42,6 +43,8 @@ public interface IViolationAnalysisService {
     IPage<AuditMidDetailListResponse> loadMidAuditPageList(AuditMidDetailListRequest request, Integer pageNo, Integer pageSize, Map<String, String[]> parameterMap);
     IPage<AuditMidDetailListResponse> loadAfterAuditPageList(AuditMidDetailListRequest request, Integer pageNo, Integer pageSize, Map<String, String[]> parameterMap);
 
+    List<AuditMidDetailListResponse> loadAfterAuditPageList(AuditMidDetailListRequest request, Map<String, String[]> parameterMap);
+
     BigDecimal statisticsMidAuditTotal(AuditMidDetailListRequest request);
     BigDecimal afterStatisticsMidAuditTotal(AfterDeptDetailRequest request);
 
@@ -94,4 +97,6 @@ public interface IViolationAnalysisService {
     ModelAndView afterProjectExportXls(HttpServletRequest req, String projectCode, String projectSearch, String startTime, String endTime, Class<MidAuditViolateProjectStatisticsResponse> midAuditViolateProjectStatisticsResponseClass, String s) throws UnsupportedEncodingException;
 
     ModelAndView afterViolateRuleExportXls(HttpServletRequest req, String medicalInsRuleInfoName, String projectType, String startTime, String endTime, Class<MidAuditDetailResponse> midAuditDetailResponseClass, String s) throws UnsupportedEncodingException;
+
+
 }

+ 8 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/AfterwardsAuditDetailServiceImpl.java

@@ -3,12 +3,15 @@ package org.jeecg.modules.medical.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.checkerframework.checker.units.qual.A;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.modules.medical.common.bo.after.response.AfterwardsAuditDetailResponse;
 import org.jeecg.modules.medical.common.bo.before.AuditAdvanceWarningAuditDetailResponse;
 import org.jeecg.modules.medical.common.bo.before.PatientInformationResponse;
+import org.jeecg.modules.medical.common.bo.mid.AuditMidDetailListResponse;
+import org.jeecg.modules.medical.common.bo.mid.request.AuditMidDetailListRequest;
 import org.jeecg.modules.medical.common.bo.mid.response.MidAuditViolateProjectStatisticsResponse;
 import org.jeecg.modules.medical.entity.*;
 import org.jeecg.modules.medical.mapper.AfterwardsAuditDetailMapper;
@@ -127,6 +130,11 @@ public class AfterwardsAuditDetailServiceImpl extends ServiceImpl<AfterwardsAudi
         return baseMapper.afterViolateProjectStatisticsList(projectCode, medicalProjectSearch, startTime, endTime);
     }
 
+    @Override
+    public IPage<AuditMidDetailListResponse> loadAfterAuditPageList(Page<AuditMidDetailListResponse> page, AuditMidDetailListRequest request) {
+        return baseMapper.loadAfterAuditPageList(page, request);
+    }
+
     private List<AfterwardsAuditDetail> loadDetailList(Integer id) {
         LambdaQueryWrapper<AfterwardsAuditDetail> queryWrapper = Wrappers.<AfterwardsAuditDetail>lambdaQuery()
                 .eq(AfterwardsAuditDetail::getAfterwardsAuditId, id);

+ 14 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/AfterwardsAuditServiceImpl.java

@@ -92,6 +92,20 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
         return baseMapper.departmentDetailStatistics(page, afterwardsAuditDetail);
     }
 
+    @Override
+    public ModelAndView afterDepartmentDetailExportXls(HttpServletRequest req, AfterDeptDetailRequest deptDetailRequest, Class<ViolateDeptChildDetailExportResponse> clazz, String title) throws UnsupportedEncodingException {
+        List<ReportAfterQueryDetailResponseBO> exportList = baseMapper.departmentDetailStatistics(deptDetailRequest);
+        return exportUtilHelperService.commonExportXml(item -> clazz, title, exportList);
+    }
+
+    @Override
+    public ModelAndView afterProjectChildExportXls(HttpServletRequest req, AfterDeptDetailRequest afterwardsAuditDetail, Class<ViolateProjectChildDetailExportResponse> clazz, String title) throws UnsupportedEncodingException {
+        List<ReportAfterQueryDetailResponseBO> exportList = baseMapper.departmentDetailStatistics(afterwardsAuditDetail);
+        return exportUtilHelperService.commonExportXml(e -> clazz, title, exportList);
+    }
+
+
+
     @Override
     public IPage<AfterwardsAudit> auditQueryListPage(Page<AfterwardsAudit> page, QueryWrapper<AfterwardsAudit> queryWrapper) {
         Page<AfterwardsAudit> auditQueryPageList = this.page(page, queryWrapper); // TODO 待审核状态默认是空,需要查询为空

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

@@ -139,9 +139,10 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
     @Override
     public IPage<AuditMidDetailListResponse> loadAfterAuditPageList(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 -> {
+//        IPage<AuditMidDetailListResponse> resultPage = midIncidentAuditService.loadMidAuditPageList(page, request);
+        IPage<AuditMidDetailListResponse> resultPage = afterwardsAuditDetailService.loadAfterAuditPageList(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"));
@@ -153,10 +154,15 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
                 }
             }
             return item;
-        }).collect(Collectors.toList());
+        }).collect(Collectors.toList());*/
         return resultPage;
     }
 
+    @Override
+    public List<AuditMidDetailListResponse> loadAfterAuditPageList(AuditMidDetailListRequest request, Map<String, String[]> parameterMap) {
+        return midIncidentAuditService.loadMidAuditPageList(request);
+    }
+
     @Override
     public BigDecimal statisticsMidAuditTotal(AuditMidDetailListRequest request) {
         return midIncidentAuditService.statisticsMidAuditTotal(request);