取消出院结算失败时也进行取消出院办理

src/main/java/thyyxxk/webserver/dao/his/yibao/DismissDao.java

@@ -390,9 +390,6 @@ public interface DismissDao {
     @Update("update a_patient_mi set hic_no=#{hicNew} where inpatient_no=#{zyh}")
     void updateHic(@Param("zyh") String zyh, @Param("hicNew") String hicNew);
 
-    @Select("select count(1) from zy_dis_diag_yb where inpatient_no=#{inpatientNo} and admiss_times=#{admissTimes}")
-    int selectYbDisDiagCount(@Param("inpatientNo") String inpatientNo, @Param("admissTimes") Integer admissTimes);
-
     @Select("select operation from zy_actpatient where inpatient_no=#{zyh}")
     String selectOperation(@Param("zyh") String zyh);
 }

src/main/java/thyyxxk/webserver/service/medicalinsurance/SiZyService.java

@@ -507,7 +507,7 @@ public class SiZyService {
     public ResultVo<String> revokeSettlement(ZyPatientInfo p) {
         SiPatInfo siPatInfo = qrydao.selectSiPatInfoForZy(p.getInpatientNo(), p.getAdmissTimes(), p.getLedgerSn());
         if (null == siPatInfo || StringUtil.isBlank(siPatInfo.getSetlId())) {
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "此患者没有有效的医保结算信息，无法撤销结算！");
+            return revokeDischarge(p);
         }
         JSONObject input = exec.makeTradeHeader(SiFunction.REVOKE_HOSPITALIZATION_SETTLEMENT);
         JSONObject data = new JSONObject();