|  | @ -584,23 +584,23 @@ public class EntranceService {
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |                 String icdcodes = "";
 | 
	
		
			
				|  |  |                 String icdNames = "";
 | 
	
		
			
				|  |  |                 if(icdName.length>0){
 | 
	
		
			
				|  |  |                 if(icdName.length>1){
 | 
	
		
			
				|  |  |                     icdcodes += icdName[1];
 | 
	
		
			
				|  |  |                     icdNames += icdName[0];
 | 
	
		
			
				|  |  |                 }
 | 
	
		
			
				|  |  |                 if(diagTwo.length>0){
 | 
	
		
			
				|  |  |                 if(diagTwo.length>1){
 | 
	
		
			
				|  |  |                     icdcodes += ","+diagTwo[1];
 | 
	
		
			
				|  |  |                     icdNames += ","+diagTwo[0];
 | 
	
		
			
				|  |  |                 }
 | 
	
		
			
				|  |  |                 if(diagThree.length>0){
 | 
	
		
			
				|  |  |                 if(diagThree.length>1){
 | 
	
		
			
				|  |  |                     icdcodes += ","+diagThree[1];
 | 
	
		
			
				|  |  |                     icdNames += ","+diagThree[0];
 | 
	
		
			
				|  |  |                 }
 | 
	
		
			
				|  |  |                 if(diagFour.length>0){
 | 
	
		
			
				|  |  |                 if(diagFour.length>1){
 | 
	
		
			
				|  |  |                     icdcodes += ","+diagFour[1];
 | 
	
		
			
				|  |  |                     icdNames += ","+diagFour[0];
 | 
	
		
			
				|  |  |                 }
 | 
	
		
			
				|  |  |                 if(diagFive.length>0){
 | 
	
		
			
				|  |  |                 if(diagFive.length>1){
 | 
	
		
			
				|  |  |                     icdcodes += ","+diagFive[1];
 | 
	
		
			
				|  |  |                     icdNames += ","+diagFive[0];
 | 
	
		
			
				|  |  |                 }
 | 
	
	
		
			
				|  | @ -907,6 +907,8 @@ public class EntranceService {
 | 
	
		
			
				|  |  |             hdmDo=new DictHospitalDeptDO();
 | 
	
		
			
				|  |  |             net.sf.json.JSONObject jsonObjectBody=(net.sf.json.JSONObject)object;
 | 
	
		
			
				|  |  |             String deptTypeCode=null==jsonObjectBody.get("Dept_Type_Code")?"":jsonObjectBody.get("Dept_Type_Code").toString();
 | 
	
		
			
				|  |  |             //是否为会诊科室
 | 
	
		
			
				|  |  |             String consultDeptFlag=null==jsonObjectBody.get("Consult_Dept_Flag")?"":jsonObjectBody.get("Consult_Dept_Flag").toString();
 | 
	
		
			
				|  |  |             if(StringUtils.isNotBlank(orgCodeMap.get(deptTypeCode))){
 | 
	
		
			
				|  |  |                 hdmDo.setOrgCode(orgCode);
 | 
	
		
			
				|  |  |                 hdmDo.setCode(null==jsonObjectBody.get("Dept_Code")?"":jsonObjectBody.get("Dept_Code").toString());
 |