优化撤销门诊登记

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>SiMzFeeOprnSystm</artifactId>
-    <version>3.1.1</version>
+    <version>3.1.5</version>
     <name>SiMzFeeOprnSystm</name>
     <description>SiMzFeeOprnSystm</description>
     <properties>

src/main/java/thyyxxk/simzfeeoprnsystm/service/SiMzFeeService.java

@@ -180,12 +180,13 @@ public class SiMzFeeService {
         log.info("【操作员：{}】，取消门诊挂号：\n参数：{}，\n结果：{}", request.getStaffId(), input, result);
         Integer infcode = result.getInteger(RESULT_CODE);
         logDao.insert(new SiLog(input, result, request.getPatNo(), request.getTimes(), infcode, request.getPsnNo()));
-        if (infcode == 0) {
+        String errMsg = result.getString(ERROR_MESSAGE);
+        if (infcode == 0 || (null != errMsg && errMsg.contains("不存在该就诊信息"))) {
             mzDao.clearMdtrtIdForMz(request.getPatNo(), request.getTimes(), null);
             setlinfoDao.deletePreSettleInfo(request.getPatNo(), request.getTimes());
             return ResultVoUtil.success("取消门诊挂号成功。");
         }
-        return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, result.getString(ERROR_MESSAGE));
+        return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, errMsg);
     }
 
     public ResultVo<String> uploadOutpatientInfo(MzPatientInfo mzptnt, SpcChrDiseAcct spcChrDiseAcct, SiPatInfo siPatInfo) {