退费优化

src/main/java/cn/hnthyy/thmz/controller/mz/MzChargeDetailController.java

@@ -901,24 +901,36 @@ public class MzChargeDetailController {
 
             return resultMap;
         } catch (MzException e) {
+            rollBackPartTf(ybPartFlag, mzChargeDetails);
             resultMap.put("code", -1);
             resultMap.put("message", e.getMessage());
             log.error("退费操作失败，系统异常，错误信息{}", e);
             return resultMap;
-        } catch (Exception e) {
-            if(ybPartFlag){
-                if(CollUtil.isNotEmpty(mzChargeDetails)){
-                    mzChargeDetailService.deleteChargeDetailByPatientIdAndTimes(mzChargeDetails.get(0).getPatientId(), mzChargeDetails.get(0).getTimes());
-                    mzVisitTableService.deleteByPatientIdAndTimes(mzChargeDetails.get(0).getPatientId(), mzChargeDetails.get(0).getTimes());
-                }
-            }
+        }catch (BizException e) {
+            rollBackPartTf(ybPartFlag, mzChargeDetails);
+            resultMap.put("code", -1);
+            resultMap.put("message", e.getMessage());
+            log.error("退费操作失败，系统异常，错误信息{}", e);
+            return resultMap;
+        }
+        catch (Exception e) {
+            rollBackPartTf(ybPartFlag, mzChargeDetails);
             resultMap.put("code", -1);
-            resultMap.put("message", "退费操作失败，系统出错，请联系管理员");
+            resultMap.put("message", "退费操作失败，系统错误,请联系管理员");
             log.error("退费操作失败，系统异常，错误信息{}", e);
             return resultMap;
         }
     }
 
+   public void rollBackPartTf(boolean ybPartFlag, List<MzChargeDetail> mzChargeDetails) {
+        if(ybPartFlag){
+            if(CollUtil.isNotEmpty(mzChargeDetails)){
+                mzChargeDetailService.deleteChargeDetailByPatientIdAndTimes(mzChargeDetails.get(0).getPatientId(), mzChargeDetails.get(0).getTimes());
+                mzVisitTableService.deleteByPatientIdAndTimes(mzChargeDetails.get(0).getPatientId(), mzChargeDetails.get(0).getTimes());
+            }
+        }
+    }
+
 
     /**
      * 查询病人缴费记录

src/main/java/cn/hnthyy/thmz/service/impl/thmz/TsmzServiceImpl.java

@@ -410,7 +410,7 @@ public class TsmzServiceImpl implements TsmzService {
         //Map 转成  JSONObject 字符串
         JSONObject jsonObj = new JSONObject(map);
         try {
-            String result = HttpUtil.sendHttpPost(realUrl, jsonObj.toString(), 600000);
+            String result = HttpUtil.sendHttpPost(realUrl, jsonObj.toString(), 30000);
             if (StringUtils.isBlank(result)) {
                 return null;
             }

src/main/resources/static/js/mz/toll_administration.js

@@ -696,6 +696,7 @@ function reqYb() {
                return;
            }
            if(res.code == 0){
+               successMesageSimaple('医保费用撤销成功!')
                reSiReadCard(false,tfReadType);
            }else {
                errorMesage(res)