| 
					
				 | 
			
			
				@@ -56,8 +56,8 @@ public class MzChargeDetailController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private ZyZdAuditItemService zyZdAuditItemService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Autowired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private ZdChargeItemService zdChargeItemService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @Autowired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    private MzChargeDetailYbService mzChargeDetailYbService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    @Autowired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    private MzChargeDetailYbService mzChargeDetailYbService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Autowired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private TsmzService tsmzService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Autowired 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1319,7 +1319,7 @@ public class MzChargeDetailController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 resultMap.put("message", "缴费次数不能为空"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            int count = mzChargeDetailYbService.queryTmCount(mzChargeDetailYb); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            int count = mzPatientMiService.queryCountYbZf(mzChargeDetailYb.getPatientId(),mzChargeDetailYb.getTimes()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (count > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 String token = TokenUtil.getToken(httpServletRequest); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (StringUtils.isBlank(token)) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1356,70 +1356,70 @@ public class MzChargeDetailController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-     * 取消病人特门费用上传   不使用了 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-     * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-     * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @UserLoginToken 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @RequestMapping(value = "/cancelTmFee", method = {RequestMethod.POST}) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public Map<String, Object> cancelTmFee(@RequestBody MzChargeDetailYb mzChargeDetailYb, HttpServletRequest httpServletRequest) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        Map<String, Object> resultMap = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (mzChargeDetailYb == null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                resultMap.put("code", -1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                resultMap.put("message", "取消病人特门费用上传参数不能为空"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (StringUtils.isBlank(mzChargeDetailYb.getPatientId())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                resultMap.put("code", -1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                resultMap.put("message", "病人编码不能为空"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (mzChargeDetailYb.getTimes() == null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                resultMap.put("code", -1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                resultMap.put("message", "病人就诊次数不能为空"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (mzChargeDetailYb.getReceiptNo() == null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                resultMap.put("code", -1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                resultMap.put("message", "缴费次数不能为空"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            int count = mzChargeDetailYbService.queryTmCount(mzChargeDetailYb); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (count > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                String token = TokenUtil.getToken(httpServletRequest); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                if (StringUtils.isBlank(token)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    resultMap.put("code", -1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    resultMap.put("message", "取消病人特门费用上传失败,用户Token不存在"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                DecodedJWT decodedJWT = TokenUtil.parseJWT(token); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                User tokenUser = (User) JsonUtil.jsontoObject(decodedJWT.getSubject(), User.class); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                PayInfo result = tsmzService.retractFees(tokenUser.getUserIdCode(), mzChargeDetailYb.getPatientId(), mzChargeDetailYb.getTimes(), mzChargeDetailYb.getReceiptNo()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                if (result == null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    resultMap.put("code", -1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    resultMap.put("message", "获取特门费用失败"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                if (result.getCode() != 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    resultMap.put("code", -1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    resultMap.put("message", result.getErrorMessage()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                resultMap.put("data", result); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            resultMap.put("code", 0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            resultMap.put("message", "取消病人特门费用上传成功"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } catch (Exception e) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            e.printStackTrace(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            resultMap.put("code", -1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            resultMap.put("message", "取消病人特门费用上传失败,系统出错,请联系管理员"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            log.error("取消病人特门费用上传失败,系统异常,错误信息{}", e); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//     * 取消病人特门费用上传   不使用了 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//     * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//     * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    @UserLoginToken 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    @RequestMapping(value = "/cancelTmFee", method = {RequestMethod.POST}) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    public Map<String, Object> cancelTmFee(@RequestBody MzChargeDetailYb mzChargeDetailYb, HttpServletRequest httpServletRequest) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//        Map<String, Object> resultMap = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//        try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            if (mzChargeDetailYb == null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                resultMap.put("code", -1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                resultMap.put("message", "取消病人特门费用上传参数不能为空"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            if (StringUtils.isBlank(mzChargeDetailYb.getPatientId())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                resultMap.put("code", -1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                resultMap.put("message", "病人编码不能为空"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            if (mzChargeDetailYb.getTimes() == null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                resultMap.put("code", -1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                resultMap.put("message", "病人就诊次数不能为空"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            if (mzChargeDetailYb.getReceiptNo() == null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                resultMap.put("code", -1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                resultMap.put("message", "缴费次数不能为空"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            int count = mzChargeDetailYbService.queryTmCount(mzChargeDetailYb); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            if (count > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                String token = TokenUtil.getToken(httpServletRequest); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                if (StringUtils.isBlank(token)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                    resultMap.put("code", -1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                    resultMap.put("message", "取消病人特门费用上传失败,用户Token不存在"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                    return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                DecodedJWT decodedJWT = TokenUtil.parseJWT(token); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                User tokenUser = (User) JsonUtil.jsontoObject(decodedJWT.getSubject(), User.class); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                PayInfo result = tsmzService.retractFees(tokenUser.getUserIdCode(), mzChargeDetailYb.getPatientId(), mzChargeDetailYb.getTimes(), mzChargeDetailYb.getReceiptNo()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                if (result == null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                    resultMap.put("code", -1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                    resultMap.put("message", "获取特门费用失败"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                    return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                if (result.getCode() != 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                    resultMap.put("code", -1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                    resultMap.put("message", result.getErrorMessage()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                    return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                resultMap.put("data", result); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            resultMap.put("code", 0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            resultMap.put("message", "取消病人特门费用上传成功"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//        } catch (Exception e) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            e.printStackTrace(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            resultMap.put("code", -1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            resultMap.put("message", "取消病人特门费用上传失败,系统出错,请联系管理员"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            log.error("取消病人特门费用上传失败,系统异常,错误信息{}", e); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 |