From 8622c2c116008963864d2aa6983f6f6695a6af16 Mon Sep 17 00:00:00 2001
From: 彭锟 <pengkun@prec-tech.com>
Date: 星期三, 23 三月 2022 17:45:54 +0800
Subject: [PATCH] NFM624Rest0323修改
---
force-app/main/default/classes/NFM624Rest.cls | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/force-app/main/default/classes/NFM624Rest.cls b/force-app/main/default/classes/NFM624Rest.cls
index 9ccbc47..c935195 100644
--- a/force-app/main/default/classes/NFM624Rest.cls
+++ b/force-app/main/default/classes/NFM624Rest.cls
@@ -221,13 +221,15 @@
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
from Contact
where CManageCode__c IN: PersonManagementCodeList
+ OR Account.PlatformCode__c IN: ManagementList
+ OR Account.Management_Code__c IN: SFDCCodeList
OR Account.Parent_PlatformCode__c IN: ManagementList
OR Account.Parent_Management_Code__c IN: SFDCCodeList]; //鏍规嵁浜哄憳绠＄悊缂栫爜妫�绱㈣仈绯讳汉
Map < String, Contact > peopleMap = new Map < String, Contact > (); //鑱旂郴浜�
@@ -236,22 +238,21 @@
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 = ct.Account.Name + ' ' + ct.LastName_Encrypted__c;
// 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(ct.LastName_Encrypted__c, ct);
nameMap.put(ct.Account.parent.Name, snameMap);
}
peopleMap.put(ct.CManageCode__c, ct);
- System.debug('peopleMap'+peopleMap);
// peopleMap.put(ct.Name, ct);
//string temp = ct.Name + ct.Account.parent.Department_Class_Label__c;
// peopleMap.put(temp, ct);
}
-
+ System.debug('peopleMap'+peopleMap);
//鏌ヨ鍖婚櫌绉戝
//List<Account> AccountList = [select Id,PlatformCode__c,PlatformCode__c,Department_Class_Label__c,Name,Management_Code__c,Is_Active__c,AgentCode_Ext__c,ParentId,Parent.ParentId from Account where PlatformCode__c IN :HpCodeList OR parent.PlatformCode__c IN :HpCodeList OR PlatformCode__c IN :HpCodeList OR Management_Code__c IN :RelatedHospitalList OR Parent_Management_Code__c IN :RelatedHospitalList];
//List < Account > AccountList = [select Id, PlatformCode__c, Department_Class_Label__c, Name, Management_Code__c, Is_Active__c, AgentCode_Ext__c, ParentId, Parent.ParentId from Account where Management_Code__c IN :AccountCodeList OR Parent_Management_Code__c IN :AccountCodeList OR PlatformCode__c IN :AccountCodeList OR Parent.Parent.PlatformCode__c IN :AccountCodeList];
@@ -377,7 +378,8 @@
} else { //浜哄憳绠＄悊缂栫爜涓嶅瓨鍦�
//鎼滅储浜哄悕/涓斿湪褰撳墠鎴樼暐绉戝绉戝涓�
System.debug('浜哄憳绠＄悊缂栫爜涓嶅瓨鍦�');
- string namekey = gedata.Name;
+ string namekey = gedata.NameEncrypted;
+ system.debug('namekey----->'+namekey);
system.debug('DepartmentClasskey = '+DepartmentClasskey);
system.debug('nameMap22222222 '+nameMap);
if (nameMap.containskey(DepartmentClasskey)) { // 6 瀹屾垚 鏇存柊鎿嶄綔
@@ -485,9 +487,10 @@
} else { //浜哄憳绠＄悊缂栫爜涓嶅瓨鍦�
//鎼滅储浜哄悕/涓斿湪褰撳墠鎴樼暐绉戝绉戝涓�
System.debug('浜哄憳绠＄悊缂栫爜涓嶅瓨鍦�');
- string namekey = gedata.Name;
+ string namekey = gedata.NameEncrypted;
system.debug('DepartmentClasskey = '+DepartmentClasskey);
system.debug('nameMap22222222 '+nameMap);
+ system.debug('nameMap.containskey(DepartmentClasskey)'+nameMap.containskey(DepartmentClasskey));
if (nameMap.containskey(DepartmentClasskey)) { // 16 瀹屾垚 鏇存柊鎿嶄綔
Map < String, Contact > sMap = nameMap.get(DepartmentClasskey);
if (sMap.containsKey(namekey)) {
@@ -507,8 +510,8 @@
dpt.Name = gedata.DepartmentName;
dpt.RecordTypeId = RecordTypeMap.get(gedata.DepartmentClass);
//鍥犱负娌℃湁鍖婚櫌绠＄悊缂栫爜锛屾棤娉曟绱㈠埌鎴樼暐绉戝锛屾墍浠ュ湪缁欑瀹ょ殑鎴樼暐绉戝瀛楁璧嬪�兼椂绌烘寚閽�
- //dpt.Department_Class__c = DepartmentClassMap.get(gedata.DepartmentClass).Id;
- //dpt.ParentId = DepartmentClassMap.get(gedata.DepartmentClass).Id;
+ dpt.Department_Class__c = DepartmentClassMap.get(gedata.DepartmentClass).Id;
+ dpt.ParentId = DepartmentClassMap.get(gedata.DepartmentClass).Id;
if (string.isnotblank(personCode)) { //浜哄憳绠＄悊缂栫爜瀛樺湪
if (peopleMap.containsKey(personCode)) { //浜哄憳绠＄悊缂栫爜鏌ユ壘鏈夊�� 13 瀹屾垚
System.debug('13閫昏緫');
--
Gitblit v1.9.1