add： 科室审核医生面板获取

增加科室医生申诉表

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

@@ -0,0 +1,30 @@
+package org.jeecg.modules.medical.common.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author soft01
+ * @time 2023/5/25 22:54
+ * @description '科室审核响应Item'
+ * @parentProject medical-java
+ */
+@Data
+@ApiModel(value = "科室审核响应")
+public class DeptAuditItemResponse implements Serializable {
+
+    @ApiModelProperty(value = "医生编码")
+    private String doctorId;
+    @ApiModelProperty(value = "医生名称")
+    private String doctorName;
+    @ApiModelProperty(value = "科室编码")
+    private String medicalDeptCode;
+    @ApiModelProperty(value = "科室名称")
+    private String medicalDeptName;
+    @ApiModelProperty(value = "待处理违规数")
+    private Integer errNum;
+
+}

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

@@ -0,0 +1,23 @@
+package org.jeecg.modules.medical.common.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author soft01
+ * @time 2023/5/25 22:53
+ * @description '违规医生科室面板'
+ * @parentProject medical-java
+ */
+@Data
+@ApiModel(value = "违规医生科室面板")
+public class DeptAuditResponse implements Serializable {
+    @ApiModelProperty(value = "违规医生列表")
+    private List<DeptAuditItemResponse> deptDoctorViolationList;
+    @ApiModelProperty(value = "科室其他未违规医生列表")
+    private List<DeptAuditItemResponse> allDeptDoctorList;
+}

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

@@ -4,6 +4,7 @@ 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;
@@ -16,6 +17,7 @@ import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.medical.common.bo.AuditRequestBO;
+import org.jeecg.modules.medical.common.bo.DeptAuditResponse;
 import org.jeecg.modules.medical.common.bo.ReportAfterQueryResponseBO;
 import org.jeecg.modules.medical.entity.AfterwardsAudit;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
@@ -55,7 +57,7 @@ public class AfterwardsAuditController extends JeecgController<AfterwardsAudit,
 		 return Result.OK(pageList);
 	 }
 
-	 @ApiOperation(value = "发起审核", notes = "发起审核")
+	 @ApiOperation(value = "审核端-发起审核", notes = "审核端-发起审核")
 	 @PostMapping(value = "/audit")
 	 public Result<String> audit(HttpServletRequest request, @RequestBody @Valid AuditRequestBO param) {
 		 String loginUserName = JwtUtil.getUserNameByToken(request);
@@ -67,6 +69,24 @@ public class AfterwardsAuditController extends JeecgController<AfterwardsAudit,
 		 return Result.ok("提交成功");
 	 }
 
+	 @ApiOperation(value = "科室端，医生违规面板", notes = "科室端，医生违规面板")
+	 @GetMapping(value = "/dept/panel/list")
+	 public Result<DeptAuditResponse> deptAuditPanel(HttpServletRequest request) {
+	 	// 获取当前登录的人，并获取到他的科室
+	 	String loginUserName = JwtUtil.getUserNameByToken(request);
+	 	DeptAuditResponse result = afterwardsAuditService.deptAuditPanel(loginUserName);
+	 	return Result.OK("获取成功", result);
+	 }
+
+	 @ApiModelProperty(value = "科室端，复核", notes = "科室端，复核")
+	 @PostMapping(value = "/dept/audit")
+	 public Result<?> deptAudit(HttpServletRequest request, @RequestBody @Valid AuditRequestBO param) {
+		 // 获取当前登录的人，并获取到他的科室
+		 String loginUserName = JwtUtil.getUserNameByToken(request);
+		 boolean result = afterwardsAuditService.deptAudit(loginUserName, param);
+		 return Result.OK("请求成功");
+	 }
+
 	/**
 	 * 分页列表查询
 	 *

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

@@ -0,0 +1,87 @@
+package org.jeecg.modules.medical.entity;
+
+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 lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: medical_doctor_appeal_record
+ * @Author: jeecg-boot
+ * @Date:   2023-05-26 00:17:04
+ * @Version: V1.0
+ */
+@Data
+@TableName("medical_doctor_appeal_record")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="medical_doctor_appeal_record对象", description="科室申诉资料记录表")
+public class MedicalDoctorAppealRecord implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键为自增，后续好排序*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键为自增，后续好排序")
+    private Integer id;
+	/**createTime*/
+	@JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "createTime")
+    private Date createTime;
+	/**createBy*/
+    @ApiModelProperty(value = "createBy")
+    private String createBy;
+	/**updateTime*/
+	@JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "updateTime")
+    private Date updateTime;
+	/**updateBy*/
+    @ApiModelProperty(value = "updateBy")
+    private String updateBy;
+	/**科室编码*/
+	@Excel(name = "科室编码", width = 15)
+    @ApiModelProperty(value = "科室编码")
+    private String medicalDeptCode;
+	/**科室名称*/
+	@Excel(name = "科室名称", width = 15)
+    @ApiModelProperty(value = "科室名称")
+    private String medicalDeptName;
+	/**医生编码*/
+	@Excel(name = "医生编码", width = 15)
+    @ApiModelProperty(value = "医生编码")
+    private String doctorId;
+	/**医生名称*/
+	@Excel(name = "医生名称", width = 15)
+    @ApiModelProperty(value = "医生名称")
+    private String doctorName;
+	/**事后工单id*/
+	@Excel(name = "事后工单id", width = 15)
+    @ApiModelProperty(value = "事后工单id")
+    private String afterwardsAuditId;
+	/**申诉次数*/
+	@Excel(name = "申诉次数", width = 15)
+    @ApiModelProperty(value = "申诉次数")
+    private Integer appealNumber;
+	/**申诉理由*/
+	@Excel(name = "申诉理由", width = 15)
+    @ApiModelProperty(value = "申诉理由")
+    private String description;
+	/**申诉照片组*/
+	@Excel(name = "申诉照片组", width = 15)
+    @ApiModelProperty(value = "申诉照片组")
+    private String imgPath;
+}

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

@@ -6,11 +6,14 @@ 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.DeptAuditItemResponse;
+import org.jeecg.modules.medical.common.bo.DeptAuditResponse;
 import org.jeecg.modules.medical.common.bo.ReportAfterQueryDetailResponseBO;
 import org.jeecg.modules.medical.common.bo.ReportAfterQueryResponseBO;
 import org.jeecg.modules.medical.entity.AfterwardsAudit;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
+import org.jeecg.modules.system.entity.SysDepart;
 
 /**
  * @Description: afterwards_audit
@@ -40,4 +43,15 @@ public interface AfterwardsAuditMapper extends BaseMapper<AfterwardsAudit> {
      * @return
      */
     BigDecimal statisticsErrAmtByAfterwareRecordId(Integer id);
+
+    SysDepart loadUserDept(@Param("loginUserName") String loginUserName);
+
+    /**
+     * 获取违规医生面板
+     * @param medicalDeptCode
+     * @return
+     */
+    List<DeptAuditItemResponse> loadDeptDoctorViolationList(@Param("medicalDeptCode") String medicalDeptCode);
+
+    List<DeptAuditItemResponse> loadDeptDoctorList(@Param("loginUserName") String loginUserName);
 }

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

@@ -0,0 +1,17 @@
+package org.jeecg.modules.medical.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.medical.entity.MedicalDoctorAppealRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: medical_doctor_appeal_record
+ * @Author: jeecg-boot
+ * @Date:   2023-05-26 00:17:04
+ * @Version: V1.0
+ */
+public interface MedicalDoctorAppealRecordMapper extends BaseMapper<MedicalDoctorAppealRecord> {
+
+}

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

@@ -136,4 +136,38 @@
                       left JOIN diagnosis_treatment as d on t.proejct_code = d.project_code AND t.project_type = 'diagnoses'
              WHERE t.afterwards_audit_id = #{id,jdbcType=INTEGER}) as tdetail
     </select>
+
+    <select id="loadUserDept" resultType="org.jeecg.modules.system.entity.SysDepart">
+        SELECT
+            d.*
+        FROM sys_user as u
+                 LEFT JOIN sys_user_depart as dm on u.id = dm.user_id
+                 left JOIN sys_depart as d on d.id = dm.dep_id
+        WHERE username = #{loginUserName,jdbcType=VARCHAR}
+    </select>
+
+    <!-- 获取违规科室 -->
+    <select id="loadDeptDoctorViolationList" resultType="org.jeecg.modules.medical.common.bo.DeptAuditItemResponse">
+        SELECT any_value (doctor_id) as doctorId,
+               any_value (doctor_name) as doctorName,
+               any_value (medical_dept_name) as medicalDeptName,
+               any_value (medical_dept_code) as medicalDeptCode,
+               count(*) as errNum
+        FROM afterwards_audit
+        WHERE
+            medical_dept_code = #{medicalDeptCode,jdbcType=VARCHAR}
+            AND check_state = 'issue_review'
+            GROUP BY doctor_id
+    </select>
+    <!-- 获取科室下的医生 -->
+    <select id="loadDeptDoctorList" resultType="org.jeecg.modules.medical.common.bo.DeptAuditItemResponse">
+        SELECT
+            dm.dep_id as medicalDeptCode,
+            u.doctor_id as doctorId,
+            u.realname as doctorName
+        FROM sys_user as u
+                 LEFT JOIN sys_user_depart as dm on u.id = dm.user_id
+        WHERE username = #{loginUserName,jdbcType=VARCHAR}
+
+    </select>
 </mapper>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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.MedicalDoctorAppealRecordMapper">
+
+</mapper>

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.AuditRequestBO;
+import org.jeecg.modules.medical.common.bo.DeptAuditResponse;
 import org.jeecg.modules.medical.common.bo.ReportAfterQueryResponseBO;
 import org.jeecg.modules.medical.entity.AfterwardsAudit;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -37,4 +38,14 @@ public interface IAfterwardsAuditService extends IService<AfterwardsAudit> {
     IPage<AfterwardsAudit> auditQueryListPage(Page<AfterwardsAudit> page, QueryWrapper<AfterwardsAudit> queryWrapper);
 
     boolean audit(String loginUserName, AuditRequestBO param);
+
+    DeptAuditResponse deptAuditPanel(String loginUserName);
+
+    /**
+     * 科室端，复核
+     * @param loginUserName
+     * @param param
+     * @return
+     */
+    boolean deptAudit(String loginUserName, AuditRequestBO param);
 }

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.medical.service;
+
+import org.jeecg.modules.medical.entity.MedicalDoctorAppealRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 科室申诉资料记录表
+ * @Author: jeecg-boot
+ * @Date:   2023-05-26 00:17:04
+ * @Version: V1.0
+ */
+public interface IMedicalDoctorAppealRecordService extends IService<MedicalDoctorAppealRecord> {
+
+}

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

@@ -10,13 +10,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.checkerframework.checker.units.qual.A;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.medical.common.bo.AuditRequestBO;
-import org.jeecg.modules.medical.common.bo.ReportAfterQueryDetailResponseBO;
-import org.jeecg.modules.medical.common.bo.ReportAfterQueryResponseBO;
+import org.jeecg.modules.medical.common.bo.*;
 import org.jeecg.modules.medical.entity.AfterwardsAudit;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
 import org.jeecg.modules.medical.mapper.AfterwardsAuditMapper;
 import org.jeecg.modules.medical.service.IAfterwardsAuditService;
+import org.jeecg.modules.system.entity.SysDepart;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -26,8 +25,10 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -145,4 +146,34 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
         this.saveOrUpdate(a);
         return true;
     }
+
+    @Override
+    public DeptAuditResponse deptAuditPanel(String loginUserName) {
+        // 根据当前登录，先获取到医生面板
+        SysDepart sysDepart = baseMapper.loadUserDept(loginUserName);
+        if (null == sysDepart) {
+            log.error("找不到当前医生的科室，请检查");
+            throw new JeecgBootException("找不到当前医生的科室，请检查");
+        }
+        // 获取违规医生列表
+        List<DeptAuditItemResponse> deptDoctorViolationList = baseMapper.loadDeptDoctorViolationList(sysDepart.getMedicalDeptCode());
+        // 获取该科室的医生面板
+        List<DeptAuditItemResponse> deptDoctorList = baseMapper.loadDeptDoctorList(loginUserName);
+        List<DeptAuditItemResponse> allDeptDoctorList = new ArrayList<>();
+        // 下半部分要扣除掉违规的医生列表
+        if (!CollectionUtils.isEmpty(deptDoctorList) && !CollectionUtils.isEmpty(deptDoctorViolationList)) {
+            allDeptDoctorList = deptDoctorList.stream().filter(allDoctor -> deptDoctorViolationList.stream().map(DeptAuditItemResponse::getDoctorId)
+                    .noneMatch(id -> Objects.equals(allDoctor.getDoctorId(), id))).collect(Collectors.toList());
+        }
+
+        DeptAuditResponse result = new DeptAuditResponse();
+        result.setDeptDoctorViolationList(deptDoctorViolationList);
+        result.setAllDeptDoctorList(allDeptDoctorList);
+        return result;
+    }
+
+    @Override
+    public boolean deptAudit(String loginUserName, AuditRequestBO param) {
+        return false;
+    }
 }

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.medical.service.impl;
+
+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;
+
+/**
+ * @Description: 科室申诉资料记录表
+ * @Author: jeecg-boot
+ * @Date:   2023-05-26 00:17:04
+ * @Version: V1.0
+ */
+@Service
+public class MedicalDoctorAppealRecordServiceImpl extends ServiceImpl<MedicalDoctorAppealRecordMapper, MedicalDoctorAppealRecord> implements IMedicalDoctorAppealRecordService {
+
+}

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
@@ -18,7 +19,7 @@ import java.util.Objects;
  * <p>
  * 部门表
  * <p>
- * 
+ *
  * @Author Steve
  * @Since  2019-01-22
  */
@@ -26,7 +27,7 @@ import java.util.Objects;
 @TableName("sys_depart")
 public class SysDepart implements Serializable {
     private static final long serialVersionUID = 1L;
-    
+
 	/**ID*/
 	@TableId(type = IdType.ASSIGN_ID)
 	private String id;
@@ -35,6 +36,10 @@ public class SysDepart implements Serializable {
 	/**机构/部门名称*/
 	@Excel(name="机构/部门名称",width=15)
 	private String departName;
+
+	@ApiModelProperty(value = "科室编码")
+	private String medicalDeptCode;
+
 	/**英文名*/
 	@Excel(name="英文名",width=15)
 	private String departNameEn;
@@ -100,7 +105,7 @@ public class SysDepart implements Serializable {
 	@TableField(exist = false)
     private String oldDirectorUserIds;
     //update-end---author:wangshuai ---date:20200308  for：[JTC-119]新增字段负责人ids和旧的负责人ids
-	
+
 	/**
 	 * 重写equals方法
 	 */
@@ -144,9 +149,9 @@ public class SysDepart implements Serializable {
      */
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), id, parentId, departName, 
-        		departNameEn, departNameAbbr, departOrder, description,orgCategory, 
-        		orgType, orgCode, mobile, fax, address, memo, status, 
+        return Objects.hash(super.hashCode(), id, parentId, departName,
+        		departNameEn, departNameAbbr, departOrder, description,orgCategory,
+        		orgType, orgCode, mobile, fax, address, memo, status,
         		delFlag, createBy, createTime, updateBy, updateTime, tenantId);
     }
 }