add: 违规审核-科室事中审查列表

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

@@ -15,6 +15,7 @@ import java.math.BigDecimal;
 @Data
 public class ReportAfterQueryResponseBO implements Serializable {
 
+    private Integer id;
     @ApiModelProperty(value = "排名")
     private Integer orderNum;
     @ApiModelProperty(value = "科室名称")
@@ -22,17 +23,17 @@ public class ReportAfterQueryResponseBO implements Serializable {
     @ApiModelProperty(value = "科室编码")
     private String medicalDeptCode;
     @ApiModelProperty(value = "科室医生总数")
-    private Integer medicalDeptDoctorTotal;
+    private Integer deptDoctorTotal;
     @ApiModelProperty(value = "违规医生总数")
-    private Integer violationDoctorTotal;
+    private Integer violationDoctorNumber;
     @ApiModelProperty(value = "违规总数")
     private Integer violationTotal;
     @ApiModelProperty(value = "门诊异常金额")
-    private BigDecimal outpatientErrorAmt;
+    private BigDecimal outpatientsErrorAmount;
     @ApiModelProperty(value = "住院异常金额")
-    private BigDecimal hospErrorAmt;
+    private BigDecimal hospErrorAmount;
     @ApiModelProperty(value = "异常金额统计")
-    private BigDecimal errorAmtTotal;
+    private BigDecimal errorAmountTotal;
 
 
 }

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

@@ -0,0 +1,28 @@
+package org.jeecg.modules.medical.common.bo.after.response;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author yaowei
+ * @time 2023/10/19 01:55 星期四
+ * @description '事后-科室违规明细请求入参'
+ * @parentProject medical-java
+ */
+@Data
+public class AfterDeptDetailRequest implements Serializable {
+    @ApiModelProperty(value = "医保项目编码/名称")
+    private String medicalProjectSearch;
+    @ApiModelProperty(value = "就诊类别;住院/门诊")
+    private String treatmentType;
+
+    @ApiModelProperty(value = "医保规则编码")
+    private java.lang.String medicalInsRuleInfoCode;
+    /**医保规则名称*/
+    @ApiModelProperty(value = "医保规则名称")
+    private java.lang.String medicalInsRuleInfoName;
+
+    @ApiModelProperty(value = "违规等级")
+    private java.lang.Integer violationLevel;}

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

@@ -15,6 +15,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.medical.common.bo.*;
+import org.jeecg.modules.medical.common.bo.after.response.AfterDeptDetailRequest;
 import org.jeecg.modules.medical.common.enums.AfterwardsAuditStatusEnum;
 import org.jeecg.modules.medical.entity.AfterwardsAudit;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
@@ -235,7 +236,7 @@ public class AfterwardsAuditController extends JeecgController<AfterwardsAudit,
 
 	 @ApiOperation(value = "事后-科室统计-详情",notes = "事后-科室统计-详情，事后-科室稽核统计")
 	 @GetMapping(value = "/group/department/detail")
-	 public Result<IPage<?>> departmentDetail(AfterwardsAuditDetail afterwardsAuditDetail,
+	 public Result<IPage<?>> departmentDetail(AfterDeptDetailRequest afterwardsAuditDetail,
 											  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 											  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 											  HttpServletRequest req) {

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

@@ -9,7 +9,9 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
+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;
 import org.jeecg.modules.medical.common.bo.before.MedicalHistoryRecord;
 import org.jeecg.modules.medical.common.bo.before.PrescriptionDetail;
@@ -262,13 +264,19 @@ public class ViolationAnalysisController {
 
     @ApiOperation(value = "事后-科室统计-详情",notes = "事后-科室统计-详情，事后-科室稽核统计")
     @GetMapping(value = "/after/group/department/detail")
-    public Result<IPage<?>> afterDepartmentDetail(AfterwardsAuditDetail afterwardsAuditDetail,
-                                             @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                             @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-                                             HttpServletRequest req) {
+    public Result<IPage<ReportAfterQueryDetailResponseBO>> afterDepartmentDetail(AfterDeptDetailRequest deptDetailRequest,
+                                                                                 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                                                 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                                                 HttpServletRequest req) {
         Page<AfterwardsAuditDetail> page = new Page<>(pageNo, pageSize);
-        IPage<?> pageList = afterwardsAuditService.departmentDetailStatistics(page, afterwardsAuditDetail);
-        return Result.OK(pageList);
+        IPage<ReportAfterQueryDetailResponseBO> pageList = afterwardsAuditService.departmentDetailStatistics(page, deptDetailRequest);
+        BigDecimal totalAmt = afterwardsAuditService.statisticsAfterAuditTotal(deptDetailRequest);
+
+        Result<IPage<ReportAfterQueryDetailResponseBO>> ok = Result.OK(pageList);
+        JSONObject j = new JSONObject();
+        j.put("totalAmount", totalAmt);
+        ok.setExtend(j);
+        return ok;
     }
 
 

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

@@ -98,6 +98,8 @@ public class AfterwardsAudit implements Serializable {
     @ApiModelProperty(value = "床号")
     private java.lang.String bedNumber;
 
+    @JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "上个审核时间")
     private Date preAuditTime;
 	/**审核人*/
@@ -106,6 +108,8 @@ public class AfterwardsAudit implements Serializable {
     private java.lang.String checkBy;
 
 
+    @JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "审核时间")
     private Date auditTime;
 	/**创建人*/

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

@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -162,4 +160,11 @@ public class AfterwardsAuditDetail implements Serializable {
     @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;
+
+    @TableField(exist = false)
+    private String startTime;
+    @TableField(exist = false)
+    private String endTime;
+    @TableField(exist = false) // 项目编码，名称
+    private String projectSearch;
 }

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

@@ -7,6 +7,7 @@ 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.*;
+import org.jeecg.modules.medical.common.bo.after.response.AfterDeptDetailRequest;
 import org.jeecg.modules.medical.entity.AfterwardsAudit;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
@@ -32,7 +33,7 @@ public interface AfterwardsAuditMapper extends BaseMapper<AfterwardsAudit> {
      * 科室： 事后统计，详情列表
      */
     IPage<ReportAfterQueryDetailResponseBO> departmentDetailStatistics(Page<AfterwardsAuditDetail> page,
-                                                                       @Param("ew") AfterwardsAuditDetail afterwardsAuditDetail);
+                                                                       @Param("ew") AfterDeptDetailRequest afterwardsAuditDetail);
 
     /**
      * 统计时候主表对应一条记录的违规金额
@@ -85,4 +86,6 @@ public interface AfterwardsAuditMapper extends BaseMapper<AfterwardsAudit> {
     List<MedicalInsuranceProjectDetailsResponse> loadMedicalInsuranceProjectDetails(@Param("id") Integer id);
 
     List<InpatientSettlementMasterResponse> loadInpatientSettlementMaster(@Param("id") Integer id);
+
+    BigDecimal statisticsAfterAuditTotal(@Param("ew") AfterDeptDetailRequest afterwardsAuditDetail);
 }

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

@@ -5,110 +5,78 @@
     <select id="departmentStatistics"
             resultType="org.jeecg.modules.medical.common.bo.ReportAfterQueryResponseBO">
         SELECT
-            (SELECT @rowNum := @rowNum + 1 AS rowNum ) as orderNum,
-            t.*
-        From
-            ( SELECT @rowNum := 0 ) r,
-            (SELECT
-                any_value ( m.medical_dept_code ) as medical_dept_code,
-                any_value ( m.medical_dept_name ) as medical_dept_name,
-                (
-                    SELECT count(*) FROM sys_user_depart WHERE dep_id = (
-                    SELECT id FROM sys_depart WHERE medical_dept_code = m.medical_dept_code)
-                ) as medical_dept_doctor_total,
-                (
-                    SELECT count(*) FROM afterwards_audit_detail WHERE medical_dept_code = m.medical_dept_code GROUP BY doctor_id
-                ) as violation_doctor_total,
-                (
-                SELECT count(*) FROM afterwards_audit_detail WHERE medical_dept_code = m.medical_dept_code GROUP BY doctor_id
-                ) as violation_total,
-                ifnull((
-                    SELECT sum(amount) FROM afterwards_audit_detail WHERE 	medical_dept_code = m.medical_dept_code AND treatment_type = '2'
-                ), 0) as outpatient_error_amt,
-                ifnull((
-                    SELECT sum(amount) FROM afterwards_audit_detail WHERE 	medical_dept_code = m.medical_dept_code AND treatment_type = '1'
-                ), 0) as hosp_error_amt,
-                ifnull((
-                    SELECT sum(amount) FROM afterwards_audit_detail WHERE 	medical_dept_code = m.medical_dept_code
-                ), 0) as error_amt_total
-            FROM
-                afterwards_audit as m
-                <if test="ew.medicalDeptName != null and ew.medicalDeptName != ''">
-                    WHERE medical_dept_name like concat(concat('%',#{ew.medicalDeptName}),'%')
-                </if>
-                <if test="ew.startTime != null and ew.startTime != ''">
-                    <![CDATA[ create_time >= #{ew.startTime,jdbcType=VARCHAR} ]]>
-                </if>
-                <if test="ew.endTime != null and ew.endTime != ''">
-                    <![CDATA[ create_time <= #{ew.endTime,jdbcType=VARCHAR} ]]>
-                </if>
-                GROUP BY medical_dept_code
-            ) as t
-        ORDER BY t.error_amt_total DESC
+            m.id
+            ,m.medical_dept_name
+            ,m.medical_dept_code
+            ,(SELECT count(*) from sys_user_depart where dep_id = (SELECT id from sys_depart where medical_dept_code = m.medical_dept_code)) as deptDoctorTotal -- 科室医生总数
+            ,(select count(*) from ( SELECT  count(doctor_id) from afterwards_audit_detail WHERE medical_dept_code = m.medical_dept_code GROUP BY doctor_id) as t  ) as violationDoctorNumber -- 违规医生总数
+            ,COUNT(id) as violationTotal
+            ,(select IFNULL(sum(amount), 0) from afterwards_audit_detail WHERE medical_dept_code = m.medical_dept_code and treatment_type = '2') as outpatientsErrorAmount  -- 门诊违规金额
+            ,(select IFNULL(sum(amount),0) from afterwards_audit_detail WHERE medical_dept_code = m.medical_dept_code and treatment_type = '1') as hospErrorAmount -- 住院违规金额
+            ,ifnull( sum(amount), 0) as errorAmountTotal -- 异常金额总和
+        FROM afterwards_audit_detail as m
+        <where>
+            <if test="ew.medicalDeptName != null and ew.medicalDeptName != ''">
+                WHERE medical_dept_name like concat(concat('%',#{ew.medicalDeptName}),'%')
+            </if>
+            <if test="ew.startTime != null and ew.startTime != ''">
+                <![CDATA[ create_time >= #{ew.startTime,jdbcType=VARCHAR} ]]>
+            </if>
+            <if test="ew.endTime != null and ew.endTime != ''">
+                <![CDATA[ create_time <= #{ew.endTime,jdbcType=VARCHAR} ]]>
+            </if>
+        </where>
+        GROUP BY medical_dept_code
+        ORDER BY violationDoctorNumber DESC
     </select>
 
     <select id="departmentDetailStatistics"
             resultType="org.jeecg.modules.medical.common.bo.ReportAfterQueryDetailResponseBO">
         SELECT
-            (tdetail.amount - (tdetail.quantity * tdetail.price)) as errorTotalAmt,
-            tdetail.*
-        from (
-             SELECT
-                 t.medical_dept_name,
-                 t.doctor_id,
-                 t.doctor_name,
-                 case t.project_type
-                     WHEN 'medicine' THEN m.id
-                     WHEN 'consumable' THEN c.id
-                     WHEN 'diagnoses' THEN d.id
-                     else 0 end as join_id,
-                 case t.project_type
-                     WHEN 'medicine' THEN m.max_sale_limit
-                     WHEN 'consumable' THEN c.price
-                     WHEN 'diagnoses' THEN d.price
-                     else 0 end as price, -- 单价
-                 t.quantity, -- 数量
-                 t.amount,
-                 t.treatment_type, -- "就诊类型"
-                 t.medical_project_code, -- "项目编码"
-                 t.medical_project_name, -- "项目名称"
-                 t.patient_id, -- "参保人员编码"
-                 t.medical_ins_rule_info_code, -- as "违反规则编码"
-                 t.medical_ins_rule_info_name, -- as "违反规则名称"
-                 t.violation_level, --  as "违规等级"
-                 t.patient_name, -- as "患者姓名|参保人姓名"
-                 "is_medical_insurance" medicalInsurance, -- "是否医保"
-                 t.create_time, -- "创建时间|提醒时间"
-                 "主表带出" as "医生处理意见"
-             FROM afterwards_audit_detail as t
-                      LEFT JOIN medicine as m on t.proejct_code = m.medicine_code AND t.project_type = 'medicine'
-                      LEFT JOIN consumable_material as c on t.proejct_code = c.consumable_code AND t.project_type = 'consumable'
-                      left JOIN diagnosis_treatment as d on t.proejct_code = d.project_code AND t.project_type = 'diagnoses'
-             <where>
-                AND t.medical_dept_code = #{ew.medicalDeptCode,jdbcType=VARCHAR}
-                AND t.afterwards_audit_id = #{ew.afterwardsAuditId,jdbcType=VARCHAR}
-                <!-- UI字段筛选 Start -->
-                <if test="ew.medicalProjectCode != null and ew.medicalProjectCode != ''">
-                    AND (
-                    t.medical_project_code like concat(concat('%',#{ew.medicalProjectCode}),'%')
-                        or
-                    t.medical_project_name like concat(concat('%',#{ew.medicalProjectCode}),'%')
-                    )
-                </if>
-                <if test="ew.treatmentType != null and ew.treatmentType != ''">
-                    AND t.treatment_type = #{ew.treatmentType,jdbcType=VARCHAR}
-                </if>
-                <if test="ew.medicalInsRuleInfoCode != null and ew.medicalInsRuleInfoCode != ''">
-                    AND t.medical_ins_rule_info_code = #{ew.medicalInsRuleInfoCode,jdbcType=VARCHAR}
-                </if>
-                <if test="ew.medicalInsRuleInfoName != null and ew.medicalInsRuleInfoName != ''">
-                    AND t.medical_ins_rule_info_name = #{ew.medicalInsRuleInfoName,jdbcType=VARCHAR}
-                </if>
-                <if test="ew.violationLevel != null and violationLevel != ''">
-                    AND t.violation_level = #{ew.violationLevel,jdbcType=INTEGER}
-                </if>
-             </where>
-        ) as tdetail
+            id
+             ,medical_dept_name
+             ,medical_dept_code
+             ,doctor_name
+             ,doctor_id
+             ,price
+             ,quantity
+             ,error_relatively_many_amt
+             ,error_relatively_few_amt
+             ,treatment_type
+             ,medical_project_code
+             ,medical_project_name
+             ,patient_id
+             ,patient_name
+             ,medical_ins_rule_info_code
+             ,medical_ins_rule_info_name
+             ,violation_level
+             ,medical_insurance_mark
+             ,create_time
+             ,description
+        from
+            afterwards_audit_detail
+        <where>
+            <if test="ew.medicalProjectSearch != null and ew.medicalProjectSearch != '' ">
+                AND(
+                medical_project_code LIKE concat(concat('%',#{ew.medicalProjectSearch}),'%')
+                or
+                medical_project_name LIKE concat(concat('%',#{ew.medicalProjectSearch}),'%')
+                )
+            </if>
+            <if test="ew.treatmentType != null and ew.treatmentType != '' ">
+                AND treatment_type = #{ew.treatmentType}
+            </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.violationLevel != null and ew.violationLevel != null" >
+                AND violation_level = #{ew.violationLevel}
+            </if>
+        </where>
+
     </select>
     <select id="statisticsErrAmtByAfterwareRecordId" resultType="java.math.BigDecimal">
         SELECT
@@ -321,4 +289,30 @@
                  LEFT JOIN his_patient AS his ON ad.patient_id = his.patient_no
         WHERE ad.id = #{id,jdbcType=INTEGER}
     </select>
+
+    <select id="statisticsAfterAuditTotal" resultType="java.math.BigDecimal">
+        select ifnull(sum(amount), 0) as totalAmount
+        FROM afterwards_audit_detail
+        <where>
+            <if test="ew.medicalProjectSearch != null and ew.medicalProjectSearch != '' ">
+                AND(
+                medical_project_code LIKE concat(concat('%',#{ew.medicalProjectSearch}),'%')
+                or
+                medical_project_name LIKE concat(concat('%',#{ew.medicalProjectSearch}),'%')
+                )
+            </if>
+            <if test="ew.treatmentType != null and ew.treatmentType != '' ">
+                AND treatment_type = #{ew.treatmentType}
+            </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.violationLevel != null and ew.violationLevel != null" >
+                AND violation_level = #{ew.violationLevel}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -5,12 +5,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.medical.common.bo.*;
+import org.jeecg.modules.medical.common.bo.after.response.AfterDeptDetailRequest;
 import org.jeecg.modules.medical.common.bo.after.response.AfterwardsAuditDetailResponse;
 import org.jeecg.modules.medical.entity.AfterwardsAudit;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
 import org.jeecg.modules.medical.entity.MedicalDoctorAppealRecord;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -29,7 +31,7 @@ public interface IAfterwardsAuditService extends IService<AfterwardsAudit> {
      * @param afterwardsAuditDetail
      * @return
      */
-    IPage<?> departmentDetailStatistics(Page<AfterwardsAuditDetail> page, AfterwardsAuditDetail afterwardsAuditDetail);
+    IPage<ReportAfterQueryDetailResponseBO> departmentDetailStatistics(Page<AfterwardsAuditDetail> page, AfterDeptDetailRequest afterwardsAuditDetail);
 
     /**
      * 获取审核列表
@@ -108,4 +110,5 @@ public interface IAfterwardsAuditService extends IService<AfterwardsAudit> {
      */
     List<InpatientSettlementMasterResponse> loadInpatientSettlementMaster(Integer id);
 
+    BigDecimal statisticsAfterAuditTotal(AfterDeptDetailRequest afterwardsAuditDetail);
 }

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

@@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.medical.common.bo.*;
+import org.jeecg.modules.medical.common.bo.after.response.AfterDeptDetailRequest;
 import org.jeecg.modules.medical.common.bo.after.response.AfterwardsAuditDetailResponse;
 import org.jeecg.modules.medical.common.enums.AfterwardsAuditStatusEnum;
 import org.jeecg.modules.medical.entity.AfterwardsAudit;
@@ -60,26 +61,8 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
     }
 
     @Override
-    public IPage<?> departmentDetailStatistics(Page<AfterwardsAuditDetail> page, AfterwardsAuditDetail afterwardsAuditDetail) {
-        // 1.根据 主表id 和科室编码，获取到科室违规明细的主要信息
-        AfterwardsAudit main = this.getById(afterwardsAuditDetail.getId());
-        if (null == main) {
-            log .error("根据事后统计主表id={},查询不到数据", afterwardsAuditDetail.getId());
-            throw new JeecgBootException("找不到事后数据统计报表数据");
-        }
-        String feedbackResult = main.getFeedbackResult();
-        String feedbackCode = main.getFeedbackCode();
-        IPage<ReportAfterQueryDetailResponseBO> result = baseMapper.departmentDetailStatistics(page, afterwardsAuditDetail);
-        List<ReportAfterQueryDetailResponseBO> records = result.getRecords();
-        if (!CollectionUtils.isEmpty(records)) {
-            records = records.stream().map(item -> {
-                item.setFeedbackCode(feedbackCode);
-                item.setFeedbackResult(feedbackResult);
-                return item;
-            }).collect(Collectors.toList());
-        }
-        result.setRecords(records);
-        return result;
+    public IPage<ReportAfterQueryDetailResponseBO> departmentDetailStatistics(Page<AfterwardsAuditDetail> page, AfterDeptDetailRequest afterwardsAuditDetail) {
+        return baseMapper.departmentDetailStatistics(page, afterwardsAuditDetail);
     }
 
     @Override
@@ -528,4 +511,8 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
         return baseMapper.loadInpatientSettlementMaster(id);
     }
 
+    @Override
+    public BigDecimal statisticsAfterAuditTotal(AfterDeptDetailRequest afterwardsAuditDetail) {
+        return baseMapper.statisticsAfterAuditTotal(afterwardsAuditDetail);
+    }
 }