优化超时结算

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

@@ -439,10 +439,10 @@ public class SiMzFeeService {
         return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, result.getString(ERROR_MESSAGE));
     }
 
-    private ResultVo<FundDetail> getFundDetailByPatientInfo(String patientId, int times, boolean realSettle) {
-        SiSetlinfo sisetlinfo = mzDao.selectSettledInfo(patientId, times, 0);
+    private ResultVo<FundDetail> getFundDetailByPatientInfo(String patNo, int times, boolean realSettle) {
+        SiSetlinfo sisetlinfo = mzDao.selectSettledInfo(patNo, times, 0);
         if (!realSettle && null == sisetlinfo) {
-            sisetlinfo = setlinfoDao.selectPresettleInfo(patientId, times);
+            sisetlinfo = setlinfoDao.selectPresettleInfo(patNo, times);
         }
         if (null != sisetlinfo) {
             return getFundDetailFromSetlinfo(sisetlinfo);
@@ -555,6 +555,10 @@ public class SiMzFeeService {
         if (StringUtil.isBlank(p.getMdtrtId())) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有找到患者的医保就诊信息！");
         }
+        ResultVo<FundDetail> setlfund = getFundDetailByPatientInfo(p.getPatNo(), p.getTimes(), true);
+        if (setlfund != null) {
+            return setlfund;
+        }
         SiSetlinfo setlEntity = querySettlementInfo(p);
         if (null != setlEntity) {
             return dealSetlEntity(p, setlEntity);