| 
					
				 | 
			
			
				@ -75,26 +75,27 @@ public class DictitemStandardExistStrategy { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            Integer unAdaptDicId = adapterDictEntryModel.getStdDictId(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            StdDictionaryModel stdDictionaryModel = stdDictionaryDao.getDictionaryName(std_version,unAdaptDicId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            StdDictionaryModel adapterDictionaryModel = stdDictionaryDao.getDictionaryName(adapter_std_version,unAdaptDicId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            String orgName = stdDictionaryModel.getName(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            for (AdapterDictEntryModel adapterDictEntry : matchList) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                if(adapterDictEntry.getStdEntryValue().contains(adapterDictEntryModel.getStdEntryValue())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    String orgDicEntryValue= adapterDictEntry.getAdapterEntryValue(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    //根据值查找出 该项目下面的字典项 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    List<StdDictionaryEntryModel> dictionaryEntryTemps = stdDictionaryEntryDao.getDictionaryEntry(adapter_std_version,orgDicEntryValue,orgName); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    if(dictionaryEntryTemps!=null&&dictionaryEntryTemps.size()>0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        String adapterInfo = "1";//查找到就默认疑似适配 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        if(dictionaryEntryTemps.size()==1){//查找到的条数为1,则为完全适配 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            adapterInfo = "2"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if(stdDictionaryModel!=null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                String orgName = stdDictionaryModel.getName(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                for (AdapterDictEntryModel adapterDictEntry : matchList) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    if(adapterDictEntry.getStdEntryValue().contains(adapterDictEntryModel.getStdEntryValue())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        String orgDicEntryValue= adapterDictEntry.getAdapterEntryValue(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        //根据值查找出 该项目下面的字典项 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        List<StdDictionaryEntryModel> dictionaryEntryTemps = stdDictionaryEntryDao.getDictionaryEntry(adapter_std_version,orgDicEntryValue,orgName); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        if(dictionaryEntryTemps!=null&&dictionaryEntryTemps.size()>0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            String adapterInfo = "1";//查找到就默认疑似适配 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            if(dictionaryEntryTemps.size()==1){//查找到的条数为1,则为完全适配 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                adapterInfo = "2"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            StdDictionaryEntryModel stdDictionaryEntryModel = dictionaryEntryTemps.get(0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            //保存适配 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            adapterDictEntryService.saveAdapt(adapterDictEntryModel, stdDictionaryEntryModel, version,adapterInfo); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            flag=true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            break; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        StdDictionaryEntryModel stdDictionaryEntryModel = dictionaryEntryTemps.get(0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        //保存适配 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        adapterDictEntryService.saveAdapt(adapterDictEntryModel, stdDictionaryEntryModel, version,adapterInfo); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        flag=true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        break; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if (adapterDictionaryModel != null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                adapterDictService = SpringBeanUtil.getService(AdapterDictService.BEAN_ID); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                AdapterDictModel entity = adapterDictService.getAdapterDictByCode(version, adapterDictionaryModel.getCode()); 
			 |