Merge branch 'dev/20220105_2.2.0_通用版_申诉驳回' into test

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

@@ -24,6 +24,12 @@ public class GetComplaintRecordDTO {
     @ApiModelProperty(value = "申述人")
     private String claimantName;
 
+    @ApiModelProperty(value = "申述人ID")
+    private String claimantId;
+
+    @ApiModelProperty(value = "审核人ID")
+    private String checkId;
+
     @ApiModelProperty(value = "所属科室")
     private String behDeptName;
 
@@ -67,4 +73,13 @@ public class GetComplaintRecordDTO {
 
     @ApiModelProperty(value = "缺陷扣分分值")
     private BigDecimal qcresultDetaiValue;
+
+    @ApiModelProperty(value = "模块总分")
+    private BigDecimal casesScore;
+
+    @ApiModelProperty(value = "单项否决（1-单项否决 0-非）")
+    private Integer isReject;
+
+    @ApiModelProperty(value = "模块数据标准id")
+    private Integer casesId;
 }

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

@@ -52,8 +52,6 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
     private  MedAppealInfoManagementFacade medAppealInfoManagementFacade;
     @Autowired
     private QcresultInfoFacade qcresultInfoFacade;
-    @Autowired
-    private QcCasesEntryFacade qcCasesEntryFacade ;
 
     /**
      * 审核通过
@@ -141,14 +139,8 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
             AnalyzeDTO analyzeDTORespDTO = qcresultInfoFacade.changeQcResult(qcresultVO);
             if(analyzeDTORespDTO.getIsSuccess()){
                 QcresultDetail detail = getQcresultDetail(approvedVo);
-                QcCasesEntry qcCasesEntry = qcCasesEntryFacade.getOne(new QueryWrapper<QcCasesEntry>()
-                        .eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .eq("id", approvedVo.getQcResultAlgVO().getCasesEntryId())
-                );
                 MedAppealInfo medAppealInfo = new MedAppealInfo();
                 medAppealInfo.setQcresultDetailId(detail.getId());
-                medAppealInfo.setCasesEntryName(qcCasesEntry.getName());
-                medAppealInfo.setQcresultDetailMsg(detail.getMsg());
                 medAppealInfo.setWorkFlowNodeId(approvedVo.getWorkFlowNodeId());
                 boolean update = medAppealInfoManagementFacade.update(medAppealInfo, new UpdateWrapper<MedAppealInfo>()
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -178,10 +170,15 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
         if(StringUtil.isNotEmpty(handling) && handling.equals(ExampleOperationEnum.RECOVER.getKey())){
             qcresultVO.setType(4);
             qcresultVO.setDelStatus(1);
-            //调用删除接口
+            //调用删除恢复接口
             AnalyzeDTO analyzeDTORespDTO = qcresultInfoFacade.changeQcResult(qcresultVO);
             if(analyzeDTORespDTO.getIsSuccess()){
-                QcresultDetail qcresultDetail = getQcresultDetail(approvedVo);
+                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)
+                );
                 approvedVo.setQcresultDetailId(qcresultDetail.getId());
                 Boolean appealInfo = updateAppealInfo(approvedVo);
                 MedAppealExamineInfo medAppealExamineInfo = new MedAppealExamineInfo();

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -684,7 +684,7 @@
         a.*, u.linkman,
         appeal.id appeal_info_id,
         appeal.appeal_operation_type appealOperationType,
-        examine.example_status
+        appeal.example_status
         FROM
         (
         SELECT DISTINCT
@@ -733,9 +733,19 @@
         ) a
         LEFT JOIN sys_user u ON u.id = a.modifier
         AND u.is_deleted = 'N'
-        LEFT JOIN med_appeal_info appeal ON a.id = appeal.qcresult_detail_id
-        AND appeal.is_deleted = 'N'
-        LEFT JOIN med_appeal_examine_info examine ON examine.appeal_info_id = appeal.id
+        LEFT JOIN (
+        SELECT
+        appeal.id,
+        appeal.qcresult_detail_id,
+        appeal.appeal_operation_type,
+        examine.example_status
+        FROM
+        med_appeal_info appeal
+        JOIN med_appeal_examine_info examine ON examine.appeal_info_id = appeal.id
+        AND examine.example_status = 2
+        WHERE
+        appeal.is_deleted = 'N'
+        ) appeal ON a.id = appeal.qcresult_detail_id
     </select>
 
     <select id="getForeignMsg" resultType="com.diagbot.dto.MsgDTO">