列表查询模块和科室拉取查询，获取当前用户角色id，及审核通过接口修改

src/main/java/com/diagbot/client/MedAppealInfoServiceClient.java

@@ -1,14 +1,8 @@
 package com.diagbot.client;
 
 import com.diagbot.client.hystrix.MedAppealInfoServiceHystrix;
-import com.diagbot.dto.CommonResult;
-import com.diagbot.dto.GetAppealInfoDTO;
-import com.diagbot.dto.GetReviewerDTO;
-import com.diagbot.vo.AddAppealInfoVO;
-import com.diagbot.vo.CancelAppealInfoVO;
-import com.diagbot.vo.GetAppealInfoVO;
-import com.diagbot.vo.GetAppealOperationTypeVO;
-import com.diagbot.vo.GetReviewerVO;
+import com.diagbot.dto.*;
+import com.diagbot.vo.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -42,6 +36,11 @@ public interface MedAppealInfoServiceClient {
     @PostMapping(value = "/report-service/medAppealInfoManage/getAppealInfo")
     CommonResult<GetAppealInfoDTO> getAppealInfo(@RequestBody GetAppealInfoVO getAppealInfoVO);
 
+    @PostMapping(value = "/report-service/medAppealInfoManage/getAppealDept")
+    CommonResult<List<GetAppealDeptDTO>> getAppealDept(@RequestBody GetAppealDeptVo getAppealDeptVo);
+
+    @PostMapping(value = "/report-service/medAppealInfoManage/getAppealMode")
+    CommonResult<List<GetAppealModeDTO>> getAppealMode(@RequestBody GetAppealModeVo getAppealModeVo);
 
 }
 

src/main/java/com/diagbot/client/MedAppealInfoServiceClientFacade.java

@@ -1,14 +1,8 @@
 package com.diagbot.client;
 
-import com.diagbot.dto.CommonResult;
-import com.diagbot.dto.GetAppealInfoDTO;
-import com.diagbot.dto.GetReviewerDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.vo.AddAppealInfoVO;
-import com.diagbot.vo.CancelAppealInfoVO;
-import com.diagbot.vo.GetAppealInfoVO;
-import com.diagbot.vo.GetAppealOperationTypeVO;
-import com.diagbot.vo.GetReviewerVO;
+import com.diagbot.dto.*;
+import com.diagbot.vo.*;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -46,4 +40,13 @@ public class MedAppealInfoServiceClientFacade {
         return CommonResult.tranResp(medAppealInfoServiceClient.getAppealInfo(getAppealInfoVO));
     }
 
+    public RespDTO<List<GetAppealDeptDTO>> getAppealDept(GetAppealDeptVo getAppealDeptVo) {
+        return CommonResult.tranResp(medAppealInfoServiceClient.getAppealDept(getAppealDeptVo));
+    }
+
+
+    public RespDTO<List<GetAppealModeDTO>> getAppealMode(GetAppealModeVo getAppealModeVo) {
+        return CommonResult.tranResp(medAppealInfoServiceClient.getAppealMode(getAppealModeVo));
+    }
+
 }

src/main/java/com/diagbot/client/hystrix/MedAppealInfoServiceHystrix.java

@@ -2,26 +2,12 @@ package com.diagbot.client.hystrix;
 
 
 import com.diagbot.client.MedAppealInfoServiceClient;
-import com.diagbot.client.QcServiceClient;
-import com.diagbot.dto.GetAppealInfoDTO;
-import com.diagbot.dto.GetReviewerDTO;
-import com.diagbot.dto.OutputInfo;
-import com.diagbot.dto.CommonResult;
-import com.diagbot.dto.Response;
-import com.diagbot.entity.WorkFlowInfo;
-import com.diagbot.vo.AddAppealInfoVO;
-import com.diagbot.vo.CancelAppealInfoVO;
-import com.diagbot.vo.GetAppealInfoVO;
-import com.diagbot.vo.GetAppealOperationTypeVO;
-import com.diagbot.vo.GetReviewerVO;
-import com.diagbot.vo.MedAppealInfoVO;
-import com.diagbot.vo.QueryVo;
+import com.diagbot.dto.*;
+import com.diagbot.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
-import java.net.URI;
 import java.util.List;
 import java.util.Map;
 
@@ -63,4 +49,16 @@ public class MedAppealInfoServiceHystrix implements MedAppealInfoServiceClient {
         log.error("【hystrix】调用{}异常", "getAppealInfo");
         return null;
     }
+
+    @Override
+    public CommonResult<List<GetAppealDeptDTO>> getAppealDept(@Valid GetAppealDeptVo getAppealDeptVo) {
+        log.error("【hystrix】调用{}异常", "getAppealDeptVo");
+        return null;
+    }
+
+    @Override
+    public CommonResult<List<GetAppealModeDTO>> getAppealMode(GetAppealModeVo getAppealModeVo) {
+        log.error("【hystrix】调用{}异常", "getAppealModeVo");
+        return null;
+    }
 }

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -285,6 +285,9 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/appealInfo/cancelAppealInfo").permitAll()
                 .antMatchers("/qc/appealInfo/cancelAppealInfoApi").permitAll()
                 .antMatchers("/qc/appealInfo/getAppealInfo").permitAll()
+                .antMatchers("/qc/appealInfo/getAppealDept").permitAll()
+                .antMatchers("/qc/appealInfo/getAppealMode").permitAll()
+                .antMatchers("/qc/appealInfo/getUserRole").permitAll()
                 .antMatchers("/qc/mode/getModes").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -362,6 +362,9 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/appealInfo/cancelAppealInfo", request)
                 || matchers("/qc/appealInfo/cancelAppealInfoApi", request)
                 || matchers("/qc/appealInfo/getAppealInfo", request)
+                || matchers("/qc/appealInfo/getAppealDept", request)
+                || matchers("/qc/appealInfo/getAppealMode", request)
+                || matchers("/qc/appealInfo/getUserRole", request)
                 || matchers("/qc/mode/getModes", request)
                 || matchers("/", request)) {
             return true;

src/main/java/com/diagbot/dto/GetAppealDeptDTO.java

@@ -0,0 +1,20 @@
+package com.diagbot.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 申诉审核科室下拉列表返回对象
+ * @Author songxl
+ */
+@Data
+public class GetAppealDeptDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "科室id")
+    private String deptId;
+
+    @ApiModelProperty(value = "科室名称")
+    private String deptName;
+}

src/main/java/com/diagbot/dto/GetAppealModeDTO.java

@@ -0,0 +1,20 @@
+package com.diagbot.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 申诉审核模块下拉列表返回对象
+ * @Author songxl
+ */
+@Data
+public class GetAppealModeDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "申诉模块id")
+    private Long modeId;
+
+    @ApiModelProperty(value = "模块名称")
+    private String modeName;
+}

src/main/java/com/diagbot/facade/MedAppealExamineInfoManagementFacade.java

@@ -4,7 +4,6 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.client.MedAppealExamineInfoServiceClient;
 import com.diagbot.client.MedAppealExamineInfoServiceClientFacade;
 import com.diagbot.dto.AnalyzeDTO;
 
@@ -50,7 +49,7 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
     @Autowired
     private QcresultDetailFacade qcresultDetailFacade;
     @Autowired
-    private  MedAppealInfoManagementFacade medAppealInfoManagementFacade;
+    private MedAppealInfoManagementFacade medAppealInfoManagementFacade;
     @Autowired
     private QcresultInfoFacade qcresultInfoFacade;
     @Autowired
@@ -58,17 +57,23 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
 
     /**
      * 审核通过
+     *
      * @param approvedVo
      * @return
      */
-    public Boolean approved (ApprovedVo approvedVo) {
+    public Boolean approved(ApprovedVo approvedVo) {
         LocalDateTime dateTime = LocalDateTime.now();
         QcresultVO qcresultVO = new QcresultVO();
         qcresultVO.setBehospitalCode(approvedVo.getBehospitalCode());
         qcresultVO.setHospitalId(approvedVo.getHospitalId());
         QcResultAlgVO qcResultAlgVO = approvedVo.getQcResultAlgVO();
         Long modeId = approvedVo.getModeId();
-        if(modeId!=null){
+        Long casesEntryId = approvedVo.getQcResultAlgVO().getCasesEntryId();
+        if (casesEntryId != null) {
+            QcresultDetail qcresultDetail = getQcresultDetail(approvedVo);
+            approvedVo.setQcresultDetailId(qcresultDetail.getId());
+        }
+        if (modeId != null) {
             QcCasesEntry qcCasesEntry = qcCasesEntryFacade.getOne(new QueryWrapper<QcCasesEntry>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("mode_id", modeId)
@@ -79,13 +84,16 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
         qcresultVO.setOptResultAlgVO(qcResultAlgVO);
         //获取处理方式
         String handling = approvedVo.getExampleOperation();
-        if(StringUtil.isNotEmpty(handling) && handling.equals(ExampleOperationEnum.UP_OR_DEL.getKey())){
+        if (StringUtil.isNotEmpty(handling) && handling.equals(ExampleOperationEnum.UP_OR_DEL.getKey())) {
             QcresultDetail detail = getQcresultDetail(approvedVo);
+            if (detail == null) {
+                throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "该条目不存在,请走驳回流程!");
+            }
             //调用删除接口
             qcresultVO.setDelStatus(0);
             qcresultVO.setType(4);
             AnalyzeDTO analyzeDTORespDTO = qcresultInfoFacade.changeQcResult(qcresultVO);
-            if(analyzeDTORespDTO.getIsSuccess()){
+            if (analyzeDTORespDTO.getIsSuccess()) {
                 approvedVo.setQcresultDetailId(detail.getId());
                 Boolean appealInfo = updateAppealInfo(approvedVo);
                 MedAppealExamineInfo medAppealExamineInfo = new MedAppealExamineInfo();
@@ -98,21 +106,24 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
                         .eq("appeal_info_id", approvedVo.getId())
                         .eq("check_id", approvedVo.getAppealId())
                 );
-                if(appealInfo && update){
-                    return  true;
-                }else {
+                if (appealInfo && update) {
+                    return true;
+                } else {
                     throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "审核通过失败!");
                 }
-            }else {
+            } else {
                 throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "删除失败!");
             }
         }
-        if(StringUtil.isNotEmpty(handling) && handling.equals(ExampleOperationEnum.UP_OR_UP.getKey())){
+        if (StringUtil.isNotEmpty(handling) && handling.equals(ExampleOperationEnum.UP_OR_UP.getKey())) {
             QcresultDetail detail = getQcresultDetail(approvedVo);
+            if (detail == null) {
+                throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "该条目不存在，请走驳回流程!");
+            }
             //调用修改接口
             qcresultVO.setType(3);
             AnalyzeDTO analyzeDTORespDTO = qcresultInfoFacade.changeQcResult(qcresultVO);
-            if(analyzeDTORespDTO.getIsSuccess()){
+            if (analyzeDTORespDTO.getIsSuccess()) {
                 approvedVo.setQcresultDetailId(detail.getId());
                 Boolean appealInfo = updateAppealInfo(approvedVo);
                 MedAppealExamineInfo medAppealExamineInfo = new MedAppealExamineInfo();
@@ -125,31 +136,26 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
                         .eq("appeal_info_id", approvedVo.getId())
                         .eq("check_id", approvedVo.getAppealId())
                 );
-                if(appealInfo && update){
-                    return  true;
-                }else {
+                if (appealInfo && update) {
+                    return true;
+                } else {
                     throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "审核通过失败!");
                 }
-            }else {
+            } else {
                 throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "修改失败!");
             }
         }
-        if(StringUtil.isNotEmpty(handling) && handling.equals(ExampleOperationEnum.ADD_EXIST.getKey())){
+        if (StringUtil.isNotEmpty(handling) && handling.equals(ExampleOperationEnum.ADD_EXIST.getKey())) {
             //判断是否已存在该条目
-            QcresultDetail qcresultDetail = qcresultDetailFacade.getOne(new QueryWrapper<QcresultDetail>()
-                    .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("hospital_id", approvedVo.getHospitalId())
-                    .eq("behospital_code", approvedVo.getBehospitalCode())
-                    .eq("cases_entry_id", qcResultAlgVO.getCasesEntryId())
-            );
-            if(qcresultDetail!=null){
+            QcresultDetail qcresultDetail = getQcresultDetail(approvedVo);
+            if (qcresultDetail != null) {
                 throw new CommonException(CommonErrorCode.IS_EXISTS, "该条目已存在!");
             }
             //调用新增接口
             qcresultVO.setType(1);
 
             AnalyzeDTO analyzeDTORespDTO = qcresultInfoFacade.changeQcResult(qcresultVO);
-            if(analyzeDTORespDTO.getIsSuccess()){
+            if (analyzeDTORespDTO.getIsSuccess()) {
                 QcresultDetail detail = getQcresultDetail(approvedVo);
                 MedAppealInfo medAppealInfo = new MedAppealInfo();
                 medAppealInfo.setQcresultDetailId(detail.getId());
@@ -170,27 +176,30 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
                         .eq("appeal_info_id", approvedVo.getId())
                         .eq("check_id", approvedVo.getAppealId())
                 );
-                if(update && update1){
-                    return  true;
-                }else {
+                if (update && update1) {
+                    return true;
+                } else {
                     throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "审核通过失败!");
                 }
-            }else {
+            } else {
                 throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "新增失败!");
             }
         }
-        if(StringUtil.isNotEmpty(handling) && handling.equals(ExampleOperationEnum.RECOVER.getKey())){
+        if (StringUtil.isNotEmpty(handling) && handling.equals(ExampleOperationEnum.RECOVER.getKey())) {
             qcresultVO.setType(4);
             qcresultVO.setDelStatus(1);
             //调用删除恢复接口
+            QcresultDetail qcresultDetail = qcresultDetailFacade.getOne(new QueryWrapper<QcresultDetail>()
+                    .eq("hospital_id", approvedVo.getHospitalId())
+                    .eq("behospital_code", approvedVo.getBehospitalCode())
+                    .eq("cases_entry_id", approvedVo.getQcResultAlgVO().getCasesEntryId())
+                    .eq("grade_type", 2)
+            );
+            if (qcresultDetail == null) {
+                throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "该条目不存在，请走驳回流程!");
+            }
             AnalyzeDTO analyzeDTORespDTO = qcresultInfoFacade.changeQcResult(qcresultVO);
-            if(analyzeDTORespDTO.getIsSuccess()){
-                QcresultDetail qcresultDetail = qcresultDetailFacade.getOne(new QueryWrapper<QcresultDetail>()
-                        .eq("hospital_id", approvedVo.getHospitalId())
-                        .eq("behospital_code", approvedVo.getBehospitalCode())
-                        .eq("cases_entry_id", approvedVo.getQcResultAlgVO().getCasesEntryId())
-                        .eq("grade_type",2)
-                );
+            if (analyzeDTORespDTO.getIsSuccess()) {
                 approvedVo.setQcresultDetailId(qcresultDetail.getId());
                 Boolean appealInfo = updateAppealInfo(approvedVo);
                 MedAppealExamineInfo medAppealExamineInfo = new MedAppealExamineInfo();
@@ -203,18 +212,18 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
                         .eq("appeal_info_id", approvedVo.getId())
                         .eq("check_id", approvedVo.getAppealId())
                 );
-                if(appealInfo && update){
-                    return  true;
-                }else {
+                if (appealInfo && update) {
+                    return true;
+                } else {
                     throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "审核通过失败!");
                 }
-            }else {
+            } else {
                 throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "恢复失败!");
             }
         }
-        if(StringUtil.isNotEmpty(handling) && handling.equals(ExampleOperationEnum.ADD_NO_EXIST.getKey())){
+        if (StringUtil.isNotEmpty(handling) && handling.equals(ExampleOperationEnum.ADD_NO_EXIST.getKey())) {
             Boolean appealInfo = updateAppealInfo(approvedVo);
-            MedAppealExamineInfo medAppealExamineInfo= new MedAppealExamineInfo();
+            MedAppealExamineInfo medAppealExamineInfo = new MedAppealExamineInfo();
             medAppealExamineInfo.setExampleOperation(ExampleOperationEnum.ADD_NO_EXIST.getKey());
             medAppealExamineInfo.setExampleStatus(ExampleStatusEnum.ADOPT_EXAMPLE.getKey());
             medAppealExamineInfo.setProcessResult(approvedVo.getProcessResult());
@@ -233,7 +242,7 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
         throw new CommonException(CommonErrorCode.NOT_EXISTS, "无此类型处理方式!");
     }
 
-    public Boolean updateAppealInfo (ApprovedVo approvedVo) {
+    public Boolean updateAppealInfo(ApprovedVo approvedVo) {
         MedAppealInfo medAppealInfo = new MedAppealInfo();
         medAppealInfo.setQcresultDetailId(approvedVo.getQcresultDetailId());
         medAppealInfo.setWorkFlowNodeId(approvedVo.getWorkFlowNodeId());
@@ -243,14 +252,15 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
                 .eq("behospital_code", approvedVo.getBehospitalCode())
                 .eq("id", approvedVo.getId())
         );
-        if(update){
+        if (update) {
             return true;
-        }else {
+        } else {
             return false;
         }
     }
 
-    public QcresultDetail getQcresultDetail (ApprovedVo approvedVo) {
+    //  获取detail条目信息
+    public QcresultDetail getQcresultDetail(ApprovedVo approvedVo) {
         QcresultDetail qcresultDetail = qcresultDetailFacade.getOne(new QueryWrapper<QcresultDetail>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", approvedVo.getHospitalId())
@@ -266,7 +276,7 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
         getAppealReviewVO.setSearchCount(false);
         RespDTO<Page<GetAppealReviewDTO>> appealReview = medAppealExamineInfoServiceClient.getAppealReview(getAppealReviewVO);
         //格式转换
-        List<ExportGetAppealReviewDTO> out = BeanUtil.listCopyTo(appealReview.data.getRecords(),ExportGetAppealReviewDTO.class);
+        List<ExportGetAppealReviewDTO> out = BeanUtil.listCopyTo(appealReview.data.getRecords(), ExportGetAppealReviewDTO.class);
         String fileName = "申诉审核.xls";
         ExcelUtils.exportExcelUser(out, null, "sheet1", ExportGetAppealReviewDTO.class, fileName, response);
     }
@@ -277,7 +287,7 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
         getComplaintRecordVO.setSearchCount(false);
         RespDTO<Page<GetComplaintRecordDTO>> complaintRecord = medAppealExamineInfoServiceClient.getComplaintRecord(getComplaintRecordVO);
         //格式转换
-        List<ExportGetComplaintRecordDTO> out = BeanUtil.listCopyTo(complaintRecord.data.getRecords(),ExportGetComplaintRecordDTO.class);
+        List<ExportGetComplaintRecordDTO> out = BeanUtil.listCopyTo(complaintRecord.data.getRecords(), ExportGetComplaintRecordDTO.class);
         String fileName = "申诉记录.xls";
         ExcelUtils.exportExcelUser(out, null, "sheet1", ExportGetComplaintRecordDTO.class, fileName, response);
     }

src/main/java/com/diagbot/vo/GetAppealDeptVo.java

@@ -0,0 +1,37 @@
+package com.diagbot.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 通过
+ *
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/4 14:59
+ */
+@Getter
+@Setter
+public class GetAppealDeptVo {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "医院ID", hidden = true)
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "申诉人id", hidden = true)
+    private Long claimantId;
+
+    @ApiModelProperty(value = "审核人id", hidden = true)
+    private Long checkId;
+
+    @ApiModelProperty(value = "页面类型:1:申诉记录|2:申诉审核")
+    @NotBlank(message = "页面类型不能为空")
+    private String pageType;
+
+    @ApiModelProperty(value = "是否已归档（0：未归档，1：已归档）")
+    private String isPlacefile;
+
+}

src/main/java/com/diagbot/vo/GetAppealModeVo.java

@@ -0,0 +1,37 @@
+package com.diagbot.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 通过
+ *
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/4 14:59
+ */
+@Getter
+@Setter
+public class GetAppealModeVo {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "医院ID", hidden = true)
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "申诉人id", hidden = true)
+    private Long claimantId;
+
+    @ApiModelProperty(value = "审核人id", hidden = true)
+    private Long checkId;
+
+    @ApiModelProperty(value = "页面类型:1:申诉记录|2:申诉审核")
+    @NotBlank(message = "页面类型不能为空")
+    private String pageType;
+
+    @ApiModelProperty(value = "是否已归档（0：未归档，1：已归档）")
+    private String isPlacefile;
+
+}

src/main/java/com/diagbot/vo/GetComplaintRecordVO.java

@@ -55,4 +55,7 @@ public class GetComplaintRecordVO extends Page implements Serializable {
     @ApiModelProperty(value = "是否已归档（0：未归档，1：已归档）")
     private String isPlacefile;
 
+    @ApiModelProperty(value = "患者姓名")
+    private String patientName;
+
 }

src/main/java/com/diagbot/web/MedAppealInfoController.java

@@ -2,21 +2,16 @@ package com.diagbot.web;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.MedAppealInfoServiceClientFacade;
-import com.diagbot.dto.GetAppealInfoDTO;
-import com.diagbot.dto.GetReviewerDTO;
-import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.*;
+import com.diagbot.entity.SysUserRole;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.SysHospitalSetFacade;
+import com.diagbot.facade.SysUserRoleFacade;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.SysUserUtils;
-import com.diagbot.vo.AddAppealInfoApiVO;
-import com.diagbot.vo.AddAppealInfoVO;
-import com.diagbot.vo.CancelAppealInfoApiVO;
-import com.diagbot.vo.CancelAppealInfoVO;
-import com.diagbot.vo.GetAppealInfoVO;
-import com.diagbot.vo.GetAppealOperationTypeVO;
-import com.diagbot.vo.GetReviewerApiVO;
-import com.diagbot.vo.GetReviewerVO;
+import com.diagbot.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
@@ -29,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -53,6 +49,9 @@ public class MedAppealInfoController {
     @Autowired
     SysHospitalSetFacade sysHospitalSetFacade;
 
+    @Autowired
+    SysUserRoleFacade sysUserRoleFacade;
+
     @ApiOperation(value = "申诉[by:songxl]",
             notes = "申诉")
     @PostMapping("/addAppealInfo")
@@ -156,4 +155,51 @@ public class MedAppealInfoController {
         return medAppealInfoServiceClientFacade.getAppealInfo(getAppealInfoVO);
     }
 
+    @ApiOperation(value = "申诉审核科室下拉列表查询[by:songxl]",
+            notes = "申诉审核科室下拉列表查询")
+    @PostMapping("/getAppealDept")
+    public RespDTO<List<GetAppealDeptDTO>> getAppealDept(@RequestBody @Valid GetAppealDeptVo getAppealDeptVo) {
+        String currentPrincipleID = SysUserUtils.getCurrentPrincipleID();
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        getAppealDeptVo.setHospitalId(Long.valueOf(hospitalId));
+        if(Long.valueOf(getAppealDeptVo.getPageType())==1){
+            //申诉人
+            getAppealDeptVo.setClaimantId(Long.valueOf(currentPrincipleID));
+        }else {
+            //审核人
+            getAppealDeptVo.setCheckId(Long.valueOf(currentPrincipleID));
+        }
+        return medAppealInfoServiceClientFacade.getAppealDept(getAppealDeptVo);
+    }
+
+    @ApiOperation(value = "申诉审核模块下拉列表查询[by:songxl]",
+            notes = "申诉审核模块下拉列表查询")
+    @PostMapping("/getAppealMode")
+    public RespDTO<List<GetAppealModeDTO>> getAppealMode(@RequestBody @Valid GetAppealModeVo getAppealModeVo) {
+        String currentPrincipleID = SysUserUtils.getCurrentPrincipleID();
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        getAppealModeVo.setHospitalId(Long.valueOf(hospitalId));
+        if(Long.valueOf(getAppealModeVo.getPageType())==1){
+            //申诉人
+            getAppealModeVo.setClaimantId(Long.valueOf(currentPrincipleID));
+        }else {
+            //审核人
+            getAppealModeVo.setCheckId(Long.valueOf(currentPrincipleID));
+        }
+        return medAppealInfoServiceClientFacade.getAppealMode(getAppealModeVo);
+    }
+
+    @ApiOperation(value = "查询该角色的所有角色id[by:songxl]",
+            notes = "查询该角色的所有角色id")
+    @PostMapping("/getUserRole")
+    public RespDTO<List<Long>> getUserRole() {
+        List<Long> roleId = new ArrayList<>();
+        List<SysUserRole> list = sysUserRoleFacade.list(new QueryWrapper<SysUserRole>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("user_id", SysUserUtils.getCurrentPrincipleID()));
+        for (SysUserRole sysUserRole : list) {
+            roleId.add(sysUserRole.getRoleId());
+        }
+        return RespDTO.onSuc(roleId);
+    }
 }