修改查看申诉、审核详情接口

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

@@ -59,11 +59,11 @@ public interface MedAppealExamineInfoServiceClient {
 
     /**
      *审核查看
-     * @param getApprovedViewVO
+     * @param getAppealInfoVO
      * @return
      */
     @PostMapping(value = "/report-service/medAppealExamineInInfoManage/getApprovedView")
-    RespDTO<GetAppealInfoDTO> getApprovedView(@RequestBody GetApprovedViewVO getApprovedViewVO);
+    RespDTO<GetAppealInfoDTO> getApprovedView(@RequestBody GetAppealInfoVO getAppealInfoVO);
 
     /**
      *待审核数量

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

@@ -48,7 +48,7 @@ public class MedAppealExamineInfoServiceHystrix implements MedAppealExamineInfoS
         return null;
     }
     @Override
-    public RespDTO<GetAppealInfoDTO> getApprovedView( @RequestBody GetApprovedViewVO getApprovedViewVO) {
+    public RespDTO<GetAppealInfoDTO> getApprovedView( @RequestBody GetAppealInfoVO getAppealInfoVO) {
         log.error("【hystrix】调用{}异常", "getApprovedView");
         return null;
     }

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

@@ -0,0 +1,83 @@
+package com.diagbot.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Description: 申诉审核记录对象
+ * @Author songxl
+ */
+@Data
+public class AppealExamineRecordDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "申诉id")
+    private Long id;
+
+    @ApiModelProperty(value = "条目ID")
+    private Long casesEntryId;
+
+    @ApiModelProperty(value = "质控条目(新增已有操作才有值)")
+    private String casesEntryName;
+
+    @ApiModelProperty(value = "申诉-提示信息(新增已有操作才有值)")
+    private String casesEntryMsg;
+
+    @ApiModelProperty(value = "申诉-分值(新增已有操作才有值)")
+    private BigDecimal value;
+
+    @ApiModelProperty(value = "申诉人id")
+    private Long claimantId;
+
+    @ApiModelProperty(value = "申诉类型(0:医生申诉|1:质控申诉)")
+    private String appealType;
+
+    @ApiModelProperty(value = "申诉操作类型（0:删改|1:新增已有|2:新增缺失|3:恢复）")
+    private String appealOperationType;
+
+    @ApiModelProperty(value = "申诉说明")
+    private String appealExplain;
+
+    @ApiModelProperty(value = "审核人id")
+    private Long checkId;
+
+    @ApiModelProperty(value = "申诉备注")
+    private String appealRemark;
+
+    @ApiModelProperty(value = "审核状态：1:驳回|2:通过")
+    private String exampleStatus;
+
+    @ApiModelProperty(value = "审核处理方式： 1:修改|2:删除|3:新增已有|4:新增缺失|5：恢复")
+    private String exampleOperation;
+
+    @ApiModelProperty(value = "处理结果")
+    private String processResult;
+
+    @ApiModelProperty(value = "驳回理由")
+    private String rejectReason;
+
+    @ApiModelProperty(value = "审核备注")
+    private String exampleRemark;
+
+    @ApiModelProperty(value = "申诉人姓名")
+    private String claimantName;
+
+    @ApiModelProperty(value = "审核人姓名")
+    private String checkName;
+
+    @ApiModelProperty(value = "申诉时间")
+    private Date appealCreateDate;
+
+    @ApiModelProperty(value = "审核时间")
+    private Date appealExamineDate;
+
+    @ApiModelProperty(value = "审核-提示信息")
+    private String msg;
+
+    @ApiModelProperty(value = "审核-分值")
+    private BigDecimal score;
+}

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

@@ -6,6 +6,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description: 申诉审核内容对象
@@ -14,6 +15,10 @@ import java.util.Date;
 @Data
 public class GetAppealInfoDTO implements Serializable {
     private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "医院ID")
+    private Long hospitalId;
+
     @ApiModelProperty(value = "病人住院ID")
     private String behospitalCode;
 
@@ -44,33 +49,6 @@ public class GetAppealInfoDTO implements Serializable {
     @ApiModelProperty(value = "出院时间")
     private Date leaveHospitalDate;
 
-    @ApiModelProperty(value = "申诉id")
-    private Long id;
-
-    @ApiModelProperty(value = "医院ID")
-    private Long hospitalId;
-
-    @ApiModelProperty(value = "质控缺陷id")
-    private Long qcresultDetailId;
-
-    @ApiModelProperty(value = "缺陷详情")
-    private String qcresultDetailMsg;
-
-    @ApiModelProperty(value = "缺陷扣分分值")
-    private BigDecimal qcresultDetaiValue;
-
-    @ApiModelProperty(value = "条目ID")
-    private Long casesEntryId;
-
-    @ApiModelProperty(value = "质控条目(新增已有操作才有值)")
-    private String casesEntryName;
-
-    @ApiModelProperty(value = "申诉-提示信息(新增已有操作才有值)")
-    private String casesEntryMsg;
-
-    @ApiModelProperty(value = "申诉-分值(新增已有操作才有值)")
-    private BigDecimal value;
-
     @ApiModelProperty(value = "申诉模块id")
     private Long casesId;
 
@@ -80,54 +58,15 @@ public class GetAppealInfoDTO implements Serializable {
     @ApiModelProperty(value = "病历内容")
     private String defectContent;
 
-    @ApiModelProperty(value = "申诉人id")
-    private Long claimantId;
-
-    @ApiModelProperty(value = "申诉类型(0:医生申诉|1:质控申诉)")
-    private String appealType;
-
-    @ApiModelProperty(value = "申诉操作类型（0:删改|1:新增已有|2:新增缺失|3:恢复）")
-    private String appealOperationType;
-
-    @ApiModelProperty(value = "申诉说明")
-    private String appealExplain;
-
-    @ApiModelProperty(value = "审核人id")
-    private Long checkId;
-
-    @ApiModelProperty(value = "申诉备注")
-    private String appealRemark;
-
-    @ApiModelProperty(value = "审核状态：1:驳回|2:通过")
-    private String exampleStatus;
-
-    @ApiModelProperty(value = "审核处理方式： 1:修改|2:删除|3:新增已有|4:新增缺失|5：恢复")
-    private String exampleOperation;
-
-    @ApiModelProperty(value = "处理结果")
-    private String processResult;
-
-    @ApiModelProperty(value = "驳回理由")
-    private String rejectReason;
-
-    @ApiModelProperty(value = "审核备注")
-    private String exampleRemark;
-
-    @ApiModelProperty(value = "申诉人姓名")
-    private String claimantName;
-
-    @ApiModelProperty(value = "审核人姓名")
-    private String checkName;
-
-    @ApiModelProperty(value = "申诉时间")
-    private Date appealCreateDate;
+    @ApiModelProperty(value = "质控缺陷id")
+    private Long qcresultDetailId;
 
-    @ApiModelProperty(value = "审核时间")
-    private Date appealExamineDate;
+    @ApiModelProperty(value = "缺陷详情")
+    private String qcresultDetailMsg;
 
-    @ApiModelProperty(value = "审核-提示信息")
-    private String msg;
+    @ApiModelProperty(value = "缺陷扣分分值")
+    private BigDecimal qcresultDetaiValue;
 
-    @ApiModelProperty(value = "审核-分值")
-    private BigDecimal score;
+    @ApiModelProperty(value = "申诉审核记录")
+    private List<AppealExamineRecordDTO> appealExamineRecordDTOList;
 }

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

@@ -16,6 +16,21 @@ public class GetAppealInfoVO {
     @NotNull(message = "申诉id不能为空")
     private Long id;
 
-    @ApiModelProperty(value = "类型 1：申诉查看|2：审核查看")
-    private String type = "1";
+    @ApiModelProperty(value = "医院ID")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "病人住院ID")
+    private String behospitalCode;
+
+    @ApiModelProperty(value = "条目ID")
+    private Long casesEntryId;
+
+    @ApiModelProperty(value = "质控缺陷id")
+    private Long qcresultDetailId;
+
+    @ApiModelProperty(value = "解释说明" ,hidden = true)
+    private String appealExplain;
+
+//    @ApiModelProperty(value = "类型 1：申诉查看|2：审核查看")
+//    private String type = "1";
 }

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

@@ -120,9 +120,9 @@ public class MedAppealExamineInfoController {
     @ApiOperation(value = "审核查看[by:zhanghang]",
             notes = "审核查看")
     @PostMapping("/getApprovedView")
-    public RespDTO<GetAppealInfoDTO> getApprovedView(@RequestBody GetApprovedViewVO getApprovedViewVO) {
+    public RespDTO<GetAppealInfoDTO> getApprovedView(@RequestBody GetAppealInfoVO getAppealInfoVO) {
 
-        return RespDTO.onSuc(medAppealExamineInfoServiceClient.getApprovedView(getApprovedViewVO));
+        return RespDTO.onSuc(medAppealExamineInfoServiceClient.getApprovedView(getAppealInfoVO));
     }
 
     @ApiOperation(value = "获取操作类型及状态[by:zhanghang]",