~liucheng/OlyMEBG.git

			@@ -244,17 +244,28 @@
			for (Contact ct: peopleList) {
			if (string.isnotblank(ct.Account.parent.Name)) {
			Map < String, Contact > snameMap = new Map < String, Contact > ();
			string namekey = ct.Account.Name + ' ' + ct.LastName_Encrypted__c.trim();
			string nameKey2 = ct.Account.Management_Code__c + ' ' + ct.LastName_Encrypted__c.trim();
			string namekey;
			string nameKey2;
			if(String.isBlank(ct.MobilePhone_Encrypted__c)){
			namekey = ct.Account.Name + ' ' + ct.LastName_Encrypted__c.trim();
			nameKey2 = ct.Account.Management_Code__c + ' ' + ct.LastName_Encrypted__c.trim();
			} else{
			namekey = ct.Account.Name + ' ' + ct.LastName_Encrypted__c.trim() + ' ' + ct.MobilePhone_Encrypted__c.trim();
			nameKey2 = ct.Account.Management_Code__c + ' ' + ct.LastName_Encrypted__c.trim() + ' ' + ct.MobilePhone_Encrypted__c.trim();
			}
			// snameMap.put(namekey,ct);
			if (nameMap.containsKey(ct.Account.parent.Name)) {
			snameMap = nameMap.get(ct.Account.parent.Name);
			}
			snameMap.put(namekey, ct);
			snameMap.put(nameKey2,ct);
			// 通过姓名+手机号判断人员是否重复 thh 20220518 start
			snameMap.put(ct.LastName_Encrypted__c.trim() + ct.MobilePhone_Encrypted__c.trim(), ct);
			// 通过姓名+手机号判断人员是否重复 thh 20220518 end
			// // 通过姓名+手机号判断人员是否重复 thh 20220518 start
			// if(String.isBlank(ct.MobilePhone_Encrypted__c)){
			// snameMap.put(ct.LastName_Encrypted__c.trim(), ct);
			// } else{
			// snameMap.put(ct.LastName_Encrypted__c.trim() + ct.MobilePhone_Encrypted__c.trim(), ct);
			// }
			// // 通过姓名+手机号判断人员是否重复 thh 20220518 end
			nameMap.put(ct.Account.parent.Name, snameMap);
			system.debug('snameMap'+snameMap);
			}
			@@ -394,7 +405,8 @@
			} else { //人员管理编码不存在
			//搜索人名/且在当前战略科室科室下
			System.debug('人员管理编码不存在');
			string namekey = gedata.RelatedDepartment + ' ' + gedata.NameEncrypted;
			string namekey = gedata.RelatedDepartment + ' ' + gedata.NameEncrypted + ' ' + gedata.MobileEncrypted;
			string namekey1 = gedata.RelatedDepartment + ' ' + gedata.NameEncrypted;
			system.debug('DepartmentClasskey = '+DepartmentClasskey);
			system.debug('nameMap22222222 '+nameMap);
			if (nameMap.containskey(DepartmentClasskey)) { // 6 完成更新操作
			@@ -402,13 +414,16 @@
			System.debug('sMap'+sMap);
			System.debug('sMap.containsKey(namekey)'+sMap.containsKey(namekey));
			System.debug('sMap.containsKey(gedata.NameEncrypted)'+sMap.containsKey(gedata.NameEncrypted));
			if (sMap.containsKey(namekey) && sMap.get(namekey).UnifiedI_Contact_ID__c == null) {
			if (sMap.containsKey(namekey)) {
			system.debug('Id赋值'+sMap);
			ct.id = sMap.get(namekey).id;
			// 通过姓名+手机号判断人员是否重复 thh 20220518 start
			} else if(sMap.containsKey(gedata.NameEncrypted + gedata.MobileEncrypted) && sMap.get(gedata.NameEncrypted + gedata.MobileEncrypted).UnifiedI_Contact_ID__c == null){
			ct.id = sMap.get(gedata.NameEncrypted + gedata.MobileEncrypted).id;
			// 通过姓名+手机号判断人员是否重复 thh 20220518 end
			} else if (sMap.containsKey(namekey1) && sMap.get(namekey1).UnifiedI_Contact_ID__c == null) {
			ct.id = sMap.get(namekey1).id;

			// // 通过姓名+手机号判断人员是否重复 thh 20220518 start
			// } else if(sMap.containsKey(gedata.NameEncrypted + gedata.MobileEncrypted) && sMap.get(gedata.NameEncrypted + gedata.MobileEncrypted).UnifiedI_Contact_ID__c == null){
			// ct.id = sMap.get(gedata.NameEncrypted + gedata.MobileEncrypted).id;
			// // 通过姓名+手机号判断人员是否重复 thh 20220518 end
			}else { // 7 完成
			system.debug('7逻辑无人员管理编码有医院有科室人名查找无动作：新建联系人 ');
			}
			@@ -441,7 +456,7 @@
			}
			} else { //人员管理编码不存在
			system.debug('人员管理编码不存在');
			string namekey = gedata.DepartmentName+ ' ' + gedata.NameEncrypted;
			string namekey = gedata.DepartmentName + ' ' + gedata.NameEncrypted + ' ' + gedata.MobileEncrypted;
			//string namekey = gedata.AccountName + ' ' + gedata.DepartmentName + ' ' + gedata.DepartmentClass + ' ' + gedata.Name;
			system.debug('DepartmentClasskey'+DepartmentClasskey);
			system.debug('351nameMap '+nameMap);
			@@ -450,8 +465,8 @@
			system.debug('战略科室存在' + nameMap.get(DepartmentClasskey));
			Map < String, Contact > sMap = nameMap.get(DepartmentClasskey);
			system.debug('namekey'+namekey);
			system.debug('sMap.containsKey(namekey)'+sMap.containsKey(namekey) );
			if (sMap.containsKey(namekey) && sMap.get(namekey).UnifiedI_Contact_ID__c == null) { //查找存在 8 完成
			system.debug('sMap.containsKey(namekey)'+sMap.containsKey(namekey));
			if (sMap.containsKey(namekey)) { //查找存在 8 完成
			system.debug('8逻辑');
			system.debug('该联系人存在');
			ct.id = sMap.get(namekey).id;
			@@ -460,13 +475,14 @@
			// if(sMap.containsKey(gedata.Name)){
			// ct.Id = sMap.get(gedata.Name).Id;
			// }
			// 通过姓名+手机号判断人员是否重复 thh 20220518 start
			}else if(sMap.containsKey(gedata.NameEncrypted + gedata.MobileEncrypted) && sMap.get(gedata.NameEncrypted + gedata.MobileEncrypted).UnifiedI_Contact_ID__c == null){
			system.debug('1234567890');
			ct.Id = sMap.get(gedata.NameEncrypted + gedata.MobileEncrypted).Id;
			//upsertAccountList.add(dpt);
			upsertContactList.add(ct);
			}
			// 通过姓名+手机号判断人员是否重复 thh 20220518 start
			// else if(sMap.containsKey(gedata.NameEncrypted + gedata.MobileEncrypted) && sMap.get(gedata.NameEncrypted + gedata.MobileEncrypted).UnifiedI_Contact_ID__c == null){
			// system.debug('1234567890');
			// ct.Id = sMap.get(gedata.NameEncrypted + gedata.MobileEncrypted).Id;
			// //upsertAccountList.add(dpt);
			// upsertContactList.add(ct);
			// }
			// 通过姓名+手机号判断人员是否重复 thh 20220518 end
			system.debug('contactMap ' + contactMap);
			System.debug('9逻辑');