Merge remote-tracking branch 'origin/master'

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

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -20,10 +21,9 @@ import java.util.Date;
  * @parentProject medical-java
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "违规项目/药品明细响应值")
 public class AuditInfoListResponse extends AfterwardsAuditDetail implements Serializable {
-    @ApiModelProperty(value = "单价")
-    private BigDecimal price;
 
     @Excel(name = "是否医保", width = 15)
     @ApiModelProperty(value = "是否医保，1=是，0=否")
@@ -37,11 +37,6 @@ public class AuditInfoListResponse extends AfterwardsAuditDetail implements Seri
     @ApiModelProperty(value = "异常金额")
     private BigDecimal errorDetailAmt;
 
-    @ApiModelProperty(value = "异常多收")
-    private BigDecimal errorRelativelyManyAmt;
 
-    @ApiModelProperty(value = "异常少收")
-
-    private BigDecimal errorRelativelyFewAmt;
 
 }

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

@@ -0,0 +1,17 @@
+package org.jeecg.modules.medical.common.bo.after.response;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.jeecg.modules.medical.entity.AfterwardsAudit;
+import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
+
+/**
+ * @author yaowei
+ * @time 2023/10/19 00:39 星期四
+ * @description '这里写类描述'
+ * @parentProject medical-java
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AfterwardsAuditDetailResponse extends AfterwardsAuditDetail {
+}

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

@@ -231,14 +231,23 @@ public class ViolationAnalysisController {
         return Result.OK(pageList);
     }
 
-    @ApiOperation(value="事后-全员稽核统计-列表", notes="事后-全员稽核统计-列表")
+    @ApiOperation(value="事后-全员稽核统计-查看申述意见", notes="事后-全员稽核统计-查看申述意见")
     @GetMapping(value = "/after/all/views")
     public Result<?> beforeShowViews(@RequestParam("id") Integer id) {
 //        afterwardsAuditDetailService.showViewById(id);
-        return Result.OK();
+        return Result.OK("暂无申述意见");
+    }
+
+    @ApiOperation(value="事后-全员稽核统计-查看审查明细", notes="事后-全员稽核统计-查看审查明细")
+    @GetMapping(value = "/after/all/detail")
+    public Result<MidAuditDetailResponse> afterAllDetail(@RequestParam(name = "detailId") Integer detailId) {
+        MidAuditDetailResponse result = violationAnalysisService.afterAllDetail(detailId);
+        return Result.OK(result);
     }
 
 
+
+
     @ApiOperation(value="事后-科室统计-列表", notes="事后-科室统计,事后-科室稽核统计")
     @GetMapping(value = "/after/group/department")
     public Result<IPage<ReportAfterQueryResponseBO>> afterDepartment(AfterwardsAudit afterwardsAudit,

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

@@ -43,6 +43,14 @@ public class AfterwardsAuditDetail implements Serializable {
 	@Excel(name = "金额", width = 15)
     @ApiModelProperty(value = "金额")
     private BigDecimal amount;
+
+    @ApiModelProperty(value = "金额")
+    private BigDecimal price;
+
+
+    @ApiModelProperty(value = "医保标志;0:不是医保 1:是医保")
+    private String  medicalInsuranceMark;
+
 	@Excel(name = "医保规则ID", width = 15)
     @ApiModelProperty(value = "医保规则ID")
     private java.lang.Integer medicalInsRuleInfoId;
@@ -117,7 +125,15 @@ public class AfterwardsAuditDetail implements Serializable {
 
     @Excel(name = "数量", width = 13)
     @ApiModelProperty(value = "数量")
-    private BigDecimal quantity;
+    private Integer quantity;
+
+    @ApiModelProperty(value = "异常多收")
+    private BigDecimal errorRelativelyManyAmt;
+
+    @ApiModelProperty(value = "异常少收")
+
+    private BigDecimal errorRelativelyFewAmt;
+
     /**项目编码*/
     @Excel(name = "医保项目编码", width = 15)
     @ApiModelProperty(value = "医保项目编码")

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

@@ -143,6 +143,12 @@ public class MidIncidentAuditDetail implements Serializable {
     @Excel(name = "价格;单价，必须使用数值型，如”12.5”", width = 15)
     @ApiModelProperty(value = "价格;单价，必须使用数值型，如”12.5”")
     private java.math.BigDecimal price;
+
+    private BigDecimal errorRelativelyManyAmt;
+    private BigDecimal errorRelativelyFewAmt;
+
+
+
     /**数量;数量，必须使用数值型，如”10”*/
     @Excel(name = "数量;数量，必须使用数值型，如”10”", width = 15)
     @ApiModelProperty(value = "数量;数量，必须使用数值型，如”10”")

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

@@ -3,6 +3,7 @@ package org.jeecg.modules.medical.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.medical.common.bo.before.PatientInformationResponse;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -14,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface AfterwardsAuditDetailMapper extends BaseMapper<AfterwardsAuditDetail> {
 
+    PatientInformationResponse loadPatientInfoById(@Param("id") String id);
 }

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

@@ -2,4 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.medical.mapper.AfterwardsAuditDetailMapper">
 
+    <select id="loadPatientInfoById"
+            resultType="org.jeecg.modules.medical.common.bo.before.PatientInformationResponse">
+        SELECT
+            ad.patient_id AS patientId, -- 患者编码
+            p.patient_name AS patientName, -- 患者姓名
+            p.gender AS gender, -- 性别
+            p.birthday AS birthday, -- 生日
+            "" AS age, -- 年龄
+            "" AS medicalInsurance, -- 是否医保(从主表查询）
+            ad.visit_time AS visitDate, -- 就诊日期
+            "" AS visitSerialNumber, -- 就诊流水号（从主表查询）
+            ad.medical_dept_name AS medicalDeptName, -- 科室名称
+            ad.medical_dept_code AS medicalDeptCode -- 科室编码
+                ,ad.treatment_type as treatmentType -- 就诊类型
+        FROM afterwards_audit as ad
+                 LEFT JOIN his_patient as p on ad.patient_id = p.patient_no
+        WHERE ad.id = #{id}
+    </select>
 </mapper>

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

@@ -1,5 +1,7 @@
 package org.jeecg.modules.medical.service;
 
+import org.jeecg.modules.medical.common.bo.after.response.AfterwardsAuditDetailResponse;
+import org.jeecg.modules.medical.common.bo.before.PatientInformationResponse;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -11,4 +13,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IAfterwardsAuditDetailService extends IService<AfterwardsAuditDetail> {
 
+    AfterwardsAuditDetailResponse afterAllDetail(Integer detailId);
+
+    /**
+     * 构建患者信息
+     * @param afterwardsAuditId
+     * @param afterwardsAuditService
+     * @return
+     */
+    PatientInformationResponse loadPatientInfoById(String afterwardsAuditId, IAfterwardsAuditService afterwardsAuditService);
 }

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

@@ -5,6 +5,7 @@ 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.AfterwardsAuditDetailResponse;
 import org.jeecg.modules.medical.entity.AfterwardsAudit;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
@@ -106,4 +107,5 @@ public interface IAfterwardsAuditService extends IService<AfterwardsAudit> {
      * @return
      */
     List<InpatientSettlementMasterResponse> loadInpatientSettlementMaster(Integer id);
+
 }

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

@@ -49,4 +49,6 @@ public interface IViolationAnalysisService {
 
     MidAuditDetailResponse beforeAuditDetail(Integer detailId);
     IPage<MidAuditDetailResponse> midViolateRuleTypePageList(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/AfterwardsAuditDetailServiceImpl.java

@@ -1,11 +1,31 @@
 package org.jeecg.modules.medical.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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.PatientInformationResponse;
+import org.jeecg.modules.medical.entity.AfterwardsAudit;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
+import org.jeecg.modules.medical.entity.MidIncidentAudit;
+import org.jeecg.modules.medical.entity.MidIncidentAuditDetail;
 import org.jeecg.modules.medical.mapper.AfterwardsAuditDetailMapper;
 import org.jeecg.modules.medical.service.IAfterwardsAuditDetailService;
+import org.jeecg.modules.medical.service.IAfterwardsAuditService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.util.CollectionUtils;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+import java.util.Date;
+import java.util.List;
 
 /**
  * @Description: afterwards_audit_detail
@@ -13,7 +33,53 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @Date:   2023-05-09 14:36:49
  * @Version: V1.0
  */
+@Slf4j
 @Service
 public class AfterwardsAuditDetailServiceImpl extends ServiceImpl<AfterwardsAuditDetailMapper, AfterwardsAuditDetail> implements IAfterwardsAuditDetailService {
 
+    @Override
+    public AfterwardsAuditDetailResponse afterAllDetail(Integer detailId) {
+        AfterwardsAuditDetail one = getById(detailId);
+        AfterwardsAuditDetailResponse r = new AfterwardsAuditDetailResponse();
+        BeanUtils.copyProperties(one, r);
+        return r;
+    }
+
+    @Override
+    public PatientInformationResponse loadPatientInfoById(String id, IAfterwardsAuditService afterwardsAuditService) {
+        AfterwardsAudit afterwardsAudit = afterwardsAuditService.getById(id);
+        if (afterwardsAudit == null) {
+            log.error("找不到事前工单id={}", id);
+            throw new JeecgBootException("找不到工单id");
+        }
+        PatientInformationResponse result = baseMapper.loadPatientInfoById(id);
+        if (null != result) {
+            //查一次就诊流水号
+            List<AfterwardsAuditDetail> detailList = loadDetailList(id);//baseMapper.loadAdvanceWarningAuditDetail(id);
+            if (!CollectionUtils.isEmpty(detailList)) {
+                AfterwardsAuditDetail advanceWarningAuditDetail = detailList.get(0);
+                String outpatientNumber = advanceWarningAuditDetail.getOutpatientNumber();
+                result.setVisitSerialNumber(outpatientNumber);
+                result.setMedicalInsurance(advanceWarningAuditDetail.getMedicalInsuranceMark());
+            }
+            //计算患者年龄
+            Date birthday = result.getBirthday();
+            if (null != birthday) {
+
+                Instant instant = birthday.toInstant();
+                LocalDate usageLocalDate = instant.atZone(ZoneId.systemDefault()).toLocalDate();
+                LocalDate now = LocalDate.now();
+                // 获取两个日期天数相差
+                long until = usageLocalDate.until(now, ChronoUnit.YEARS) + 1;
+                result.setAge(String.valueOf(until));
+            }
+        }
+        return result;
+    }
+
+    private List<AfterwardsAuditDetail> loadDetailList(String id) {
+        LambdaQueryWrapper<AfterwardsAuditDetail> queryWrapper = Wrappers.<AfterwardsAuditDetail>lambdaQuery()
+                .eq(AfterwardsAuditDetail::getAfterwardsAuditId, id);
+        return this.list(queryWrapper);
+    }
 }

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.AfterwardsAuditDetailResponse;
 import org.jeecg.modules.medical.common.enums.AfterwardsAuditStatusEnum;
 import org.jeecg.modules.medical.entity.AfterwardsAudit;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
@@ -526,4 +527,5 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
     public List<InpatientSettlementMasterResponse> loadInpatientSettlementMaster(Integer id) {
         return baseMapper.loadInpatientSettlementMaster(id);
     }
+
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.medical.common.bo.after.response.AfterwardsAuditDetailResponse;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.medical.common.bo.before.AuditAdvanceWarningAuditDetailResponse;
 import org.jeecg.modules.medical.common.bo.before.PatientInformationResponse;
@@ -14,6 +15,7 @@ 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.*;
 import org.jeecg.modules.medical.entity.AdvanceWarningAuditDetail;
+import org.jeecg.modules.medical.service.*;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
 import org.jeecg.modules.medical.service.*;
 import org.springframework.beans.BeanUtils;
@@ -46,6 +48,13 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
     @Autowired
     private IAdvanceWarningAuditService advanceWarningAuditService;
 
+    /** 事后服务 */
+    @Autowired
+    private IAfterwardsAuditService afterwardsAuditService;
+    @Autowired
+    private IAfterwardsAuditDetailService afterwardsAuditDetailService;
+
+
     @Override
     public IPage<AuditAdvanceWarningAuditDetailResponse> loadBeforeList(AuditAdvanceWarningAuditDetailResponse advanceWarningAuditDetail, Integer pageNo, Integer pageSize, Map<String, String[]> parameterMap) {
         IPage<AuditAdvanceWarningAuditDetailResponse> resultPage = new Page<>(pageNo, pageSize);
@@ -216,6 +225,62 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
     }
 
 //    @Override
+    @Override
+    public MidAuditDetailResponse afterAllDetail(Integer detailId) {
+        MidAuditDetailResponse result = new MidAuditDetailResponse();
+
+
+        AfterwardsAuditDetailResponse detailInfo = afterwardsAuditDetailService.afterAllDetail(detailId);
+
+//        detailInfo = midIncidentAuditService.loadViolationDetail(detailId);
+        if (detailInfo == null) {
+            log.error("找不到审查记录");
+            throw new JeecgBootException("找不到审查记录");
+        }
+        result.setDescription(detailInfo.getDescription());
+        result.setViolationLevel(detailInfo.getReminderLevel());
+        result.setMedicalInsRuleInfoCode(detailInfo.getMedicalInsRuleInfoCode());
+        // 构建违规项目/药品明细
+        ViolationsProjectMedicinesDetail v = new ViolationsProjectMedicinesDetail();
+        v.setMedicalProjectCode(detailInfo.getMedicalInsRuleInfoCode());
+        v.setMedicalProjectName(detailInfo.getMedicalInsRuleInfoName());
+        v.setMedicalInsuranceMark(detailInfo.getMedicalInsuranceMark());
+        v.setPrice(detailInfo.getPrice());
+        v.setMedicalNumber(detailInfo.getQuantity());
+        // 处理异常多收，少收
+//        BigDecimal detailTotalAmt = midIncidentAuditService.statissticsErrAmtByMidAuditRecordId(detailId);
+
+        v.setErrorRelativelyFewAmt(new BigDecimal("0.00"));
+        v.setErrorRelativelyManyAmt(new BigDecimal("0.00"));
+        /*if (null != detailTotalAmt) {
+            if (detailTotalAmt.compareTo(BigDecimal.ZERO) > 0) { // 异常金额大于0，就是多收
+                v.setErrorRelativelyManyAmt(detailTotalAmt);
+            } else if (detailTotalAmt.compareTo(BigDecimal.ZERO) < 0) {
+                v.setErrorRelativelyFewAmt(detailTotalAmt);
+            }
+        }*/
+        List<ViolationsProjectMedicinesDetail> violationsProjectMedicinesDetails = new ArrayList<>();
+        violationsProjectMedicinesDetails.add(v);
+        result.setLists(violationsProjectMedicinesDetails);
+        PatientInformationResponse patientInformationResponse = afterwardsAuditDetailService.loadPatientInfoById(detailInfo.getAfterwardsAuditId().toString(), afterwardsAuditService);
+        // 构建患者信息
+//        PatientInformationResponse patientInformationResponse =
+//                midIncidentAuditDetailService.loadPatientInfoById(detailInfo.getMidIncidentAuditId().toString(), midIncidentAuditService);
+        result.setPatientInfo(patientInformationResponse);
+        // 构建医生信息
+        MidAuditDoctorInfo midAuditDoctorInfo = new MidAuditDoctorInfo();
+        midAuditDoctorInfo.setMedicalDeptCode(detailInfo.getMedicalDeptCode());
+        midAuditDoctorInfo.setMedicalDeptName(detailInfo.getMedicalDeptName());
+        midAuditDoctorInfo.setDoctorId(detailInfo.getDoctorId());
+        midAuditDoctorInfo.setDoctorName(detailInfo.getDoctorName());
+        midAuditDoctorInfo.setFeedbackResult("无");
+        result.setDoctorInfo(midAuditDoctorInfo);
+
+
+        return result;
+    }
+
+    //    @Override
 //    public IPage<AfterwardsAuditDetail> allAuditPage(AuditMidDetailListRequest request, Integer pageNo, Integer pageSize, Map<String, String[]> parameterMap) {
 //        Page<AfterwardsAuditDetail> page = new Page<>(pageNo, pageSize);
 //        IPage<AfterwardsAuditDetail> resultPage = midIncidentAuditService.page(page, request);