申诉-新增缺失相关代码调整

report-service/src/main/java/com/lantone/report/dto/GetAppealReviewDTO.java

@@ -64,4 +64,8 @@ public class GetAppealReviewDTO {
     @ApiModelProperty(value = "状态")
     private String exampleStatus;
 
+    @ApiModelProperty(value = "模块id")
+    private Long modeId;
+
+
 }

report-service/src/main/java/com/lantone/report/facade/MedAppealExamineInfoManagementFacade.java

@@ -127,6 +127,7 @@ public class MedAppealExamineInfoManagementFacade {
             if (AppealOperationTypeEnum.ADD_NO_EXIST.getKey().equals(appealInfo.getAppealOperationType())) {
                 getAppealInfoVO.setAppealExplain(appealInfo.getAppealExplain());
             }
+            getAppealInfoVO.setModeId(appealInfo.getModeId());
         }
         //3.获取申诉审核记录
         getAppealInfoDTO.setAppealExamineRecordDTOList(appealInfoFacade.getBaseMapper().getAppealExamineRecords(getAppealInfoVO));

report-service/src/main/java/com/lantone/report/facade/MedAppealInfoManagementFacade.java

@@ -498,6 +498,7 @@ public class MedAppealInfoManagementFacade {
             if (AppealOperationTypeEnum.ADD_NO_EXIST.getKey().equals(appealInfo.getAppealOperationType())) {
                 getAppealInfoVO.setAppealExplain(appealInfo.getAppealExplain());
             }
+            getAppealInfoVO.setModeId(appealInfo.getModeId());
         }
         //3.获取申诉审核记录
         getAppealInfoDTO.setAppealExamineRecordDTOList(appealInfoFacade.getBaseMapper().getAppealExamineRecords(getAppealInfoVO));

report-service/src/main/java/com/lantone/report/vo/GetAppealInfoVO.java

@@ -28,13 +28,16 @@ public class GetAppealInfoVO {
     @ApiModelProperty(value = "质控缺陷id")
     private Long qcresultDetailId;
 
-    @ApiModelProperty(value = "解释说明" ,hidden = true)
+    @ApiModelProperty(value = "解释说明", hidden = true)
     private String appealExplain;
 
-    @ApiModelProperty(value = "排除的工作节点" ,hidden = true)
+    @ApiModelProperty(value = "排除的工作节点", hidden = true)
     //排除撤回的申诉记录
     private String concelWorkFlowNode = "2";
 
-//    @ApiModelProperty(value = "类型 1：申诉查看|2：审核查看")
-//    private String type = "1";
+    @ApiModelProperty(value = "模块id", hidden = true)
+    private Long modeId;
+
+    //    @ApiModelProperty(value = "类型 1：申诉查看|2：审核查看")
+    //    private String type = "1";
 }

report-service/src/main/resources/mapper/AppealExamineInfoMapper.xml

@@ -85,6 +85,7 @@
         GROUP BY
         hospital_id,
         behospital_code,
+        mode_id,
         appeal_explain
         ))
         ) a
@@ -135,6 +136,7 @@
         a.qcresult_detail_id,
         a.cases_entry_id,
         a.qcresult_detail_msg,
+        a.mode_id,
         a.mode_name,
         a.defect_content,
         a.claimant_id,
@@ -175,7 +177,7 @@
         AND work_flow_node_id != 2
         GROUP BY
         appeal_explain,
-        check_id
+        mode_id
         )
         )
         AND hospital_id = #{getAppealReviewVO.hospitalId}

report-service/src/main/resources/mapper/AppealInfoMapper.xml

@@ -87,6 +87,9 @@
         <if test="getAppealInfoVO.casesEntryId != null ">
             AND mai.cases_entry_id = #{getAppealInfoVO.casesEntryId}
         </if>
+        <if test="getAppealInfoVO.modeId != null ">
+            AND mai.mode_id = #{getAppealInfoVO.modeId}
+        </if>
         <if test="getAppealInfoVO.appealExplain != null and getAppealInfoVO.appealExplain != '' ">
             AND appeal_operation_type = 2   AND mai.appeal_explain = #{getAppealInfoVO.appealExplain}
         </if>