申诉驳回v2.2.0审核相关功能提交

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

@@ -82,13 +82,13 @@ public class MedAppealExamineInfoManagementFacade {
         qcResultAlgVO.setMsg(approvedVo.getCasesEntryMsg());
         //获取处理方式
         String handling = approvedVo.getExampleOperation();
-        if(StringUtil.isNotEmpty(handling) && handling.equals("删除")){
+        if (StringUtil.isNotEmpty(handling) && handling.equals("删除")) {
             //调用删除接口
             qcResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
             qcresultVO.setOptResultAlgVO(qcResultAlgVO);
             qcresultVO.setDelStatus(1);
             RespDTO<AnalyzeDTO> analyzeDTORespDTO = medAppealExamineInfoServiceClient.logicDelCase(qcresultVO);
-            if(analyzeDTORespDTO.data.getIsSuccess()){
+            if (analyzeDTORespDTO.data.getIsSuccess()) {
                 Boolean appealInfo = updateAppealInfo(approvedVo);
                 AppealExamineInfo appealExamineInfo = new AppealExamineInfo();
                 appealExamineInfo.setExampleOperation("2");
@@ -100,23 +100,23 @@ public class MedAppealExamineInfoManagementFacade {
                         .eq("appeal_info_id", approvedVo.getId())
                         .eq("check_id", approvedVo.getAppealId())
                 );
-                if(appealInfo && appealExamineInfoUpdate==1){
-                    return  true;
-                }else {
+                if (appealInfo && appealExamineInfoUpdate == 1) {
+                    return true;
+                } else {
                     Asserts.fail2("审核通过失败!");
                     return false;
                 }
-            }else {
+            } else {
                 Asserts.fail2("删除失败!");
                 return false;
             }
         }
-        if(StringUtil.isNotEmpty(handling) && handling.equals("修改")){
+        if (StringUtil.isNotEmpty(handling) && handling.equals("修改")) {
             //调用修改接口
             qcResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
             qcresultVO.setOptResultAlgVO(qcResultAlgVO);
             RespDTO<AnalyzeDTO> analyzeDTORespDTO = medAppealExamineInfoServiceClient.updCase(qcresultVO);
-            if(analyzeDTORespDTO.data.getIsSuccess()){
+            if (analyzeDTORespDTO.data.getIsSuccess()) {
                 Boolean appealInfo = updateAppealInfo(approvedVo);
                 AppealExamineInfo appealExamineInfo = new AppealExamineInfo();
                 appealExamineInfo.setExampleOperation("1");
@@ -128,18 +128,18 @@ public class MedAppealExamineInfoManagementFacade {
                         .eq("appeal_info_id", approvedVo.getId())
                         .eq("check_id", approvedVo.getAppealId())
                 );
-                if(appealInfo && appealExamineInfoUpdate==1){
-                    return  true;
-                }else {
+                if (appealInfo && appealExamineInfoUpdate == 1) {
+                    return true;
+                } else {
                     Asserts.fail2("审核通过失败!");
                     return false;
                 }
-            }else {
+            } else {
                 Asserts.fail2("修改!");
                 return false;
             }
         }
-        if(StringUtil.isNotEmpty(handling) && handling.equals("新增已有")){
+        if (StringUtil.isNotEmpty(handling) && handling.equals("新增已有")) {
             qcResultAlgVO.setCasesEntryId(approvedVo.getCasesEntryId());
             qcresultVO.setOptResultAlgVO(qcResultAlgVO);
             //判断是否已存在该条目
@@ -149,13 +149,13 @@ public class MedAppealExamineInfoManagementFacade {
                     .eq("behospital_code", approvedVo.getBehospitalCode())
                     .eq("cases_entry_id", approvedVo.getCasesEntryId())
             );
-            if(qcresultDetail!=null){
+            if (qcresultDetail != null) {
                 Asserts.fail2("该条目已存在");
                 return false;
             }
             //调用新增接口
             RespDTO<AnalyzeDTO> analyzeDTORespDTO = medAppealExamineInfoServiceClient.addCase(qcresultVO);
-            if(analyzeDTORespDTO.data.getIsSuccess()){
+            if (analyzeDTORespDTO.data.getIsSuccess()) {
                 AppealInfo appealInfo = new AppealInfo();
                 appealInfo.setCasesEntryId(approvedVo.getCasesEntryId());
                 appealInfo.setCasesEntryMsg(approvedVo.getCasesEntryMsg());
@@ -178,24 +178,24 @@ public class MedAppealExamineInfoManagementFacade {
                         .eq("appeal_info_id", approvedVo.getId())
                         .eq("check_id", approvedVo.getAppealId())
                 );
-                if(appealInfoUpdate==1 && appealExamineInfoUpdate==1){
-                    return  true;
-                }else {
+                if (appealInfoUpdate == 1 && appealExamineInfoUpdate == 1) {
+                    return true;
+                } else {
                     Asserts.fail2("审核通过失败!");
                     return false;
                 }
-            }else {
+            } else {
                 Asserts.fail2("新增失败!");
                 return false;
             }
         }
-        if(StringUtil.isNotEmpty(handling) && handling.equals("恢复")){
+        if (StringUtil.isNotEmpty(handling) && handling.equals("恢复")) {
             qcResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
             qcresultVO.setOptResultAlgVO(qcResultAlgVO);
             qcresultVO.setDelStatus(0);
             //调用删除接口
-            RespDTO<AnalyzeDTO> analyzeDTORespDTO = medAppealExamineInfoServiceClient.updCase(qcresultVO);
-            if(analyzeDTORespDTO.data.getIsSuccess()){
+            RespDTO<AnalyzeDTO> analyzeDTORespDTO = medAppealExamineInfoServiceClient.logicDelCase(qcresultVO);
+            if (analyzeDTORespDTO.data.getIsSuccess()) {
                 Boolean appealInfo = updateAppealInfo(approvedVo);
                 AppealExamineInfo appealExamineInfo = new AppealExamineInfo();
                 appealExamineInfo.setExampleOperation("5");
@@ -207,50 +207,44 @@ public class MedAppealExamineInfoManagementFacade {
                         .eq("appeal_info_id", approvedVo.getId())
                         .eq("check_id", approvedVo.getAppealId())
                 );
-                if(appealInfo && appealExamineInfoUpdate==1){
-                    return  true;
-                }else {
+                if (appealInfo && appealExamineInfoUpdate == 1) {
+                    return true;
+                } else {
                     Asserts.fail2("审核通过失败!");
                     return false;
                 }
-            }else {
+            } else {
                 Asserts.fail2("恢复失败!");
                 return false;
             }
         }
-        if(StringUtil.isNotEmpty(handling) && handling.equals("新增缺失")){
+        if (StringUtil.isNotEmpty(handling) && handling.equals("新增缺失")) {
             qcResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
             qcresultVO.setOptResultAlgVO(qcResultAlgVO);
             qcresultVO.setDelStatus(0);
-            //调用删除接口
-            RespDTO<AnalyzeDTO> analyzeDTORespDTO = medAppealExamineInfoServiceClient.updCase(qcresultVO);
-            if(analyzeDTORespDTO.data.getIsSuccess()){
-                Boolean appealInfo = updateAppealInfo(approvedVo);
-                AppealExamineInfo appealExamineInfo = new AppealExamineInfo();
-                appealExamineInfo.setExampleOperation("4");
-                appealExamineInfo.setExampleStatus("2");
-                appealExamineInfo.setProcessResult(approvedVo.getProcessResult());
-                appealExamineInfo.setAppealInfoId(approvedVo.getAppealId());
-                int appealExamineInfoUpdate = appealExamineInfoFacade.getBaseMapper().update(appealExamineInfo, new QueryWrapper<AppealExamineInfo>()
-                        .eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .eq("appeal_info_id", approvedVo.getId())
-                        .eq("check_id", approvedVo.getAppealId())
-                );
-                if(appealInfo && appealExamineInfoUpdate==1){
-                    return  true;
-                }else {
-                    Asserts.fail2("审核通过失败!");
-                    return false;
-                }
-            }else {
-                Asserts.fail2("恢复失败!");
+            Boolean appealInfo = updateAppealInfo(approvedVo);
+            AppealExamineInfo appealExamineInfo = new AppealExamineInfo();
+            appealExamineInfo.setExampleOperation("4");
+            appealExamineInfo.setExampleStatus("2");
+            appealExamineInfo.setProcessResult(approvedVo.getProcessResult());
+            appealExamineInfo.setAppealInfoId(approvedVo.getAppealId());
+            int appealExamineInfoUpdate = appealExamineInfoFacade.getBaseMapper().update(appealExamineInfo, new QueryWrapper<AppealExamineInfo>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("appeal_info_id", approvedVo.getId())
+                    .eq("check_id", approvedVo.getAppealId())
+            );
+            if (appealInfo && appealExamineInfoUpdate == 1) {
+                return true;
+            } else {
+                Asserts.fail2("审核通过失败!");
                 return false;
             }
         }
-        Asserts.fail2("无此类型处理方式!");
-        return false;
+            Asserts.fail2("无此类型处理方式!");
+            return false;
     }
 
+
     /**
      * 驳回
      * @param rejectedVo

report-service/src/main/java/com/lantone/report/web/MedAppealExamineInfoManagementController.java

@@ -54,13 +54,13 @@ public class MedAppealExamineInfoManagementController {
         GetAuditDTO audit = medAppealExamineInfoManagementFacade.getAudit(getAuditVO);
         return RespDTO.onSuc(audit);
     }
-    @ApiOperation(value = "审核通过[by:zhanghang]",
+/*    @ApiOperation(value = "审核通过[by:zhanghang]",
             notes = "审核通过")
     @PostMapping("/approved")
     @Transactional
     public RespDTO<Boolean> approved(@RequestBody ApprovedVo approvedVo) {
        return RespDTO.onSuc(medAppealExamineInfoManagementFacade.approved(approvedVo));
-    }
+    }*/
     @ApiOperation(value = "驳回[by:zhanghang]",
             notes = "驳回")
     @PostMapping("/rejected")