|  | @@ -40,7 +40,7 @@ public class MarkMtFeesController {
 | 
	
		
			
				|  |  |          mz.setTimes(param.getTimes());
 | 
	
		
			
				|  |  |          mz.setStaffId(param.getStaffId());
 | 
	
		
			
				|  |  |          ResultVo<FundDetail> result = mzService.outpatientPreSettlement(mz);
 | 
	
		
			
				|  |  | -        return getStringObjectMap(param, result, "收费窗口获取门特报销");
 | 
	
		
			
				|  |  | +        return getStringObjectMap(param, result, "收费窗口获取门特报销", false);
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      /**
 | 
	
	
		
			
				|  | @@ -54,7 +54,7 @@ public class MarkMtFeesController {
 | 
	
		
			
				|  |  |          mz.setTimes(param.getTimes());
 | 
	
		
			
				|  |  |          mz.setStaffId(param.getStaffId());
 | 
	
		
			
				|  |  |          ResultVo<FundDetail> result = mzService.outpatientSettlement(mz);
 | 
	
		
			
				|  |  | -        return getStringObjectMap(param, result, "收费窗口门特结算");
 | 
	
		
			
				|  |  | +        return getStringObjectMap(param, result, "收费窗口门特结算", true);
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      /**
 | 
	
	
		
			
				|  | @@ -72,6 +72,7 @@ public class MarkMtFeesController {
 | 
	
		
			
				|  |  |          if (result.getCode() == ExceptionEnum.SUCCESS.getCode()) {
 | 
	
		
			
				|  |  |              map.put("code", 0);
 | 
	
		
			
				|  |  |              map.put("msg", result.getData());
 | 
	
		
			
				|  |  | +            mzService.updateMzSaved(param.getPatientId(), param.getTimes(), 0);
 | 
	
		
			
				|  |  |          } else {
 | 
	
		
			
				|  |  |              map.put("code", -1);
 | 
	
		
			
				|  |  |              map.put("msg", result.getMessage());
 | 
	
	
		
			
				|  | @@ -82,14 +83,13 @@ public class MarkMtFeesController {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      private Map<String, Object> getStringObjectMap(@RequestBody UploadMtFeeParam param,
 | 
	
		
			
				|  |  |                                                     ResultVo<FundDetail> result,
 | 
	
		
			
				|  |  | -                                                   String logText) {
 | 
	
		
			
				|  |  | +                                                   String logText, boolean settlement) {
 | 
	
		
			
				|  |  |          Map<String, Object> map = new HashMap<>();
 | 
	
		
			
				|  |  |          if (result.getCode() != ExceptionEnum.SUCCESS.getCode()) {
 | 
	
		
			
				|  |  |              map.put("code", -1);
 | 
	
		
			
				|  |  |              map.put("msg", result.getMessage());
 | 
	
		
			
				|  |  |              return map;
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | -        map.put("code", 0);
 | 
	
		
			
				|  |  |          FundDetail fund = result.getData();
 | 
	
		
			
				|  |  |          Map<String, String> payInfo = new HashMap<>();
 | 
	
		
			
				|  |  |          payInfo.put("totalCost", fund.getTotalCost());
 | 
	
	
		
			
				|  | @@ -97,7 +97,11 @@ public class MarkMtFeesController {
 | 
	
		
			
				|  |  |          payInfo.put("cashPay", fund.getCashPay());
 | 
	
		
			
				|  |  |          payInfo.put("acctPay", fund.getAcctPay());
 | 
	
		
			
				|  |  |          payInfo.put("selfPay", fund.getSelfPay());
 | 
	
		
			
				|  |  | +        map.put("code", 0);
 | 
	
		
			
				|  |  |          map.put("payInfo", payInfo);
 | 
	
		
			
				|  |  | +        if (settlement) {
 | 
	
		
			
				|  |  | +            mzService.updateMzSaved(param.getPatientId(), param.getTimes(), 1);
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  |          log.info("{}:参数:{},结果:{}", logText, param, map);
 | 
	
		
			
				|  |  |          return map;
 | 
	
		
			
				|  |  |      }
 |