From 8badb57ea2c82557850ad5b39281c3e8714eb119 Mon Sep 17 00:00:00 2001
From: liuyan <liuyan@prec-tech.com>
Date: 星期四, 24 十一月 2022 10:08:31 +0800
Subject: [PATCH] 科室信息漏传SPO问题
---
force-app/main/default/classes/NFM624Rest.cls | 322 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 232 insertions(+), 90 deletions(-)
diff --git a/force-app/main/default/classes/NFM624Rest.cls b/force-app/main/default/classes/NFM624Rest.cls
index 1be71db..591f2bc 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;
@@ -50,6 +50,10 @@
public Boolean AgentFlag; //缁忛攢鍟嗘爣璇�
public String ApproverID; //瀹℃牳浜哄憳鍛樺伐缂栫爜
public String DataId;//aws瀛樺偍鍑嵁
+ //閭欢624鎺ュ彛鏂板瀛楁闇�姹� 20220706 LY Start
+ public String ApproveDate; //鏅烘収鍖荤枟棣栨璁よ瘉閫氳繃鏃堕棿
+ //閭欢624鎺ュ彛鏂板瀛楁闇�姹� 20220706 LY End
+
}
@HttpPost
@@ -101,10 +105,13 @@
}
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];
Map < string, string > RecordTypeMap = new Map < string, string > (); //瀛樻斁璁板綍绫诲瀷Id
+ //for(ID temp : rectDpt){
+ //
+ //}
RecordTypeMap.put('鍛煎惛绉�', '01210000000QfmR');
RecordTypeMap.put('鍏朵粬', '01210000000Qfmb');
RecordTypeMap.put('濡囩', '01210000000QfmM');
@@ -144,17 +151,16 @@
List < String > ManagementList = new List < String > (); //鍖婚櫌銆佺瀹ゅ钩鍙扮紪鐮丩ist
List < String > StateList = new List < String > ();
List < String > CityList = new List < String > ();
+ List < String > NameList = new List < String >();
try { //鏍规嵁浼犺繃鏉ョ殑绠＄悊缂栫爜鏌ヨ濡傛灉鍙互鏌ヨ寰楀埌缁撴灉鍒欐洿鏂帮紝鏌ヨ涓嶅埌鍒欐柊澧�
List < Gedata > newGeDataList = new List < Gedata > ();
for (Gedata gedata: GeDataList) {
- //for test
- gedata.AgentFlag=false;
- // string dataComplete = verify(gedata);
- string dataComplete =null;
- // test end for pi
+ string dataComplete = verify(gedata);
+
if (!String.isBlank(dataComplete)) {
logstr += dataComplete;
rowData.Is_Error__c = 1;
+ rowData.retry_cnt__c = 0;
continue;
}
if (!gedata.AgentFlag) {
@@ -177,6 +183,9 @@
}
if (string.isnotblank(gedata.PersonManagementCode)) {
PersonManagementCodeList.add(gedata.PersonManagementCode);
+ }
+ if(String.isnotBlank(gedata.NameEncrypted)){
+ NameList.add(gedata.NameEncrypted);
}
newGeDataList.add(gedata);
System.debug('ManagementList'+ManagementList);
@@ -214,35 +223,64 @@
//鏌ヨ鑱旂郴浜�
Map < String, Map < String, Contact >> nameMap = new Map < String, Map < String, Contact >> (); //澶栧眰鎴樼暐绉戝锛屽唴灞傜瀹ゅ悕+鑱旂郴浜哄悕
List < Contact > peopleList = [select Id,
- Account.Name,
+ Account.Name,
Department__c,
+ UnifiedI_Contact_ID__c,
Account.parent.Name,
Account.PlatformCode__c,
Account.Management_Code__c,
Account.parent.Department_Class_Label__c,
- Name,
+ Name,LastName_Encrypted__c,
Account.Parent_Management_Code__c,
Account.Parent_PlatformCode__c,
CManageCode__c,
- AccountId
+ AccountId,
+ // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 start
+ MobilePhone_Encrypted__c
+ // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 end
+ ,Account.Department_Class__r.Name
from Contact
where CManageCode__c IN: PersonManagementCodeList
- OR Account.Parent_PlatformCode__c IN: ManagementList
- OR Account.Parent_Management_Code__c IN: SFDCCodeList]; //鏍规嵁浜哄憳绠＄悊缂栫爜妫�绱㈣仈绯讳汉
+ OR (Account.Parent_PlatformCode__c IN: ManagementList AND LastName_Encrypted__c IN:NameList AND UnifiedI_Contact_ID__c = null)
+ OR (Account.Parent_Management_Code__c IN: SFDCCodeList AND LastName_Encrypted__c IN:NameList AND UnifiedI_Contact_ID__c = null)
+ ORDER BY MobilePhone ASC,CManageCode__c ASC]; //鏍规嵁浜哄憳绠＄悊缂栫爜妫�绱㈣仈绯讳汉
Map < String, Contact > peopleMap = new Map < String, Contact > (); //鑱旂郴浜�
system.debug('peopleList '+peopleList);
for (Contact ct: peopleList) {
if (string.isnotblank(ct.Account.parent.Name)) {
Map < String, Contact > snameMap = new Map < String, Contact > ();
- string Name = ct.Name.replaceAll(' ','');
- string namekey = ct.Account.Name + ' ' + Name;
+ string namekey;
+ string nameKey2;
+ string nameKey3;
+ string nameKey4;
+ 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();
+ nameKey3 = ct.Account.Department_Class__r.Name + ' ' + ct.LastName_Encrypted__c.trim();
+ nameKey4 = 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();
+ nameKey3 = ct.Account.Department_Class__r.Name + ' ' + ct.LastName_Encrypted__c.trim() + ' ' + ct.MobilePhone_Encrypted__c.trim();
+ nameKey4 = 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(ct.Name, ct);
+ snameMap.put(nameKey2,ct);
+ snameMap.put(nameKey3,ct);
+ snameMap.put(nameKey4,ct);
+ // // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� 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);
}
peopleMap.put(ct.CManageCode__c, ct);
System.debug('peopleMap'+peopleMap);
@@ -286,6 +324,7 @@
List < Account > upsertAccountList = new List < Account > ();
//鑱旂郴浜篖ist锛堟洿鏂扮敤锛�
List < Contact > upsertContactList = new List < Contact > ();
+ List < Contact > upsertContactList1 = new List < Contact > ();
for (Gedata gedata: newGeDataList) {
logstr += gedata.Name;
@@ -294,32 +333,48 @@
logstr += gedata.DepartmentName;
- string comefrom = gedata.RegSource == '1' ? '鏅烘収鍖荤枟' : '鏈嶅姟瀹㈡埛绔�'; //骞冲彴鏉ユ簮
+ string comefrom = gedata.RegSource == '1' ? '鏅烘収鍖荤枟' : (gedata.RegSource == '2' ? '鏈嶅姟瀹㈡埛绔�' :'鍖绘嫇缃�'); //骞冲彴鏉ユ簮
//鏂板缓鍖婚櫌
Account hp = new Account();
//鏂板缓鑱旂郴浜�
Contact ct = new Contact();
- ct.LastName = gedata.Name;
- ct.FirstName = '';
- ct.Type__c = gedata.Type;
- ct.Type_Encrypted__c = gedata.TypeEncrypted;//add for pipl sushanhu 20220316
- ct.MobilePhone = gedata.Mobile;
- ct.RegSource__c = comefrom;
- ct.UnifiedI_Contact_ID__c = gedata.ContactId; //缁熶竴骞冲彴Id
- // //UPDATE TO AWS 瀛樺偍鐨勭粺涓�骞冲彴id
- // ct.AWS_UnifiedI_Contact_ID__c=gedata.ContactId; //缁熶竴骞冲彴Id
- ct.ServicePlatformCode__c = gedata.ServiceUserId; //鏈嶅姟骞冲彴鐢ㄦ埛Id
- ct.Contact_address__c = gedata.ContactAddress;//鑱旂郴鍦板潃
- ct.Contact_address_Encrypted__c=gedata.ContactAddressEncrypted;//鑱旂郴鍦板潃瀵嗘枃 add 20220215
- ct.Platform_disabled_representation__c = gedata.ForbiddenStatus;//骞冲彴绂佺敤鏍囪瘑
- //ct.IsFromPlatform__c = true; //鏉ヨ嚜鏅烘収鍖荤枟鍒涘缓
- ct.Ignore_Same_Name__c = true; //涓嶆槸閲嶅鐨勫鎴峰悕
- //ct.SendToComPlat__c = true;
- ct.AWS_Data_Id__c =gedata.DataId;//add 20220215 aws瀛樺偍鍑瘉
- ct.MobilePhone_Encrypted__c =gedata.MobileEncrypted;//add 20220215 鎵嬫満瀵嗘枃
- ct.LastName_Encrypted__c =gedata.NameEncrypted;//add 20220215 濮撳悕瀵嗘枃
+ if(gedata.AgentFlag){
+ //ct.FirstName = ''; 2022-4-7 yjk 娉ㄩ噴鎺�
+ ct.UnifiedI_Contact_ID__c = gedata.ContactId; //缁熶竴骞冲彴Id
+ ct.ServicePlatformCode__c = gedata.ServiceUserId; //鏈嶅姟骞冲彴鐢ㄦ埛Id
+ //ct.CManageCode__c = gedata.PersonManagementCode;//浜哄憳绠＄悊缂栫爜
+ }else{
+ ct.LastName = gedata.Name;
+ ct.FirstName = '';
+ ct.Type__c = gedata.Type;
+ ct.Type_Encrypted__c = gedata.TypeEncrypted;//add for pipl sushanhu 20220316
+ ct.MobilePhone = gedata.Mobile;
+ ct.RegSource__c = comefrom;
+ ct.UnifiedI_Contact_ID__c = gedata.ContactId; //缁熶竴骞冲彴Id
+ // //UPDATE TO AWS 瀛樺偍鐨勭粺涓�骞冲彴id
+ // ct.AWS_UnifiedI_Contact_ID__c=gedata.ContactId; //缁熶竴骞冲彴Id
+ ct.ServicePlatformCode__c = gedata.ServiceUserId; //鏈嶅姟骞冲彴鐢ㄦ埛Id
+ ct.Contact_address__c = gedata.ContactAddress;//鑱旂郴鍦板潃
+ ct.Contact_address_Encrypted__c=gedata.ContactAddressEncrypted;//鑱旂郴鍦板潃瀵嗘枃 add 20220215
+ ct.Platform_disabled_representation__c = gedata.ForbiddenStatus;//骞冲彴绂佺敤鏍囪瘑
+ //LLIU-CFF7DD 銆愬鎵樸�戝鎴蜂汉鍛樹俊鎭湁鏁�/鏃犳晥涓衡�滅┖鈥濈殑澶勭悊 LY 20220616 strat
+ if (gedata.ForbiddenStatus == false) {
+ ct.Isactive__c = '鏈夋晥';
+ }
+ //LLIU-CFF7DD 銆愬鎵樸�戝鎴蜂汉鍛樹俊鎭湁鏁�/鏃犳晥涓衡�滅┖鈥濈殑澶勭悊 LY 20220616 end
+ //ct.IsFromPlatform__c = true; //鏉ヨ嚜鏅烘収鍖荤枟鍒涘缓
+ ct.Ignore_Same_Name__c = true; //涓嶆槸閲嶅鐨勫鎴峰悕
+ //ct.SendToComPlat__c = true;
+ ct.AWS_Data_Id__c =gedata.DataId;//add 20220215 aws瀛樺偍鍑瘉
+ ct.MobilePhone_Encrypted__c =gedata.MobileEncrypted;//add 20220215 鎵嬫満瀵嗘枃
+ ct.LastName_Encrypted__c =gedata.NameEncrypted;//add 20220215 濮撳悕瀵嗘枃
+ //閭欢624鎺ュ彛鏂板瀛楁闇�姹� 20220706 LY Start
+ ct.ApproveDate__c =NFMUtil.parseDateTimeStr2Date(gedata.ApproveDate); //鏅烘収鍖荤枟棣栨璁よ瘉閫氳繃鏃堕棿
+ //閭欢624鎺ュ彛鏂板瀛楁闇�姹� 20220706 LY End
+ }
+
String personCode = gedata.PersonManagementCode;
@@ -328,7 +383,8 @@
if (gedata.AgentFlag == true) {
//鏇存柊缁忛攢鍟嗚仈绯讳汉
if (!peopleMap.containsKey(personCode)) {
- logstr += 'error:浜哄憳绠＄悊缂栫爜 [PersonManagementCode] 瀵瑰簲鐨勮仈绯讳汉涓嶅瓨鍦紝姝ゆ潯鏁版嵁璺宠繃';
+ rowData.Is_Error__c = 1;
+ logstr += 'error:浜哄憳绠＄悊缂栫爜'+personCode+'瀵瑰簲鐨勮仈绯讳汉涓嶅瓨鍦紝璇风‘璁ゃ��';
continue;
}
ct.id = peopleMap.get(personCode).id;
@@ -348,6 +404,10 @@
if ('鏈夋晥'.equals(hospital.Is_Active_Formula__c)) {
string DepartmentCode = string.isNotBlank(gedata.RelatedDepartment) ? gedata.RelatedDepartment : gedata.DepartmentManagementCode2;
string DepartmentClasskey = gedata.AccountName + ' ' + gedata.DepartmentClass;
+ system.debug('DepartmentClasskey------->'+DepartmentClasskey);
+ system.debug('DepartmentCode------->'+DepartmentCode);
+ system.debug('AccountMap------->'+AccountMap);
+ system.debug('AccountMap.containsKey(DepartmentCode)------->'+AccountMap.containsKey(DepartmentCode));
//绉戝瀛樺湪
if (AccountMap.containsKey(DepartmentCode)) {
//浜哄憳绠＄悊缂栫爜瀛樺湪
@@ -363,22 +423,52 @@
upsertContactList.add(ct);
} else { //鑱旂郴浜轰笉瀛樺湪 2 瀹屾垚
system.debug('2閫昏緫 鏈夊尰闄� 鏈夌瀹� 鏈変汉鍛樼鐞嗙紪鐮佷絾鏌ユ壘鏃犳浜� 鍔ㄤ綔锛氭姤閿�');
- logstr += 'error:浜哄憳绠＄悊缂栫爜 [PersonManagementCode] 瀵瑰簲鐨勮仈绯讳汉涓嶅瓨鍦紝姝ゆ潯鏁版嵁璺宠繃';
+ rowData.Is_Error__c = 1;
+ logstr += 'error:浜哄憳绠＄悊缂栫爜'+personCode+'瀵瑰簲鐨勮仈绯讳汉涓嶅瓨鍦紝璇风‘璁ゃ��';
continue;
}
} else { //浜哄憳绠＄悊缂栫爜涓嶅瓨鍦�
//鎼滅储浜哄悕/涓斿湪褰撳墠鎴樼暐绉戝绉戝涓�
System.debug('浜哄憳绠＄悊缂栫爜涓嶅瓨鍦�');
- string namekey = gedata.Name;
+ string namekey = gedata.RelatedDepartment + ' ' + gedata.NameEncrypted + ' ' + gedata.MobileEncrypted;
+ string namekey1 = gedata.RelatedDepartment + ' ' + gedata.NameEncrypted;
+ string namekey2 = gedata.NameEncrypted + ' ' + gedata.MobileEncrypted;
+ string namekey3 = gedata.NameEncrypted;
system.debug('DepartmentClasskey = '+DepartmentClasskey);
system.debug('nameMap22222222 '+nameMap);
if (nameMap.containskey(DepartmentClasskey)) { // 6 瀹屾垚 鏇存柊鎿嶄綔
Map < String, Contact > sMap = nameMap.get(DepartmentClasskey);
- if (sMap.containsKey(namekey)) {
+ 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) {
system.debug('Id璧嬪��'+sMap);
ct.id = sMap.get(namekey).id;
- } else { // 7 瀹屾垚
+ } 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(namekey2) && sMap.get(namekey2).UnifiedI_Contact_ID__c == null){
+ system.debug('鎴樼暐绉戝瀛樺湪绉戝涓虹┖鐢佃瘽鏈夊��');
+ ct.id = sMap.get(namekey2).id;
+ }else if(sMap.containsKey(namekey3) && sMap.get(namekey3).MobilePhone_Encrypted__c == null){
+ system.debug('鎴樼暐绉戝瀛樺湪绉戝涓虹┖鐢佃瘽鏃犲��');
+ ct.id = sMap.get(namekey3).id;
+ // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 end
+ }else { // 7 瀹屾垚
system.debug('7閫昏緫 鏃犱汉鍛樼鐞嗙紪鐮� 鏈夊尰闄� 鏈夌瀹� 浜哄悕鏌ユ壘鏃� 鍔ㄤ綔锛氭柊寤鸿仈绯讳汉 ');
+ for ( Integer i = 0; i < peopleList.size(); i++) {
+ if (peopleList[i].Account.parent.Name !=DepartmentClasskey && (peopleList[i].MobilePhone_Encrypted__c ==null || peopleList[i].MobilePhone_Encrypted__c ==gedata.MobileEncrypted)) {
+ ct.id = peopleList[i].id;
+ }
+ }
+ }
+ }else {
+ //鎴樼暐绉戝涓嶅瓨鍦紝鎵炬墜鏈哄彿涓虹┖鎴栫浉绛夌殑瀹㈡埛浜哄憳
+ for ( Integer i = 0; i < peopleList.size(); i++) {
+ if (peopleList[i].MobilePhone_Encrypted__c ==null || peopleList[i].MobilePhone_Encrypted__c ==gedata.MobileEncrypted) {
+ ct.id = peopleList[i].ID;
+ }
}
}
upsertContactList.add(ct);
@@ -403,44 +493,78 @@
//upsertContactList.add(ct);
} else { //浜哄憳绠＄悊缂栫爜鏌ユ壘鏃犲�� 4 瀹屾垚
system.debug('4閫昏緫');
- logstr += 'error:浜哄憳绠＄悊缂栫爜 [PersonManagementCode] 瀵瑰簲鐨勮仈绯讳汉涓嶅瓨鍦紝姝ゆ潯鏁版嵁璺宠繃';
+ rowData.Is_Error__c = 1;
+ logstr += 'error:浜哄憳绠＄悊缂栫爜'+personCode+'瀵瑰簲鐨勮仈绯讳汉涓嶅瓨鍦紝璇风‘璁ゃ��';
continue;
}
} else { //浜哄憳绠＄悊缂栫爜涓嶅瓨鍦�
system.debug('浜哄憳绠＄悊缂栫爜涓嶅瓨鍦�');
- string namekey = gedata.DepartmentName+ ' ' + gedata.Name;
+ //string namekey = gedata.DepartmentName + ' ' + gedata.NameEncrypted + ' ' + gedata.MobileEncrypted;
+ string namekey = DepartmentClasskey + ' ' + gedata.NameEncrypted;
+ //string namekey = gedata.DepartmentName + ' ' + gedata.NameEncrypted;
+ //string namekey = '8103587' + ' ' + gedata.NameEncrypted;
//string namekey = gedata.AccountName + ' ' + gedata.DepartmentName + ' ' + gedata.DepartmentClass + ' ' + gedata.Name;
system.debug('DepartmentClasskey'+DepartmentClasskey);
system.debug('351nameMap '+nameMap);
+ system.debug('nameMap.get(DepartmentClasskey)'+nameMap.get(DepartmentClasskey));
if (nameMap.containsKey(DepartmentClasskey)) { //鏌ユ壘鏄惁瀛樺湪璇ユ垬鐣ョ瀹�
System.debug('浜哄憳绠＄悊缂栫爜涓嶅瓨鍦ㄧ殑鎯呭喌涓嬫垬鐣ョ瀹ゅ瓨鍦�');
- system.debug('鎴樼暐绉戝瀛樺湪' + nameMap.get(DepartmentClasskey));
+ System.debug('鎴樼暐绉戝瀛樺湪' + nameMap.get(DepartmentClasskey));
Map < String, Contact > sMap = nameMap.get(DepartmentClasskey);
+ system.debug('namekey'+namekey);
+ system.debug('sMap.keySet'+sMap.keySet());
+ system.debug('sMap.containsKey(namekey)'+sMap.get(namekey));
+ //system.debug('sMap.containsKey(namekey)8103587 '+sMap.get('8103587 '+gedata.NameEncrypted));
+ //system.debug('sMap.containsKey(namekey)鍖椾含澶у绗笁鍖婚櫌 鏅绉� 鎵嬪姩鍒涘缓绉戝4'+sMap.get('鍖椾含澶у绗笁鍖婚櫌 鏅绉� 鎵嬪姩鍒涘缓绉戝4 '+gedata.NameEncrypted));
+ //if (sMap.containsKey(namekey)) { //鏌ユ壘瀛樺湪 8 瀹屾垚
if (sMap.containsKey(namekey)) { //鏌ユ壘瀛樺湪 8 瀹屾垚
system.debug('8閫昏緫');
system.debug('璇ヨ仈绯讳汉瀛樺湪');
ct.id = sMap.get(namekey).id;
- upsertAccountList.add(dpt);
+ //upsertAccountList.add(dpt);//鍙互娉ㄩ噴
upsertContactList.add(ct);
+ system.debug('list閲岀殑鑱旂郴浜轰俊鎭�'+upsertContactList);
// if(sMap.containsKey(gedata.Name)){
// ct.Id = sMap.get(gedata.Name).Id;
// }
- }else if(sMap.containsKey(gedata.Name)){
- system.debug('1234567890');
- ct.Id = sMap.get(gedata.Name).Id;
- //upsertAccountList.add(dpt);
}
+ // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� 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閫昏緫');
contactMap.put(Gedata.DepartmentManagementCode2, ct);
+ system.debug('contactMap ' + contactMap);
+ //upsertContactList.add(ct);
+ }else{
+ system.debug('鍒涘缓鑱旂郴浜哄拰绉戝');
+ //system.debug('peopleList[0]'+peopleList[0]);
+ for ( Integer i = 0; i < peopleList.size(); i++) {
+ if (peopleList[i].MobilePhone_Encrypted__c ==null) {
+ ct.id = peopleList[i].ID;
+ }
+ }
+
+ // dpt.Department_Name__c = gedata.DepartmentName;
+ // upsertAccountList.add(dpt);
+ contactMap.put(Gedata.DepartmentManagementCode2, ct);
+ system.debug('122222222222222222222contactMap'+contactMap);
+ upsertContactList.add(ct);
+ system.debug('122222222222222222222upsertContactList'+upsertContactList);
+
}
- system.debug('鍒涘缓鑱旂郴浜哄拰绉戝');
dpt.Department_Name__c = gedata.DepartmentName;
upsertAccountList.add(dpt);
- contactMap.put(Gedata.DepartmentManagementCode2, ct);
+
}
}
}else if('鏃犳晥'.equals(hospital.Is_Active_Formula__c)){
+ rowData.Is_Error__c = 1;
logstr += 'error:璇ュ尰闄㈡棤鏁堬紝姝ゆ潯鏁版嵁璺宠繃';
continue;
}else{
@@ -458,6 +582,9 @@
hp.OCM_Category__c = 'L';
hp.PlatformCode__c = gedata.HospitalManagementCode2;
hp.State_Master__c = StateMap.get(gedata.State); // 鐪�
+ //Ly 鐪佹枃鏈祴鍊� start
+ hp.State_Text__c = gedata.State; // 鐪�(鏂囨湰)
+ //Ly 鐪佹枃鏈祴鍊� end
hp.City_Master__c = CityMap.get(gedata.City); // 甯�
hp.Hospital_Source__c = '鏅烘収鍖荤枟';
upsertAccountList.add(hp);
@@ -468,21 +595,32 @@
system.debug('upsertContactList ' + upsertContactList);
system.debug('upsertAccountList ' + upsertAccountList);
if (upsertAccountList.size() > 0) {
- ControllerUtil.EscapeNFM001Trigger = true;
+ //鏀惧紑瑙﹀彂201鎺ュ彛鏉′欢 20221102 LY start
+ //ControllerUtil.EscapeNFM001Trigger = true;
+ //鏀惧紑瑙﹀彂201鎺ュ彛鏉′欢 20221102 LY end
StaticParameter.EscapeNFM001AgencyContractTrigger2 = true;
system.debug('upsertAccountList ' + upsertAccountList);
upsert upsertAccountList;
+ system.debug('SFDCCodeList'+SFDCCodeList);
+ system.debug('SFDCCodeList'+ManagementList);
List < Account > List1 = [select Id,RecordTypeId,Is_Active__c,PlatformCode__c,OCM_man_province_HP__c,OwnerId from Account where PlatformCode__c In: SFDCCodeList OR PlatformCode__c IN: ManagementList];//瀹㈡埛鎵�鏈変汉淇敼11.18 11.35 鏈畬鎴�
+ system.debug('List1'+List1);
List<Account> updateHPList = new List<Account>();
for (Account ac: List1) {
Contact c = new contact();
+ system.debug('ac.PlatformCode__c'+ac.PlatformCode__c);
+ system.debug('ContactMap'+ContactMap);
+ system.debug('ContactMap.containsKey(ac.PlatformCode__c)'+ContactMap.containsKey(ac.PlatformCode__c));
if(ContactMap.containsKey(ac.PlatformCode__c)){
+
c = contactMap.get(ac.PlatformCode__c);
if(string.isblank(c.Id)|| c.AccountId != ac.Id){
c.Accountid = ac.id;
}
c.OwnerId = ac.OwnerId;
- upsertContactList.add(c);
+ system.debug('鑱旂郴浜轰俊鎭�'+c);
+ system.debug('upsertContactList'+upsertContactList);
+ //upsertContactList.add(c);
system.debug('OwnerId'+ac.OwnerId);
system.debug('upsertContactList'+upsertContactList);
}
@@ -541,39 +679,34 @@
private static String verify(GeData gda) {
String result = '';
- if (string.isblank(gda.ContactId)) {
- result += 'DataError: ContactId 缁熶竴骞冲彴ID涓虹┖\n';
- }
- if (gda.AgentFlag == null) {
- result += 'DataError:缁忛攢鍟嗘爣璇嗕负绌篭n';
- }
- if (string.isblank(gda.Name)) {
- result += 'DataError锛氬鍚嶄负绌篭n';
- }
- if (string.isblank(gda.NameEncrypted)) {
- result += 'DataError锛氬鍚嶅瘑鏂囦负绌篭n';
- }
- if (string.isblank(gda.Mobile)) {
- result += 'DataError锛氭墜鏈哄彿涓虹┖\n';
- }
- if (string.isblank(gda.MobileEncrypted)) {
- result += 'DataError锛氭墜鏈哄彿瀵嗘枃涓虹┖\n';
- }
- if (string.isblank(gda.RegSource)) {
- result += 'DataError锛氭敞鍐屽钩鍙版潵婧愪负绌篭n';
- }if (string.isblank(gda.DataId)) {
- result += 'DataError锛欰WS鍔犲瘑鍑嵁涓虹┖\n';
- }
if (gda.AgentFlag) {
+ if (string.isblank(gda.ContactId)) {
+ result += 'DataError: ContactId 缁熶竴骞冲彴ID涓虹┖\n';
+ }
if (string.isblank(gda.PersonManagementCode)) {
result += 'DataError锛歅ersonManagementCode 浜哄憳绠＄悊缂栫爜涓虹┖\n';
}
- } else {
- // if (string.isnotblank(gda.PersonManagementCode) && string.isBlank(gda.RelatedHospital)) {
- // result += 'DataError: 鍏宠仈鍖婚櫌缂栫爜涓虹┖\n';
- // }
- if(string.isBlank(gda.RelatedDepartment) && String.isBlank(gda.ApproverID)){
- result += 'DataError: 鍦ㄥ叧鑱擲FDC绉戝[RelatedDepartment]涓虹┖鏃讹紝瀹℃牳浜哄憳鍛樺伐缂栫爜[ApproverID]蹇呭～\n';
+ if (string.isblank(gda.ServiceUserId)) {
+ result += 'ServiceUserId 鏈嶅姟骞冲彴鐢ㄦ埛Id涓虹┖\n';
+ }
+ }else{
+ if (string.isblank(gda.ContactId)) {
+ result += 'DataError: ContactId 缁熶竴骞冲彴ID涓虹┖\n';
+ }
+ if (gda.AgentFlag == null) {
+ result += 'DataError:缁忛攢鍟嗘爣璇嗕负绌篭n';
+ }
+ if (string.isblank(gda.Name)) {
+ result += 'DataError锛氬鍚嶄负绌篭n';
+ }
+ if (string.isblank(gda.Mobile)) {
+ result += 'DataError锛氭墜鏈哄彿涓虹┖\n';
+ }
+ if (string.isblank(gda.RegSource)) {
+ result += 'DataError锛氭敞鍐屽钩鍙版潵婧愪负绌篭n';
+ }
+ if(string.isBlank(gda.RelatedHospital) && String.isBlank(gda.HospitalManagementCode2) && String.isBlank(gda.ApproverID)){
+ result += 'DataError: 鏂板缓鍖婚櫌鏃讹紝瀹℃牳浜哄憳鍛樺伐缂栫爜[ApproverID]蹇呭～\n';
}
if (string.isblank(gda.HospitalManagementCode2)) {
result += 'DataError锛氬尰闄㈠钩鍙扮紪鐮佷负绌篭n';
@@ -619,19 +752,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;
@@ -672,3 +813,4 @@
}
//琛ュ厖瀛︿細閮ㄥ垎 end
}
+}
\ No newline at end of file
--
Gitblit v1.9.1