From 0a3c181367008553cd34bc7c4deab70ba3c8bac7 Mon Sep 17 00:00:00 2001
From: 涂煌豪 <tuhuanghao@prec-tech.com>
Date: 星期四, 19 五月 2022 10:09:52 +0800
Subject: [PATCH] 客户人员重复校验修改为姓名+手机号形式
---
force-app/main/default/classes/NFM624Rest.cls | 59 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/force-app/main/default/classes/NFM624Rest.cls b/force-app/main/default/classes/NFM624Rest.cls
index f86d171..bbaf611 100644
--- a/force-app/main/default/classes/NFM624Rest.cls
+++ b/force-app/main/default/classes/NFM624Rest.cls
@@ -18,7 +18,7 @@
// global class GeDatasRest {
// public GeDatas GeDatas;
// }
-
+
global class GeDatas {
public NFMUtil.Monitoring Monitoring;
public GeData[] GeData;
@@ -101,7 +101,6 @@
}
global static void main(String rowData_Id) {
-
// Map<String,String> RecordTypeMap = new Map<String,String>();
// RecordTypeMap.put('','')
//List<RecordType> rectDpt = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and DeveloperName IN ('Department_OTH','Department_GI', 'Department_BF','Department_GYN','Department_GS','Department_URO','Department_ENT','Department_Class_ET') order by DeveloperName desc];
@@ -222,6 +221,7 @@
List < Contact > peopleList = [select Id,
Account.Name,
Department__c,
+ UnifiedI_Contact_ID__c,
Account.parent.Name,
Account.PlatformCode__c,
Account.Management_Code__c,
@@ -230,7 +230,10 @@
Account.Parent_Management_Code__c,
Account.Parent_PlatformCode__c,
CManageCode__c,
- AccountId
+ AccountId,
+ // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 start
+ MobilePhone_Encrypted__c
+ // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 end
from Contact
where CManageCode__c IN: PersonManagementCodeList
OR (Account.Parent_PlatformCode__c IN: ManagementList AND LastName_Encrypted__c IN:NameList)
@@ -249,7 +252,9 @@
}
snameMap.put(namekey, ct);
snameMap.put(nameKey2,ct);
- snameMap.put(ct.LastName_Encrypted__c.trim(), ct);
+ // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 start
+ 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);
}
@@ -396,11 +401,14 @@
Map < String, Contact > sMap = nameMap.get(DepartmentClasskey);
System.debug('sMap'+sMap);
System.debug('sMap.containsKey(namekey)'+sMap.containsKey(namekey));
- if (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) {
system.debug('Id璧嬪��'+sMap);
ct.id = sMap.get(namekey).id;
- } else if(sMap.containsKey(gedata.NameEncrypted)){
- ct.id = sMap.get(gedata.NameEncrypted).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閫昏緫 鏃犱汉鍛樼鐞嗙紪鐮� 鏈夊尰闄� 鏈夌瀹� 浜哄悕鏌ユ壘鏃� 鍔ㄤ綔锛氭柊寤鸿仈绯讳汉 ');
}
@@ -442,8 +450,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)) { //鏌ユ壘瀛樺湪 8 瀹屾垚
+ system.debug('sMap.containsKey(namekey)'+sMap.containsKey(namekey) );
+ if (sMap.containsKey(namekey) && sMap.get(namekey).UnifiedI_Contact_ID__c == null) { //鏌ユ壘瀛樺湪 8 瀹屾垚
system.debug('8閫昏緫');
system.debug('璇ヨ仈绯讳汉瀛樺湪');
ct.id = sMap.get(namekey).id;
@@ -452,11 +460,14 @@
// if(sMap.containsKey(gedata.Name)){
// ct.Id = sMap.get(gedata.Name).Id;
// }
- }else if(sMap.containsKey(gedata.NameEncrypted)){
+ // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� 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).Id;
+ 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閫昏緫');
contactMap.put(Gedata.DepartmentManagementCode2, ct);
@@ -650,19 +661,27 @@
//List<String> contactIdList = new List<String>();
for (Inquiry_form__c inquiryInfo : inquiryList) {
//contactIdList.add(inquiryInfo.ContactId__c);
- inquiryMap.put(inquiryInfo.ContactId__c, inquiryInfo.Id);
+ // map鐨刱-v鏀归�� thh 20220517 start
+ inquiryMap.put(inquiryInfo.Id, inquiryInfo.ContactId__c);
+ // map鐨刱-v鏀归�� thh 20220517 end
}
- if (contactList.size() >0 ) {
- for (Contact contactInfo : contactList) {
+ // map鐨刱-v鏀归�� thh 20220517 start
+ if (contactList.size() >0 && inquiryMap.size() > 0) {
+ for(String Id : inquiryMap.keySet()){
Inquiry_form__c inquiry = new Inquiry_form__c();
- inquiry.Id = inquiryMap.get(contactInfo.UnifiedI_Contact_ID__c); //ID
- inquiry.Hospital_Name__c = contactInfo.Account.Id; //绉戝鍚�
- inquiry.Department_Class__c = contactInfo.Strategic_dept_Class__c; //鎴樼暐绉戝鍒嗙被
- inquiry.Contact_Name__c = contactInfo.Id; //瀹㈡埛濮撳悕
- inquiry.OwnerId = contactInfo.Strategic_dept_Class__r.OwnerId; //鎵�鏈変汉
- inquiryFormList.add(inquiry);
+ for (Contact contactInfo : contactList) {
+ if(inquiryMap.get(Id) == contactInfo.UnifiedI_Contact_ID__c){
+ inquiry.Id = Id; //ID
+ inquiry.Hospital_Name__c = contactInfo.Account.Id; //绉戝鍚�
+ inquiry.Department_Class__c = contactInfo.Strategic_dept_Class__c; //鎴樼暐绉戝鍒嗙被
+ inquiry.Contact_Name__c = contactInfo.Id; //瀹㈡埛濮撳悕
+ inquiry.OwnerId = contactInfo.Strategic_dept_Class__r.OwnerId; //鎵�鏈変汉
+ inquiryFormList.add(inquiry);
+ }
+ }
}
}
+ // map鐨刱-v鏀归�� thh 20220517 end
system.debug('inquiryFormList=========>'+inquiryFormList);
if(inquiryFormList.size()>0){
update inquiryFormList;
--
Gitblit v1.9.1