| 
					
				 | 
			
			
				@@ -1558,24 +1558,24 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             zyDetail.put("bedNo", mzZyReq.getBedNo()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             String conditionCode=null; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if(mzZyReq.getConditionCode()==1){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if(Integer.valueOf(1).equals(mzZyReq.getConditionCode())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 conditionCode="有"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }else if(mzZyReq.getConditionCode()==2){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }else if(Integer.valueOf(2).equals(mzZyReq.getConditionCode())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 conditionCode="临床未确定"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }else if(mzZyReq.getConditionCode()==3){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }else if(Integer.valueOf(3).equals(mzZyReq.getConditionCode())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 conditionCode="情况不明"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }else if(mzZyReq.getConditionCode()==4){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }else if(Integer.valueOf(4).equals(mzZyReq.getConditionCode())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 conditionCode="无"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             zyDetail.put("conditionCode",conditionCode); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             String routeOfAdmission=null; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if(mzZyReq.getConditionCode()==1){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if(Integer.valueOf(1).equals(mzZyReq.getConditionCode())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 routeOfAdmission="急诊"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }else if(mzZyReq.getConditionCode()==2){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }else if(Integer.valueOf(2).equals(mzZyReq.getConditionCode())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 routeOfAdmission="门诊"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }else if(mzZyReq.getConditionCode()==3){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }else if(Integer.valueOf(3).equals(mzZyReq.getConditionCode())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 routeOfAdmission="其他医疗机构转入"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }else if(mzZyReq.getConditionCode()==9){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }else if(Integer.valueOf(9).equals(mzZyReq.getConditionCode())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 routeOfAdmission="其他"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             zyDetail.put("routeOfAdmission",routeOfAdmission); 
			 |