查询申诉模块,modeid为null的去除

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

@@ -132,20 +132,6 @@ public class MedAppealInfoManagementFacade {
                 return addAppealInfoAndExamineInfo(addAppealInfoVO);
             //新增缺失
             case "2":
-                //1.判断新增缺失是否存在（医院id+病历id+申诉说明+状态【申诉】）
-                AppealInfo notAppealInfo = getAppealInfo(addAppealInfoVO.getHospitalId(), addAppealInfoVO.getBehospitalCode()
-                        , addAppealInfoVO.getAppealExplain());
-                if (WorkFlowNodeEnum.APPEAL.getKey().equals(notAppealInfo.getWorkFlowNodeId() + "")) {
-                    Asserts.fail("该缺陷已被申诉");
-                } else {
-                    //删除申诉记录
-                    appealInfoFacade.update(new UpdateWrapper<AppealInfo>().set("is_deleted", IsDeleteEnum.Y.getKey())
-                            .eq("id", notAppealInfo.getId()));
-                    //逻辑删除申诉审批记录
-                    appealExamineInfoFacade.update(new UpdateWrapper<AppealExamineInfo>()
-                            .set("is_deleted", IsDeleteEnum.Y.getKey())
-                            .eq("appeal_info_id", notAppealInfo.getId()));
-                }
                 //补全缺失模块信息
                 if (StringUtil.isNotBlank(addAppealInfoVO.getModeName())) {
                     //获取模块名称
@@ -154,6 +140,23 @@ public class MedAppealInfoManagementFacade {
                         addAppealInfoVO.setModeId(modeId);
                     }
                 }
+                //1.判断新增缺失是否存在（医院id+病历id+申诉说明+状态【申诉】）
+                AppealInfo notAppealInfo = getAppealInfo(addAppealInfoVO.getHospitalId(), addAppealInfoVO.getBehospitalCode()
+                        , addAppealInfoVO.getAppealExplain());
+                //申诉记录不存在
+                if (notAppealInfo != null) {
+                    if (WorkFlowNodeEnum.APPEAL.getKey().equals(notAppealInfo.getWorkFlowNodeId() + "")) {
+                        Asserts.fail("该缺陷已被申诉");
+                    } else {
+                        //删除申诉记录
+                        appealInfoFacade.update(new UpdateWrapper<AppealInfo>().set("is_deleted", IsDeleteEnum.Y.getKey())
+                                .eq("id", notAppealInfo.getId()));
+                        //逻辑删除申诉审批记录
+                        appealExamineInfoFacade.update(new UpdateWrapper<AppealExamineInfo>()
+                                .set("is_deleted", IsDeleteEnum.Y.getKey())
+                                .eq("appeal_info_id", notAppealInfo.getId()));
+                    }
+                }
 
                 //新增申诉记录+审核记录
                 return addAppealInfoAndExamineInfo(addAppealInfoVO);

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

@@ -140,6 +140,7 @@
         a.is_deleted = 'N'
         AND a.hospital_id = #{getAppealModeVo.hospitalId}
         AND a.hospital_id = b.hospital_id
+        AND a.mode_id IS NOT NULL
         <if test="getAppealModeVo.claimantId != null ">
             AND a.claimant_id = #{getAppealModeVo.claimantId}
         </if>