| 
					
				 | 
			
			
				@ -480,7 +480,8 @@ public class EntranceService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                wlyyOutpatientVO.setPatient(patNo); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                wlyyOutpatientVO.setPatientName(patientName); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                wlyyOutpatientVO.setConNo(null == jsonObjectMgsInfo.get("CON_NO") ? "" : jsonObjectMgsInfo.get("CON_NO") + ""); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                wlyyOutpatientVO.setDoctor(null == jsonObjectMgsInfo.get("CON_DOC") ? "" : jsonObjectMgsInfo.get("CON_DOC") + ""); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                String doctor=null == jsonObjectMgsInfo.get("CON_DOC") ? "" : jsonObjectMgsInfo.get("CON_DOC") + ""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                wlyyOutpatientVO.setDoctor(doctor.trim()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                wlyyOutpatientVO.setDoctorName(null == jsonObjectMgsInfo.get("CON_DOC_NAME") ? "" : jsonObjectMgsInfo.get("CON_DOC_NAME") + ""); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                wlyyOutpatientVO.setIdcard(null == jsonObjectMgsInfo.get("social_no") ? "" : jsonObjectMgsInfo.get("social_no") + ""); 
			 |