申诉记录,申诉审核删除时间倒序处理

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

@@ -15,7 +15,6 @@ import com.lantone.report.enums.AppealOperationTypeEnum;
 import com.lantone.report.enums.ExampleStatusEnum;
 import com.lantone.report.facade.base.AppealExamineInfoFacade;
 import com.lantone.report.facade.base.AppealInfoFacade;
-import com.lantone.report.vo.ApprovedVo;
 import com.lantone.report.vo.GetAppealInfoVO;
 import com.lantone.report.vo.GetAppealReviewVO;
 import com.lantone.report.vo.GetAuditNumberVO;
@@ -27,10 +26,14 @@ import org.springframework.stereotype.Component;
 import java.util.Date;
 
 /**
- * @Description:申述记录
- * @Author: songxl
- * @Date 2022/1/5
+ * <p>
+ * 申诉审核
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2022/2/24
  */
+
 @Component
 public class MedAppealExamineInfoManagementFacade {
     @Autowired
@@ -39,8 +42,10 @@ public class MedAppealExamineInfoManagementFacade {
     private AppealInfoFacade appealInfoFacade;
     @Autowired
     MedAppealInfoManagementFacade medAppealInfoManagementFacade;
+
     /**
-     * 申诉记录
+     * 申诉记录列表
+     *
      * @param getComplaintRecordVO
      * @return
      */
@@ -50,6 +55,7 @@ public class MedAppealExamineInfoManagementFacade {
 
     /**
      * 申诉审核列表
+     *
      * @param getAppealReviewVO
      * @return
      */
@@ -57,189 +63,9 @@ public class MedAppealExamineInfoManagementFacade {
         return appealExamineInfoFacade.getBaseMapper().getAppealReview(getAppealReviewVO);
     }
 
-/*
-    */
-/**
-     * 审核通过
-     * @param approvedVo
-     * @return
-     *//*
-
-    public Boolean approved (ApprovedVo approvedVo) {
-        QcresultVO qcresultVO = new QcresultVO();
-        qcresultVO.setBehospitalCode(approvedVo.getBehospitalCode());
-        qcresultVO.setHospitalId(approvedVo.getHospitalId());
-        QcResultAlgVO qcResultAlgVO = new QcResultAlgVO();
-        qcResultAlgVO.setCasesId(approvedVo.getCasesId());
-        qcResultAlgVO.setScore(approvedVo.getValue());
-        qcResultAlgVO.setMsg(approvedVo.getCasesEntryMsg());
-        //获取处理方式
-        String handling = approvedVo.getExampleOperation();
-        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()) {
-                Boolean appealInfo = updateAppealInfo(approvedVo);
-                AppealExamineInfo appealExamineInfo = new AppealExamineInfo();
-                appealExamineInfo.setExampleOperation("2");
-                appealExamineInfo.setExampleStatus("2");
-                appealExamineInfo.setRemark(approvedVo.getRemark());
-                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.fail("审核通过失败!");
-                    return false;
-                }
-            } else {
-                Asserts.fail("删除失败!");
-                return false;
-            }
-        }
-        if (StringUtil.isNotEmpty(handling) && handling.equals("修改")) {
-            //调用修改接口
-            qcResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
-            qcresultVO.setOptResultAlgVO(qcResultAlgVO);
-            RespDTO<AnalyzeDTO> analyzeDTORespDTO = medAppealExamineInfoServiceClient.updCase(qcresultVO);
-            if (analyzeDTORespDTO.data.getIsSuccess()) {
-                Boolean appealInfo = updateAppealInfo(approvedVo);
-                AppealExamineInfo appealExamineInfo = new AppealExamineInfo();
-                appealExamineInfo.setExampleOperation("1");
-                appealExamineInfo.setExampleStatus("2");
-                appealExamineInfo.setRemark(approvedVo.getRemark());
-                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.fail("审核通过失败!");
-                    return false;
-                }
-            } else {
-                Asserts.fail("修改!");
-                return false;
-            }
-        }
-        if (StringUtil.isNotEmpty(handling) && handling.equals("新增已有")) {
-            qcResultAlgVO.setCasesEntryId(approvedVo.getCasesEntryId());
-            qcresultVO.setOptResultAlgVO(qcResultAlgVO);
-            //判断是否已存在该条目
-            MedQcresultDetail qcresultDetail = medQcresultDetailFacade.getBaseMapper().selectOne(new QueryWrapper<MedQcresultDetail>()
-                    .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("hospital_id", approvedVo.getHospitalId())
-                    .eq("behospital_code", approvedVo.getBehospitalCode())
-                    .eq("cases_entry_id", approvedVo.getCasesEntryId())
-            );
-            if (qcresultDetail != null) {
-                Asserts.fail("该条目已存在");
-                return false;
-            }
-            //调用新增接口
-            RespDTO<AnalyzeDTO> analyzeDTORespDTO = medAppealExamineInfoServiceClient.addCase(qcresultVO);
-            if (analyzeDTORespDTO.data.getIsSuccess()) {
-                AppealInfo appealInfo = new AppealInfo();
-                appealInfo.setCasesEntryId(approvedVo.getCasesEntryId());
-                appealInfo.setCasesEntryMsg(approvedVo.getCasesEntryMsg());
-                appealInfo.setCasesEntryName(approvedVo.getCasesEntryName());
-                appealInfo.setValue(approvedVo.getValue());
-                int appealInfoUpdate = appealInfoFacade.getBaseMapper().update(appealInfo, new QueryWrapper<AppealInfo>()
-                        .eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .eq("hospital_id", approvedVo.getHospitalId())
-                        .eq("behospital_code", approvedVo.getBehospitalCode())
-                        .eq("id", approvedVo.getAppealId())
-                );
-                AppealExamineInfo appealExamineInfo = new AppealExamineInfo();
-                appealExamineInfo.setExampleOperation("3");
-                appealExamineInfo.setExampleStatus("2");
-                appealExamineInfo.setRemark(approvedVo.getRemark());
-                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 (appealInfoUpdate == 1 && appealExamineInfoUpdate == 1) {
-                    return true;
-                } else {
-                    Asserts.fail("审核通过失败!");
-                    return false;
-                }
-            } else {
-                Asserts.fail("新增失败!");
-                return false;
-            }
-        }
-        if (StringUtil.isNotEmpty(handling) && handling.equals("恢复")) {
-            qcResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
-            qcresultVO.setOptResultAlgVO(qcResultAlgVO);
-            qcresultVO.setDelStatus(0);
-            //调用删除接口
-            RespDTO<AnalyzeDTO> analyzeDTORespDTO = medAppealExamineInfoServiceClient.logicDelCase(qcresultVO);
-            if (analyzeDTORespDTO.data.getIsSuccess()) {
-                Boolean appealInfo = updateAppealInfo(approvedVo);
-                AppealExamineInfo appealExamineInfo = new AppealExamineInfo();
-                appealExamineInfo.setExampleOperation("5");
-                appealExamineInfo.setExampleStatus("2");
-                appealExamineInfo.setRemark(approvedVo.getRemark());
-                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.fail("审核通过失败!");
-                    return false;
-                }
-            } else {
-                Asserts.fail("恢复失败!");
-                return false;
-            }
-        }
-        if (StringUtil.isNotEmpty(handling) && handling.equals("新增缺失")) {
-            qcResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
-            qcresultVO.setOptResultAlgVO(qcResultAlgVO);
-            qcresultVO.setDelStatus(0);
-            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.fail("审核通过失败!");
-                return false;
-            }
-        }
-            Asserts.fail("无此类型处理方式!");
-            return false;
-    }
-*/
-
-
     /**
      * 驳回
+     *
      * @param rejectedVo
      * @return
      */
@@ -251,7 +77,7 @@ public class MedAppealExamineInfoManagementFacade {
                 .eq("hospital_id", rejectedVo.getHospitalId())
                 .eq("behospital_code", rejectedVo.getBehospitalCode())
                 .eq("check_id", rejectedVo.getAppealId())
-                .eq("id",rejectedVo.getId())
+                .eq("id", rejectedVo.getId())
         );
         AppealExamineInfo appealExamineInfo = new AppealExamineInfo();
         appealExamineInfo.setExampleStatus(ExampleStatusEnum.REJECT_EXAMPLE.getKey());
@@ -262,9 +88,9 @@ public class MedAppealExamineInfoManagementFacade {
                 .eq("appeal_info_id", rejectedVo.getId())
                 .eq("check_id", rejectedVo.getAppealId())
         );
-        if(appealInfoUpdate==1 && appealExamineInfoUpdate==1){
+        if (appealInfoUpdate == 1 && appealExamineInfoUpdate == 1) {
             return true;
-        }else {
+        } else {
             Asserts.fail("驳回失败!");
             return false;
         }
@@ -272,6 +98,7 @@ public class MedAppealExamineInfoManagementFacade {
 
     /**
      * 获取待审核数量
+     *
      * @param getAuditNumberVO
      * @return
      */
@@ -283,19 +110,21 @@ public class MedAppealExamineInfoManagementFacade {
         );
         return count;
     }
+
     /**
      * 审核查看
+     *
      * @param getAppealInfoVO
      * @return
      */
     public GetAppealInfoDTO getApprovedView(GetAppealInfoVO getAppealInfoVO) {
         //1.获取病历基本信息和病历内容
-        GetAppealInfoDTO getAppealInfoDTO =  appealInfoFacade.getBaseMapper().getAppealInfo(getAppealInfoVO);
+        GetAppealInfoDTO getAppealInfoDTO = appealInfoFacade.getBaseMapper().getAppealInfo(getAppealInfoVO);
         //2.获取该条申诉记录详情
         AppealInfo appealInfo = appealInfoFacade.getById(getAppealInfoVO.getId());
-        if(appealInfo!=null){
+        if (appealInfo != null) {
             //如果是新增缺失，获取申诉说明（通过申诉说明区别该病历新增的新增缺失）
-            if(AppealOperationTypeEnum.ADD_NO_EXIST.getKey().equals(appealInfo.getAppealOperationType())){
+            if (AppealOperationTypeEnum.ADD_NO_EXIST.getKey().equals(appealInfo.getAppealOperationType())) {
                 getAppealInfoVO.setAppealExplain(appealInfo.getAppealExplain());
             }
         }
@@ -304,18 +133,4 @@ public class MedAppealExamineInfoManagementFacade {
         return getAppealInfoDTO;
     }
 
-    public Boolean updateAppealInfo (ApprovedVo approvedVo) {
-        AppealInfo appealInfo = new AppealInfo();
-        int appealInfoUpdate = appealInfoFacade.getBaseMapper().update(appealInfo, new UpdateWrapper<AppealInfo>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", approvedVo.getHospitalId())
-                .eq("behospital_code", approvedVo.getBehospitalCode())
-                .eq("id", approvedVo.getAppealId())
-        );
-        if(appealInfoUpdate==1){
-            return true;
-        }else {
-            return false;
-        }
-    }
 }

report-service/src/main/java/com/lantone/report/mapper/AppealExamineInfoMapper.java

@@ -16,24 +16,27 @@ import org.apache.ibatis.annotations.Param;
  * </p>
  */
 public interface AppealExamineInfoMapper extends BaseMapper<AppealExamineInfo> {
-     /**
-      * 申诉记录
-      * @param getComplaintRecordVO
-      * @return
-      */
-     Page<GetComplaintRecordDTO> getComplaintRecord(@Param("getComplaintRecordVO") GetComplaintRecordVO getComplaintRecordVO);
+    /**
+     * 申诉记录
+     *
+     * @param getComplaintRecordVO
+     * @return
+     */
+    Page<GetComplaintRecordDTO> getComplaintRecord(@Param("getComplaintRecordVO") GetComplaintRecordVO getComplaintRecordVO);
 
-     /**
-      * 申诉审核列表
-      * @param getAppealReviewVO
-      * @return
-      */
-     Page<GetAppealReviewDTO> getAppealReview(@Param("getAppealReviewVO") GetAppealReviewVO getAppealReviewVO) ;
+    /**
+     * 申诉审核列表
+     *
+     * @param getAppealReviewVO
+     * @return
+     */
+    Page<GetAppealReviewDTO> getAppealReview(@Param("getAppealReviewVO") GetAppealReviewVO getAppealReviewVO);
 
-     /**
-      * 审核通过
-      * @param approvedVo
-      * @return
-      */
-     Boolean approved(@Param("approvedVo") ApprovedVo approvedVo) ;
+    /**
+     * 审核通过
+     *
+     * @param approvedVo
+     * @return
+     */
+    Boolean approved(@Param("approvedVo") ApprovedVo approvedVo);
 }

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

@@ -27,12 +27,12 @@ import org.springframework.web.bind.annotation.RestController;
  * 申诉审核 前端控制器
  * </p>
  *
- * @author wangfeng
- * @since 2020-07-06
+ * @author zhanghang
+ * @since 2022/2/24
  */
 @RestController
 @RequestMapping("/medAppealExamineInInfoManage")
-@Api(value = "申诉审核数据模块相关接口API", tags = { "申诉审核数据模块相关接口API" })
+@Api(value = "申诉审核数据模块相关接口API", tags = {"申诉审核数据模块相关接口API"})
 public class MedAppealExamineInfoManagementController {
     @Autowired
     MedAppealExamineInfoManagementFacade medAppealExamineInfoManagementFacade;
@@ -53,13 +53,6 @@ public class MedAppealExamineInfoManagementController {
         return CommonResult.success(appealReview);
     }
 
-    /*    @ApiOperation(value = "审核通过[by:zhanghang]",
-                notes = "审核通过")
-        @PostMapping("/approved")
-        @Transactional
-        public CommonResult<Boolean> approved(@RequestBody ApprovedVo approvedVo) {
-           return CommonResult.success(medAppealExamineInfoManagementFacade.approved(approvedVo));
-        }*/
     @ApiOperation(value = "驳回[by:zhanghang]",
             notes = "驳回")
     @PostMapping("/rejected")

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

@@ -74,8 +74,6 @@
         <if test="getComplaintRecordVO.name != null and getComplaintRecordVO.name != '' ">
             <![CDATA[ AND c.linkman like concat('%',#{getComplaintRecordVO.name},'%')]]>
         </if>
-        ORDER BY
-        a.claimant_gmt_create DESC
     </select>
 
     <select id="getAppealReview" resultType="com.lantone.report.dto.GetAppealReviewDTO">
@@ -145,8 +143,6 @@
         <if test="getAppealReviewVO.name != null and getAppealReviewVO.name != '' ">
             <![CDATA[ AND b.linkman like concat('%',#{getAppealReviewVO.name},'%')]]>
         </if>
-        ORDER BY
-        a.claimant_gmt_create DESC
     </select>