| 
					
				 | 
			
			
				@@ -15,7 +15,6 @@ import thyyxxk.webserver.entity.inpatient.dismiss.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import thyyxxk.webserver.entity.inpatient.patient.Overview; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import thyyxxk.webserver.entity.inpatient.patient.Patient; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import thyyxxk.webserver.service.externalhttp.SiInjuryFeeUpld; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import thyyxxk.webserver.service.externalhttp.SiInjurySystem; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import thyyxxk.webserver.service.externalhttp.SiZySrvc; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import thyyxxk.webserver.utils.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -30,17 +29,17 @@ import java.util.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 public class DismissService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private final DismissDao dao; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private final SiZySrvc zySrvc; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    private final SiInjuryFeeUpld injury; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    private final SiInjuryFeeUpld injuryFeeUpld; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Value("${si-zy-fee-url}") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private String siZyFeeUrl; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Value("${si-injury-fee-url}") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private String siInjuryFeeUrl; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Autowired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public DismissService(DismissDao dao, SiZySrvc zySrvc, SiInjuryFeeUpld injury) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public DismissService(DismissDao dao, SiZySrvc zySrvc, SiInjuryFeeUpld injuryFeeUpld) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.dao = dao; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.zySrvc = zySrvc; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.injury = injury; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.injuryFeeUpld = injuryFeeUpld; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public ResultVo<Object> dismiss(Patient param) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -270,8 +269,8 @@ public class DismissService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     param.setBegntime(begntime); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     param.setEndtime(tmpendtime); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                ResultVo<String> feeCheck = injury.uploadFees(siInjuryFeeUrl, param); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                if (feeCheck.getCode() != ExceptionEnum.SUCCESS.getCode()) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                ResultVo<String> feeCheck = injuryFeeUpld.uploadFees(siInjuryFeeUrl, param); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if (feeCheck.getCode() != 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     exception.setMessage(feeCheck.getMessage()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     throw new BizException(exception); 
			 |