申诉审核v2.2.0审核相关功能

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

@@ -0,0 +1,72 @@
+package com.diagbot.client;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.client.hystrix.MedAppealExamineInfoServiceHystrix;
+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;
+
+
+
+/**
+ * @description: 申诉功能远程调用
+ * @author: zhoutg
+ * @date: 2020/4/13 18:28
+ */
+@FeignClient(name = "gateway-service", url = "${appeal.address}", fallback = MedAppealExamineInfoServiceHystrix.class)
+public interface MedAppealExamineInfoServiceClient {
+    /**
+     * 获取申诉记录
+     * @param getComplaintRecordVO
+     * @return
+     */
+    @PostMapping(value = "/report-service/medAppealExamineInInfoManage/getComplaintRecord")
+    RespDTO<Page<GetComplaintRecordDTO>> getComplaintRecord(@RequestBody GetComplaintRecordVO getComplaintRecordVO);
+
+    /**
+     * 获取申诉审核列表
+     * @param getAppealReviewVO
+     * @return
+     */
+    @PostMapping(value = "/report-service/medAppealExamineInInfoManage/getAppealReview")
+    RespDTO<Page<GetAppealReviewDTO>> getAppealReview(@RequestBody GetAppealReviewVO getAppealReviewVO);
+
+    /**
+     *审核获取申述详情
+     * @param getAuditVO
+     * @return
+     */
+    @PostMapping(value = "/report-service/medAppealExamineInInfoManage/getAudit")
+    RespDTO<GetAuditDTO> getAudit(@RequestBody GetAuditVO getAuditVO);
+
+    /**
+     *审核通过
+     * @param approvedVo
+     * @return
+     */
+    @PostMapping(value = "/report-service/medAppealExamineInInfoManage/approved")
+    RespDTO<Boolean> approved(@RequestBody ApprovedVo approvedVo);
+
+    /**
+     *驳回
+     * @param rejectedVo
+     * @return
+     */
+    @PostMapping(value = "/report-service/medAppealExamineInInfoManage/rejected")
+    RespDTO<Boolean> rejected(@RequestBody RejectedVo rejectedVo);
+
+    /**
+     *审核查看
+     * @param getApprovedViewVO
+     * @return
+     */
+    @PostMapping(value = "/report-service/medAppealExamineInInfoManage/getApprovedView")
+    RespDTO<GetAppealInfoDTO> getApprovedView(@RequestBody GetApprovedViewVO getApprovedViewVO);
+
+
+}
+
+
+

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

@@ -1,61 +0,0 @@
-package com.diagbot.client;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.client.hystrix.MedAppealInfoServiceHystrixME;
-import com.diagbot.dto.*;
-import com.diagbot.vo.MedAppealAuditVO;
-import com.diagbot.vo.MedAppealComplaintRecordPageVO;
-import com.diagbot.vo.MedAppealReviewPageVO;
-import com.diagbot.vo.MedApprovedVo;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-
-/**
- * @description: 申诉功能远程调用
- * @author: zhoutg
- * @date: 2020/4/13 18:28
- */
-@FeignClient(name = "gateway-service", url = "${appeal.address}", fallback = MedAppealInfoServiceHystrixME.class)
-public interface MedAppealInfoServiceClientME {
-    /**
-     * 获取申诉记录
-     * @param medAppealComplaintRecordPageVO
-     * @return
-     */
-    @PostMapping(value = "/report-service/medAppealInfoManageME/getComplaintRecord")
-    RespDTO<Page<MedAppealComplaintRecordDTO>> getComplaintRecord(@RequestBody MedAppealComplaintRecordPageVO medAppealComplaintRecordPageVO);
-
-    /**
-     * 获取申诉审核列表
-     * @param medAppealReviewPageVO
-     * @return
-     */
-    @PostMapping(value = "/report-service/medAppealInfoManageME/getAppealReview")
-    RespDTO<Page<MedAppealReviewDTO>> getAppealReview(@RequestBody  MedAppealReviewPageVO medAppealReviewPageVO);
-
-    /**
-     *审核获取申述详情
-     * @param medAppealAuditVO
-     * @return
-     */
-    @PostMapping(value = "/report-service/medAppealInfoManageME/getAudit")
-    RespDTO<MedAppealAuditDTO> getAudit(@RequestBody MedAppealAuditVO medAppealAuditVO);
-
-    /**
-     *审核通过
-     * @param medApprovedVo
-     * @return
-     */
-    @PostMapping(value = "/report-service/medAppealInfoManageME/approved")
-    RespDTO<Boolean> approved(@RequestBody MedApprovedVo medApprovedVo);
-
-
-}
-
-
-

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

@@ -0,0 +1,56 @@
+package com.diagbot.client.hystrix;
+
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.client.MedAppealExamineInfoServiceClient;
+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;
+/**
+ * @description: 申诉远程调用熔断器
+ * @author: zhoutg
+ * @date: 2020/4/13 18:23
+ */
+@Component
+@Slf4j
+public class MedAppealExamineInfoServiceHystrix implements MedAppealExamineInfoServiceClient {
+
+    @Override
+    public RespDTO<Page<GetComplaintRecordDTO>> getComplaintRecord(@RequestBody GetComplaintRecordVO getComplaintRecordVO) {
+        log.error("【hystrix】调用{}异常", "getComplaintRecord");
+        return null;
+    }
+
+    @Override
+    public RespDTO<Page<GetAppealReviewDTO>> getAppealReview(@RequestBody GetAppealReviewVO getAppealReviewVO) {
+        log.error("【hystrix】调用{}异常", "getAppealReview");
+        return null;
+    }
+
+    @Override
+    public RespDTO<GetAuditDTO> getAudit( @RequestBody GetAuditVO getAuditVO) {
+        log.error("【hystrix】调用{}异常", "getAudit");
+        return null;
+    }
+
+    @Override
+    public RespDTO<Boolean> approved( @RequestBody ApprovedVo approvedVo) {
+        log.error("【hystrix】调用{}异常", "approved");
+        return null;
+    }
+
+    @Override
+    public RespDTO<Boolean> rejected( @RequestBody RejectedVo rejectedVo) {
+        log.error("【hystrix】调用{}异常", "rejected");
+        return null;
+    }
+    @Override
+    public RespDTO<GetAppealInfoDTO> getApprovedView( @RequestBody GetApprovedViewVO getApprovedViewVO) {
+        log.error("【hystrix】调用{}异常", "getApprovedView");
+        return null;
+    }
+
+}

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

@@ -1,50 +0,0 @@
-package com.diagbot.client.hystrix;
-
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.client.MedAppealInfoServiceClientME;
-import com.diagbot.dto.*;
-import com.diagbot.vo.MedAppealAuditVO;
-import com.diagbot.vo.MedAppealComplaintRecordPageVO;
-import com.diagbot.vo.MedAppealReviewPageVO;
-import com.diagbot.vo.MedApprovedVo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * @description: 申诉远程调用熔断器
- * @author: zhoutg
- * @date: 2020/4/13 18:23
- */
-@Component
-@Slf4j
-public class MedAppealInfoServiceHystrixME implements MedAppealInfoServiceClientME {
-
-    @Override
-    public RespDTO<Page<MedAppealComplaintRecordDTO>> getComplaintRecord(@RequestBody MedAppealComplaintRecordPageVO medAppealComplaintRecordPageVO) {
-        log.error("【hystrix】调用{}异常", "getComplaintRecord");
-        return null;
-    }
-
-    @Override
-    public RespDTO<Page<MedAppealReviewDTO>> getAppealReview(@RequestBody MedAppealReviewPageVO medAppealReviewPageVO) {
-        log.error("【hystrix】调用{}异常", "getAppealReview");
-        return null;
-    }
-
-    @Override
-    public RespDTO<MedAppealAuditDTO> getAudit( @RequestBody MedAppealAuditVO medAppealAuditVO) {
-        log.error("【hystrix】调用{}异常", "getAudit");
-        return null;
-    }
-
-    @Override
-    public RespDTO<Boolean> approved( @RequestBody MedApprovedVo medApprovedVo) {
-        log.error("【hystrix】调用{}异常", "approved");
-        return null;
-    }
-}

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

@@ -290,13 +290,19 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/analysisDept/getEntryDefectImproveInnerDept").permitAll()
                 .antMatchers("/qc/analysisDept/getDefectImproveInnerByDeptExport").permitAll()
                 .antMatchers("/qc/appealInfo/getWorkById").permitAll()
-                .antMatchers("/qc/appealInfoME/getComplaintRecord").permitAll()
-                .antMatchers("/qc/appealInfoME/getAppealReview").permitAll()
-                .antMatchers("/qc/appealInfoME/getAudit").permitAll()
-                .antMatchers("/qc/appealInfoME/approved").permitAll()
-                .antMatchers("/qc/appealInfoME/getAppealReviewDictionary").permitAll()
+                .antMatchers("/qc/appealExamineInfo/getComplaintRecord").permitAll()
+                .antMatchers("/qc/appealExamineInfo/getAppealReview").permitAll()
+                .antMatchers("/qc/appealExamineInfo/getAudit").permitAll()
+                .antMatchers("/qc/appealExamineInfo/approved").permitAll()
+                .antMatchers("/qc/appealExamineInfo/rejected").permitAll()
+                .antMatchers("/qc/appealExamineInfo/getApprovedView").permitAll()
+                .antMatchers("/qc/appealExamineInfo/getAppealReviewDictionary").permitAll()
                 .antMatchers("/qc/appealInfo/addAppealInfo").permitAll()
                 .antMatchers("/qc/appealInfo/getReviewer").permitAll()
+                .antMatchers("/qc/behospitalInfo/addCase").permitAll()
+                .antMatchers("/qc/appealInfo/delCase").permitAll()
+                .antMatchers("/qc/appealInfo/logicDelCase").permitAll()
+                .antMatchers("/qc/appealInfo/updCase").permitAll()
                 .antMatchers("/qc/appealInfo/getAppealOperationType").permitAll()
                 .antMatchers("/qc/appealInfo/cancelAppealInfo").permitAll()
                 .antMatchers("/qc/appealInfo/getAppealInfo").permitAll()

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

@@ -342,13 +342,19 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/analysisDept/getEntryDefectImproveInnerDept", request)
                 || matchers("/qc/analysisDept/getDefectImproveInnerByDeptExport", request)
                 || matchers("/qc/appealInfo/getWorkById", request)
-                || matchers("/qc/appealInfoME/getComplaintRecord", request)
-                || matchers("/qc/appealInfoME/getAppealReview", request)
-                || matchers("/qc/appealInfoME/getAudit", request)
-                || matchers("/qc/appealInfoME/approved", request)
-                || matchers("/qc/appealInfoME/getAppealReviewDictionary", request)
+                || matchers("/qc/appealExamineInfo/getComplaintRecord", request)
+                || matchers("/qc/appealExamineInfo/getAppealReview", request)
+                || matchers("/qc/appealExamineInfo/getAudit", request)
+                || matchers("/qc/appealExamineInfo/approved", request)
+                || matchers("/qc/appealExamineInfo/rejected", request)
+                || matchers("/qc/appealExamineInfo/getApprovedView", request)
+                || matchers("/qc/appealExamineInfo/getAppealReviewDictionary", request)
                 || matchers("/qc/appealInfo/addAppealInfo", request)
                 || matchers("/qc/appealInfo/getReviewer", request)
+                || matchers("/qc/behospitalInfo/addCase", request)
+                || matchers("/qc/behospitalInfo/delCase", request)
+                || matchers("/qc/behospitalInfo/logicDelCase", request)
+                || matchers("/qc/behospitalInfo/updCase", request)
                 || matchers("/qc/appealInfo/getAppealOperationType", request)
                 || matchers("/qc/appealInfo/cancelAppealInfo", request)
                 || matchers("/qc/appealInfo/getAppealInfo", request)

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

@@ -1,6 +1,7 @@
 package com.diagbot.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -14,59 +15,44 @@ import java.util.Date;
  */
 @Getter
 @Setter
-public class MedAppealReviewDTO {
-    /**
-     * 申述id
-     */
+public class GetAppealReviewDTO {
+
+    @ApiModelProperty(value = "申述id")
     private Long id;
-    /**
-     * 申述人
-     */
+
+    @ApiModelProperty(value = "申述人")
     private String claimantName;
-    /**
-     * 所属科室
-     */
+
+    @ApiModelProperty(value = "所属科室")
     private String behDeptName;
 
-    /**
-     * 申述申诉时间
-     */
+    @ApiModelProperty(value = "申述申诉时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date claimantGmtCreate;
-    /**
-     * 病人住院序号
-     */
+
+    @ApiModelProperty(value = "病人住院序号")
     private String behospitalCode;
-    /**
-     * 患者姓名
-     */
+
+    @ApiModelProperty(value = "患者姓名")
     private String name;
-    /**
-     * 申述模块
-     */
+
+    @ApiModelProperty(value = "申述模块")
     private String modeName;
-    /**
-     * 缺陷详情
-     */
+
+    @ApiModelProperty(value = "缺陷详情")
     private String defectContent;
-    /**
-     * 审核人
-     */
+
+    @ApiModelProperty(value = "审核人")
     private String checkName;
-    /**
-     * 审核时间
-     */
+
+    @ApiModelProperty(value = "审核时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date checkGmtCreate;
 
-    /**
-     * 操作类型
-     */
+    @ApiModelProperty(value = "操作类型")
     private String appealOperationType;
 
-    /**
-     * 状态
-     */
+    @ApiModelProperty(value = "状态")
     private String exampleStatus;
 
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -14,103 +15,77 @@ import java.util.Date;
  */
 @Getter
 @Setter
-public class MedAppealAuditDTO {
-    /**
-     * 病案号
-     */
+public class GetAuditDTO {
+    @ApiModelProperty(value = "病案号")
     private String behospitalCode;
-    /**
-     * 姓名
-     */
+
+    @ApiModelProperty(value = "姓名")
     private String name;
-    /**
-     * 性别
-     */
+
+    @ApiModelProperty(value = "性别")
     private String sex;
-    /**
-     * 年龄
-     */
+
+    @ApiModelProperty(value = "年龄")
     private String age;
-    /**
-     * 科室
-     */
+
+    @ApiModelProperty(value = "科室")
     private String behDeptName;
 
-    /**
-     * 主管医生
-     */
+    @ApiModelProperty(value = "主管医生")
     private String doctorName;
-    /**
-     * 入院时间
-     */
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty(value = "入院时间")
     private Date behospitalDate;
-    /**
-     * 出院时间
-     */
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty(value = "出院时间")
     private Date leaveHospitalDate;
-    /**
-     * 申诉模块
-     */
+
+    @ApiModelProperty(value = "申诉模块")
     private String modeName;
-    /**
-     * 质控缺陷ID
-     */
+
+    @ApiModelProperty(value = "质控缺陷ID")
     private Long qcresultDetailId;
-    /**
-     * 病历内容
-     */
+
+    @ApiModelProperty(value = "病历内容")
     private String defectContent;
-    /**
-     * 缺陷详情
-     */
+
+    @ApiModelProperty(value = "缺陷详情")
     private String qcresultDetailMsg;
-    /**
-     * 缺陷扣分分值
-     */
+
+    @ApiModelProperty(value = "缺陷扣分分值")
     private Long qcresultDetaiValue;
-    /**
-     * 申述时间
-     */
+
+    @ApiModelProperty(value = "申述时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date gmtCreate;
-    /**
-     * 申述人
-     */
+
+    @ApiModelProperty(value = "申述人")
     private String claimantName;
 
-    /**
-     * 审核人
-     */
+    @ApiModelProperty(value = "审核人")
     private String checkName;
-    /**
-     * 操作类型
-     */
+
+    @ApiModelProperty(value = "操作类型")
     private String appealOperationType;
-    /**
-     * 条目ID
-     */
+
+    @ApiModelProperty(value = "条目ID")
     private Long casesEntryId;
-    /**
-     * 质控条目
-     */
+
+    @ApiModelProperty(value = "质控条目")
     private String casesEntryName;
-    /**
-     * 提示信息
-     */
+
+    @ApiModelProperty(value = "提示信息")
     private String casesEntryMsg;
-    /**
-     * 分值
-     */
+
+    @ApiModelProperty(value = "分值")
     private Long value;
-    /**
-     * 备注
-     */
+
+    @ApiModelProperty(value = "备注")
     private String remark;
-    /**
-     * 申诉说明
-     */
+
+    @ApiModelProperty(value = "申诉说明")
     private String appealExplain;
 
 }

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

@@ -1,11 +1,10 @@
 package com.diagbot.dto;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -16,59 +15,44 @@ import java.util.Date;
  */
 @Getter
 @Setter
-public class MedAppealComplaintRecordDTO {
-    /**
-     * 申述id
-     */
+public class GetComplaintRecordDTO {
+
+    @ApiModelProperty(value = "申述id")
     private Long id;
-    /**
-     * 申述人
-     */
+
+    @ApiModelProperty(value = "申述人")
     private String claimantName;
-    /**
-     * 所属科室
-     */
+
+    @ApiModelProperty(value = "所属科室")
     private String behDeptName;
 
-    /**
-     * 申述申诉时间
-     */
+    @ApiModelProperty(value = "申述申诉时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date claimantGmtCreate;
-    /**
-     * 病人住院序号
-     */
+
+    @ApiModelProperty(value = "病人住院序号")
     private String behospitalCode;
-    /**
-     * 患者姓名
-     */
+
+    @ApiModelProperty(value = "患者姓名")
     private String name;
-    /**
-     * 申述模块
-     */
+
+    @ApiModelProperty(value = "申述模块")
     private String modeName;
-    /**
-     * 缺陷详情
-     */
+
+    @ApiModelProperty(value = "缺陷详情")
     private String defectContent;
-    /**
-     * 审核人
-     */
+
+    @ApiModelProperty(value = "审核人")
     private String checkName;
-    /**
-     * 审核时间
-     */
+
+    @ApiModelProperty(value = "审核时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date checkGmtCreate;
 
-    /**
-     * 操作类型
-     */
+    @ApiModelProperty(value = "操作类型")
     private String appealOperationType;
 
-    /**
-     * 状态
-     */
+    @ApiModelProperty(value = "状态")
     private String exampleStatus;
 
 }

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

@@ -0,0 +1,63 @@
+package com.diagbot.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+
+import java.math.BigDecimal;
+
+/**
+ * 通过
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/4 14:59
+ */
+@Getter
+@Setter
+public class ApprovedVo {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "医院id",hidden = true)
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "申诉id",required = true)
+    private Long id;
+
+    @ApiModelProperty(value = "工作流节点")
+    private Long workFlowNodeId;
+
+    @ApiModelProperty(value = "审核人id",hidden = true)
+    private Long appealId;
+
+    @ApiModelProperty(value = "病人住院序号",required = true)
+    private String behospitalCode;
+
+    @ApiModelProperty(value = "处理方式",required = true)
+    private String exampleOperation;
+
+    @ApiModelProperty(value = "处理结果",required = true)
+    private String processResult;
+    @ApiModelProperty(value = "申诉模块",required = true)
+    private Long casesId;
+
+    @ApiModelProperty(value = "质控缺陷ID")
+    private Long qcresultDetailId;
+
+    @ApiModelProperty(value = "条目ID")
+    private Long casesEntryId;
+
+    @ApiModelProperty(value = "质控条目")
+    private String casesEntryName;
+
+    @ApiModelProperty(value = "提示信息")
+    private String casesEntryMsg;
+
+    @ApiModelProperty(value = "分值")
+    private BigDecimal value;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+}

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

@@ -17,53 +17,36 @@ import java.util.Date;
  */
 @Getter
 @Setter
-public class MedAppealReviewPageVO extends Page implements Serializable {
+public class GetAppealReviewVO extends Page implements Serializable {
     private static final long serialVersionUID = 1L;
-    /**
-     * 审核人id
-     */
-    @ApiModelProperty(hidden = true)
+
+    @ApiModelProperty(value = "审核人id",hidden = true)
     private Long appealId;
-    /**
-     * 医院id
-     */
-    @ApiModelProperty(hidden = true)
+
+    @ApiModelProperty(value = "医院id",hidden = true)
     private Long hospitalId;
-    /**
-     * 申述开始时间
-     */
+
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "申述开始时间", required = true)
     private Date complaintDateStart;
 
-    /**
-     * 申述结束时间
-     */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "申述结束时间", required = true)
     private Date complaintDateEnd;
 
-    /**
-     * 所属科室
-     */
+    @ApiModelProperty(value = "所属科室")
     private String deptName;
 
-    /**
-     * 申述模块
-     */
+    @ApiModelProperty(value = "申述模块")
     private String module;
 
-    /**
-     * 申诉人
-     */
+    @ApiModelProperty(value = "申诉人")
     private String name;
 
-    /**
-     * 操作类型
-     */
+    @ApiModelProperty(value = "操作类型")
     private String operationType;
 
-    /**
-     * 状态
-     */
+    @ApiModelProperty(value = "状态")
     private String state;
 
 }

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

@@ -0,0 +1,21 @@
+package com.diagbot.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @Author songxl
+ * @Date 2022/1/6
+ */
+@Data
+public class GetApprovedViewVO {
+    @ApiModelProperty(value = "申诉id", required = true)
+    @NotNull(message = "申诉id不能为空")
+    private Long id;
+
+    @ApiModelProperty(value = "类型 1：申诉查看|2：审核查看")
+    private String type = "2";
+}

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

@@ -11,8 +11,8 @@ import javax.validation.constraints.NotNull;
  * @Date 2022/1/6
  */
 @Data
-public class MedAppealAuditVO {
+public class GetAuditVO {
     @ApiModelProperty(value = "审核编号",required = true)
-    @NotNull(message = "编号为空")
+    @NotNull(message = "编号不能为空")
     private Long id;
 }

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

@@ -20,53 +20,36 @@ import java.util.Date;
  */
 @Getter
 @Setter
-public class MedAppealComplaintRecordPageVO extends Page implements Serializable {
+public class GetComplaintRecordVO extends Page implements Serializable {
     private static final long serialVersionUID = 1L;
-    /**
-     * 申述人id
-     */
-    @ApiModelProperty(hidden = true)
+
+    @ApiModelProperty(value = "申述人id",hidden = true)
     private Long complaintId;
-    /**
-     * 医院id
-     */
-    @ApiModelProperty(hidden = true)
+
+    @ApiModelProperty(value = "医院id",hidden = true)
     private Long hospitalId;
-    /**
-     * 申述开始时间
-     */
+
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "申述开始时间", required = true)
     private Date complaintDateStart;
 
-    /**
-     * 申述结束时间
-     */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "申述结束时间", required = true)
     private Date complaintDateEnd;
 
-    /**
-     * 所属科室
-     */
+    @ApiModelProperty(value = "所属科室")
     private String deptName;
 
-    /**
-     * 申述模块
-     */
+    @ApiModelProperty(value = "申述模块")
     private String module;
 
-    /**
-     * 审核人
-     */
+    @ApiModelProperty(value = "审核人")
     private String name;
 
-    /**
-     * 操作类型
-     */
+    @ApiModelProperty(value = "操作类型")
     private String operationType;
 
-    /**
-     * 状态
-     */
+    @ApiModelProperty(value = "状态")
     private String state;
 
 }

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

@@ -1,71 +0,0 @@
-package com.diagbot.vo;
-
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 通过驳回
- * @Description:
- * @author: cy
- * @time: 2020/9/4 14:59
- */
-@Getter
-@Setter
-public class MedApprovedVo {
-    private static final long serialVersionUID = 1L;
-    /**
-     * 医院id
-     */
-    @ApiModelProperty(hidden = true)
-    private Long hospitalId;
-    /**
-     * 申诉id
-     */
-    @ApiModelProperty(hidden = true)
-    private Long id;
-    /**
-     * 工作流节点
-     */
-    @ApiModelProperty(hidden = true)
-    private Long workFlowNodeId;
-    /**
-     * 审核人id
-     */
-    @ApiModelProperty(hidden = true)
-    private Long appealId;
-    /**
-     * 病人住院序号
-     */
-    private String behospitalCode;
-    /**
-     * 操作类型
-     */
-    private String operationType;
-    /**
-     * 质控缺陷ID
-     */
-    private Long qcresultDetailId;
-    /**
-     * 条目ID
-     */
-    private Long casesEntryId;
-    /**
-     * 质控条目
-     */
-    private String casesEntryName;
-    /**
-     * 提示信息
-     */
-    private String casesEntryMsg;
-    /**
-     * 分值
-     */
-    private Long value;
-    /**
-     * 备注
-     */
-    private String remark;
-
-}

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

@@ -0,0 +1,37 @@
+package com.diagbot.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 驳回
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/4 14:59
+ */
+@Getter
+@Setter
+public class RejectedVo {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "医院id",hidden = true)
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "申诉id",required = true)
+    private Long id;
+
+    @ApiModelProperty(value = "工作流节点")
+    private Long workFlowNodeId;
+
+    @ApiModelProperty(value = "审核人id",hidden = true)
+    private Long appealId;
+
+    @ApiModelProperty(value = "病人住院序号",required = true)
+    private String behospitalCode;
+
+    @ApiModelProperty(value = "驳回理由")
+    private String rejectedReason;
+
+}

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

@@ -1,20 +1,13 @@
 package com.diagbot.web;
 
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
-import com.diagbot.client.MedAppealInfoServiceClientME;
-import com.diagbot.dto.MedAppealAuditDTO;
-import com.diagbot.dto.MedAppealComplaintRecordDTO;
-import com.diagbot.dto.MedAppealReviewDTO;
-import com.diagbot.dto.RespDTO;
+import com.diagbot.client.MedAppealExamineInfoServiceClient;
+import com.diagbot.dto.*;
 import com.diagbot.facade.SysDictionaryFacade;
 import com.diagbot.util.SysUserUtils;
-import com.diagbot.vo.MedAppealAuditVO;
-import com.diagbot.vo.MedAppealComplaintRecordPageVO;
-import com.diagbot.vo.MedAppealReviewPageVO;
-import com.diagbot.vo.MedApprovedVo;
+import com.diagbot.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 
@@ -38,45 +30,44 @@ import java.util.Map;
  * @since 2020-07-06
  */
 @RestController
-@RequestMapping("/qc/appealInfoME")
+@RequestMapping("/qc/appealExamineInfo")
 @Api(value = "申诉审核API", tags = { "申诉审核API" })
 @SuppressWarnings("unchecked")
-public class MedAppealInfoControllerME {
+public class MedAppealExamineInfoController {
     @Autowired
-    MedAppealInfoServiceClientME medAppealInfoServiceClientME;
+    MedAppealExamineInfoServiceClient medAppealExamineInfoServiceClient;
     @Autowired
     SysDictionaryFacade sysDictionaryFacade;
-
     @ApiOperation(value = "获取申述记录列表[by:zhanghang]",
             notes = "获取申诉任务接口")
     @PostMapping("/getComplaintRecord")
     @SysLogger("getComplaintRecord")
-    public RespDTO<MedAppealComplaintRecordDTO> getComplaintRecord(@RequestBody MedAppealComplaintRecordPageVO medAppealComplaintRecordPageVO) {
+    public RespDTO<GetComplaintRecordDTO> getComplaintRecord(@RequestBody GetComplaintRecordVO getComplaintRecordVO) {
         String userId = SysUserUtils.getCurrentPrincipleID();
         String hospitalId = SysUserUtils.getCurrentHospitalID();
-        medAppealComplaintRecordPageVO.setHospitalId(Long.valueOf(hospitalId));
-        medAppealComplaintRecordPageVO.setComplaintId(Long.valueOf(userId));
-        RespDTO<Page<MedAppealComplaintRecordDTO>> complaintRecord = medAppealInfoServiceClientME.getComplaintRecord(medAppealComplaintRecordPageVO);
+        getComplaintRecordVO.setHospitalId(Long.valueOf(hospitalId));
+        getComplaintRecordVO.setComplaintId(Long.valueOf(userId));
+        RespDTO<Page<GetComplaintRecordDTO>> complaintRecord = medAppealExamineInfoServiceClient.getComplaintRecord(getComplaintRecordVO);
         return RespDTO.onSuc(complaintRecord);
     }
 
     @ApiOperation(value = "获取申诉审核列表[by:zhanghang]",
             notes = "获取申诉审核列表")
     @PostMapping("/getAppealReview")
-    public RespDTO<MedAppealReviewDTO> getAppealReview(@RequestBody MedAppealReviewPageVO medAppealReviewPageVO) {
+    public RespDTO<GetAppealReviewDTO> getAppealReview(@RequestBody GetAppealReviewVO getAppealReviewVO) {
         String userId = SysUserUtils.getCurrentPrincipleID();
         String hospitalId = SysUserUtils.getCurrentHospitalID();
-        medAppealReviewPageVO.setHospitalId(Long.valueOf(hospitalId));
-        medAppealReviewPageVO.setAppealId(Long.valueOf(userId));
-        RespDTO<Page<MedAppealReviewDTO>> appealReview = medAppealInfoServiceClientME.getAppealReview(medAppealReviewPageVO);
+        getAppealReviewVO.setHospitalId(Long.valueOf(hospitalId));
+        getAppealReviewVO.setAppealId(Long.valueOf(userId));
+        RespDTO<Page<GetAppealReviewDTO>> appealReview = medAppealExamineInfoServiceClient.getAppealReview(getAppealReviewVO);
         return RespDTO.onSuc(appealReview);
     }
 
     @ApiOperation(value = "审核获取申述详情[by:zhanghang]",
             notes = "审核获取申述详情")
     @PostMapping("/getAudit")
-    public RespDTO<MedAppealAuditDTO> getAudit(@RequestBody MedAppealAuditVO medAppealAuditVO) {
-        RespDTO<MedAppealAuditDTO> audit = medAppealInfoServiceClientME.getAudit(medAppealAuditVO);
+    public RespDTO<GetAuditDTO> getAudit(@RequestBody GetAuditVO getAuditVO) {
+        RespDTO<GetAuditDTO> audit = medAppealExamineInfoServiceClient.getAudit(getAuditVO);
         return RespDTO.onSuc(audit);
     }
 
@@ -84,9 +75,27 @@ public class MedAppealInfoControllerME {
             notes = "审核通过")
     @PostMapping("/approved")
     @Transactional
-    public RespDTO<Boolean> approved(@RequestBody MedApprovedVo medApprovedVo) {
-        return RespDTO.onSuc(medAppealInfoServiceClientME.approved(medApprovedVo));
+    public RespDTO<Boolean> approved(@RequestBody ApprovedVo approvedVo) {
+
+        return RespDTO.onSuc(medAppealExamineInfoServiceClient.approved(approvedVo));
     }
+
+    @ApiOperation(value = "驳回[by:zhanghang]",
+            notes = "驳回")
+    @PostMapping("/rejected")
+    @Transactional
+    public RespDTO<Boolean> rejected(@RequestBody RejectedVo rejectedVo) {
+
+        return RespDTO.onSuc(medAppealExamineInfoServiceClient.rejected(rejectedVo));
+    }
+    @ApiOperation(value = "审核查看[by:zhanghang]",
+            notes = "审核查看")
+    @PostMapping("/getApprovedView")
+    public RespDTO<GetAppealInfoDTO> getApprovedView(@RequestBody GetApprovedViewVO getApprovedViewVO) {
+
+        return RespDTO.onSuc(medAppealExamineInfoServiceClient.getApprovedView(getApprovedViewVO));
+    }
+
     @ApiOperation(value = "获取操作类型及状态[by:zhanghang]",
             notes = "获取操作类型及状态")
     @PostMapping("/getAppealReviewDictionary")

src/main/resources/application-dev.yml

@@ -55,6 +55,8 @@ management:
 
 # 驱动配置信息
 spring:
+  application:
+    name: gateway-service
   datasource:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver

src/main/resources/application-local.yml

@@ -55,6 +55,8 @@ management:
 
 # 驱动配置信息
 spring:
+  application:
+    name: gateway-service
   datasource:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver

src/main/resources/application-pre.yml

@@ -55,6 +55,8 @@ management:
 
 # 驱动配置信息
 spring:
+  application:
+    name: gateway-service
   datasource:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver

src/main/resources/application-pro.yml

@@ -55,6 +55,8 @@ management:
 
 # 驱动配置信息
 spring:
+  application:
+    name: gateway-service
   datasource:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver

src/main/resources/application-test.yml

@@ -55,6 +55,8 @@ management:
 
 # 驱动配置信息
 spring:
+  application:
+    name: gateway-service
   datasource:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver