add: 新增-科室复核历史记录

fix： 修复科室复核状态入参的bug

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

@@ -28,7 +28,7 @@ public class DeptAuditRequestBO extends AuditRequestBO{
     @ApiModelProperty(value = "审核照片组，中间用逗号分割")
     private String imgPaths;
 
-    @NotBlank(message = "审核状态不可为空")
-    @ApiModelProperty(value = "审核状态：appeal=申诉；agree_audit=同意审核结果")
-    protected String checkState;
+//    @NotBlank(message = "审核状态不可为空")
+//    @ApiModelProperty(value = "审核状态：appeal=申诉；agree_audit=同意审核结果")
+//    private String checkState;
 }

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
@@ -19,6 +18,7 @@ import org.jeecg.modules.medical.common.bo.*;
 import org.jeecg.modules.medical.common.enums.AfterwardsAuditStatusEnum;
 import org.jeecg.modules.medical.entity.AfterwardsAudit;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
+import org.jeecg.modules.medical.entity.MedicalDoctorAppealRecord;
 import org.jeecg.modules.medical.service.IAfterwardsAuditService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -171,6 +171,19 @@ public class AfterwardsAuditController extends JeecgController<AfterwardsAudit,
 		 return Result.OK("请求成功");
 	 }
 
+	 @ApiOperation(value = "科室端，查看复核记录", notes = "科室端-查看复核记录")
+	 @GetMapping(value = "/appeal/record/list")
+	 public Result<List<MedicalDoctorAppealRecord>> loadAppeal(Integer id) {
+		 LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 if (null == loginUser) {
+			 log.error("当前用户未登录");
+			 throw new JeecgBootException("用户未登录"); // "登录已过期，请重新登录"
+		 }
+		 List<MedicalDoctorAppealRecord> record = afterwardsAuditService.loadAppealRecord(id, loginUser);
+		 return Result.OK(record);
+	 }
+
+
 	/**
 	 * 分页列表查询
 	 *

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

@@ -184,7 +184,9 @@
             ad.medical_insurance as medicalInsurance,
             ad.doctor_name as doctorName,
             ad.medical_dept_name as medicalDeptName,
-            ad.`status` as status
+            ad.`status` as status,
+            ad.medical_dept_code,
+            ad.doctor_id
         FROM afterwards_audit as ad
                  LEFT JOIN his_patient as his on ad.patient_id = his.patient_no
         WHERE ad.id = #{id,jdbcType=INTEGER};

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

@@ -8,6 +8,7 @@ import org.jeecg.modules.medical.common.bo.*;
 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.util.List;
 
@@ -89,4 +90,12 @@ public interface IAfterwardsAuditService extends IService<AfterwardsAudit> {
      * @return
      */
     InpatientSettlementDetailResponse loadInpatientSettlementDetail(Integer id);
+
+    /**
+     * 根据事后审核工单id， 查询审核申诉记录表
+     * @param id        事后审核工单id
+     * @param loginUser 当前登录用户信息
+     * @return
+     */
+    List<MedicalDoctorAppealRecord> loadAppealRecord(Integer id, LoginUser loginUser);
 }

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

@@ -3,6 +3,8 @@ package org.jeecg.modules.medical.service;
 import org.jeecg.modules.medical.entity.MedicalDoctorAppealRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * @Description: 科室申诉资料记录表
  * @Author: jeecg-boot
@@ -20,4 +22,6 @@ public interface IMedicalDoctorAppealRecordService extends IService<MedicalDocto
      * @return
      */
     MedicalDoctorAppealRecord loadMaxAppealNumber(Integer id, String medicalDeptCode, String doctorId);
+
+    List<MedicalDoctorAppealRecord> loadAppealRecord(Integer id, String medicalDeptCode);
 }

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

@@ -410,4 +410,17 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
         r.setHospitalizationSettleDetailResponse(medicalInsuranceProjects);
         return r;
     }
+
+    @Override
+    public List<MedicalDoctorAppealRecord> loadAppealRecord(Integer id, LoginUser loginUser) {
+        // 根据当前登录，先获取到医生面板
+        SysDepart sysDepart = baseMapper.loadUserDept(loginUser.getUsername());
+        if (null == sysDepart) {
+            log.error("找不到当前医生的科室，请检查");
+            throw new JeecgBootException("找不到当前医生的科室，请检查！");
+        }
+        // 当前登录科室/医生端的科室code
+        String medicalDeptCode = sysDepart.getMedicalDeptCode();
+        return appealRecordService.loadAppealRecord(id, medicalDeptCode);
+    }
 }

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

@@ -1,11 +1,17 @@
 package org.jeecg.modules.medical.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.jeecg.modules.medical.entity.MedicalDoctorAppealRecord;
 import org.jeecg.modules.medical.mapper.MedicalDoctorAppealRecordMapper;
 import org.jeecg.modules.medical.service.IMedicalDoctorAppealRecordService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.util.CollectionUtils;
+
+import javax.imageio.stream.MemoryCacheImageInputStream;
+import java.util.List;
 
 /**
  * @Description: 科室申诉资料记录表
@@ -20,4 +26,16 @@ public class MedicalDoctorAppealRecordServiceImpl extends ServiceImpl<MedicalDoc
     public MedicalDoctorAppealRecord loadMaxAppealNumber(Integer afterwardsAuditId, String medicalDeptCode, String doctorId) {
         return baseMapper.loadMaxAppealNumber(afterwardsAuditId, medicalDeptCode, doctorId);
     }
+
+    @Override
+    public List<MedicalDoctorAppealRecord> loadAppealRecord(Integer id, String medicalDeptCode) {
+        LambdaQueryWrapper<MedicalDoctorAppealRecord> queryWrapper = Wrappers.<MedicalDoctorAppealRecord>lambdaQuery()
+                .eq(MedicalDoctorAppealRecord::getAfterwardsAuditId, id)
+                .eq(MedicalDoctorAppealRecord::getMedicalDeptCode, medicalDeptCode);
+        List<MedicalDoctorAppealRecord> list = this.list(queryWrapper);
+        if (CollectionUtils.isEmpty(list)) {
+            return null;
+        }
+        return list;
+    }
 }