| 
					
				 | 
			
			
				@@ -1165,8 +1165,10 @@ public class JcJyController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     String sampleCode = sampleCodeMap.get(ji.getSampleCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     if (StringUtils.isBlank(sampleCode)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         CodeNameEntity codeNameEntity = mzZdCommonService.queryJySampleByCode(ji.getSampleCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        sampleCode = codeNameEntity.getName(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        sampleCodeMap.put(ji.getSampleCode(), sampleCode); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        if(codeNameEntity != null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            sampleCode = codeNameEntity.getName(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            sampleCodeMap.put(ji.getSampleCode(), sampleCode); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     ji.setSampleCode(sampleCode); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 |