Merge branch 'LEXUpgrade2023-Deloitte'

buli

2023-07-11 0c4796706fc9473d069b620321a54b20a119906c

 force-app/main/default/classes/ContactTriggerHandler.cls

@@ -2,20 +2,21 @@
 * Select Id From Contact Where RecordTypeId = '01210000000QfWdAAK' and Strategic_dept_Class__c != null
 */
public without sharing class ContactTriggerHandler extends Oly_TriggerHandler {
    private Map < Id, Contact > newMap;
    private Map < Id, Contact > oldMap;
    private List < Contact > newList;
    private List < Contact > oldList;
    private Map<Id, Contact> newMap;
    private Map<Id, Contact> oldMap;
    private List<Contact> newList;
    private List<Contact> oldList;
    private Id AgencyId = Schema.SObjectType.Contact.getRecordTypeInfosByDeveloperName().get('Agency').getRecordTypeId(); // 20220830 ljh LLIU-CHR8FF add
        

    public ContactTriggerHandler() {
        this.newMap = (Map < Id, Contact > ) Trigger.newMap;
        this.oldMap = (Map < Id, Contact > ) Trigger.oldMap;
        this.newList = (List < Contact > ) Trigger.new;
        this.oldList = (List < Contact > ) Trigger.old;
        this.newMap = (Map<Id, Contact>) Trigger.newMap;
        this.oldMap = (Map<Id, Contact>) Trigger.oldMap;
        this.newList = (List<Contact>) Trigger.new;
        this.oldList = (List<Contact>) Trigger.old;
    }
    protected override void beforeInsert() {
        if(Test.isRunningTest()||UserInfo.getUserId()!=System.Label.ByPassTrigger){ //Add by Li Jun for PIPL 20220331
        if (Test.isRunningTest() || UserInfo.getUserId() != System.Label.ByPassTrigger) {
            //Add by Li Jun for PIPL 20220331
            mobileNumberVerification();
        }
    }
@@ -24,7 +25,7 @@
        syncToAgencyContact();
        updateDealerNum();
        sendToComPlat();
        updateChargeState();// 20220830 ljh LLIU-CHR8FF
        updateChargeState(); // 20220830 ljh LLIU-CHR8FF
    }

    protected override void afterUpdate() {
@@ -40,7 +41,6 @@
        mobileNumberVerification();
    }


    protected override void afterDelete() {
        syncToAgencyContactDelete();
        updateDealerNum();
@@ -53,15 +53,13 @@
     * 根据服务技师填写情况更新客户人员上的开展工作字段
     */
    private void UpdateProcessingWork() {
        for (Contact temContact: newList) {
        for (Contact temContact : newList) {
            if (System.label.UpdateServiceHistory.equals('true')) {

                string ProcessingWork = '';
                string ProcessingWorkWithoutNumber = '';
                if (temContact.ServiceBookInput__c != 0) {
                    ProcessingWork += '维修委托书填写' + temContact.ServiceBookInput__c + '次';
                    ProcessingWorkWithoutNumber += '维修委托书填写';

                }
                if (temContact.InspectTime__c != 0) {
                    if (String.isBlank(ProcessingWork)) {
@@ -70,7 +68,6 @@
                    } else {
                        ProcessingWork += '，点检' + temContact.InspectTime__c + '次';
                        ProcessingWorkWithoutNumber += '，点检';

                    }
                }
                if (temContact.InspectEquipmentTime__c != 0) {
@@ -81,7 +78,6 @@
                        ProcessingWork += '，点检设备' + temContact.InspectEquipmentTime__c + '个';
                        ProcessingWorkWithoutNumber += '，点检设备';
                    }

                }
                if (temContact.VisitTime__c != 0) {
                    if (String.isBlank(ProcessingWork)) {
@@ -91,7 +87,6 @@
                        ProcessingWork += '，上门' + temContact.VisitTime__c + '次';
                        ProcessingWorkWithoutNumber += '，上门';
                    }

                }
                if (temContact.pollingTime__c != 0) {
                    if (String.isBlank(ProcessingWork)) {
@@ -101,7 +96,6 @@
                        ProcessingWork += '，巡检' + temContact.pollingTime__c + '次';
                        ProcessingWorkWithoutNumber += '，巡检';
                    }

                }
                if (temContact.TeachingTime__c != 0) {
                    if (String.isBlank(ProcessingWork)) {
@@ -118,43 +112,38 @@
                //}
                temContact.ProcessingWork__c = ProcessingWork;
                temContact.ProcessingWorkWithoutNumber__c = ProcessingWorkWithoutNumber;


            }
        }

    }
    // 服务技师 2018/12/24  end
    private void syncToAgencyContact() {
        System.debug('enter syncToAgencyContact');
        Map < Id, Agency_Contact__c > targetContactMap = new Map < Id, Agency_Contact__c > ();
        Map < Id, Contact > ContactMap = new Map < Id, Contact > ();
        for (Contact nObj: newList) {
            if (nObj.RecordTypeId == '01210000000QfWdAAK' // Doctor
                &&
        Map<Id, Agency_Contact__c> targetContactMap = new Map<Id, Agency_Contact__c>();
        Map<Id, Contact> ContactMap = new Map<Id, Contact>();
        for (Contact nObj : newList) {
            if (
                nObj.RecordTypeId ==
                '01210000000QfWdAAK' && // Doctor
                String.isBlank(nObj.Strategic_dept_Class__c) == false
            ) {
                if (Trigger.isInsert ||
                    (Trigger.isUpdate
                        //                        && (
                        //                            oldMap.get(nObj.Id).LastName                != nObj.LastName
                        //                         || oldMap.get(nObj.Id).FirstName               != nObj.FirstName
                        //                         || oldMap.get(nObj.Id).Strategic_dept_Class__c != nObj.Strategic_dept_Class__c
                        //                         || oldMap.get(nObj.Id).Type__c                 != nObj.Type__c
                        //                         || oldMap.get(nObj.Id).Doctor_Division1__c     != nObj.Doctor_Division1__c
                        //                        )
                    )
                ) {
                if (Trigger.isInsert || (Trigger.isUpdate)) {
                    //                        && (
                    //                            oldMap.get(nObj.Id).LastName                != nObj.LastName
                    //                         || oldMap.get(nObj.Id).FirstName               != nObj.FirstName
                    //                         || oldMap.get(nObj.Id).Strategic_dept_Class__c != nObj.Strategic_dept_Class__c
                    //                         || oldMap.get(nObj.Id).Type__c                 != nObj.Type__c
                    //                         || oldMap.get(nObj.Id).Doctor_Division1__c     != nObj.Doctor_Division1__c
                    //                        )
                    //Agency_Contact__c acObj = new Agency_Contact__c(Agency_ID__c = '000000000000000', Contact__c = nObj.Id, ContactId18__c = nObj.Id, Agency_Hospital__c = null, Name = nObj.LastName + ((String.isBlank(nObj.FirstName) == false) ? ' ' + nObj.FirstName : ''), Department_Class__c = nObj.Strategic_dept_Class__c, Type__c = nObj.Type__c, Doctor_Division1__c = nObj.Doctor_Division1__c);
                    //zhj MEBG新方案改造 2022-11-27 去掉Encrypted start
                    Agency_Contact__c acObj = new Agency_Contact__c(
                        Agency_ID__c = '000000000000000', 
                        Contact__c = nObj.Id, 
                        ContactId18__c = nObj.Id, 
                        Agency_Hospital__c = null, 
                        Agency_ID__c = '000000000000000',
                        Contact__c = nObj.Id,
                        ContactId18__c = nObj.Id,
                        Agency_Hospital__c = null,
                        Name = nObj.LastName,
                        //Name_Encrypted__c = nObj.LastName_Encrypted__c,
                        Department_Class__c = nObj.Strategic_dept_Class__c, 
                        Department_Class__c = nObj.Strategic_dept_Class__c,
                        Type__c = nObj.Type__c,
                        //Type_Encrypted__c = nObj.Type_Encrypted__c,
                        Doctor_Division1__c = nObj.Doctor_Division1__c
@@ -169,22 +158,22 @@
        if (targetContactMap.size() > 0) {
            List<Agency_Contact__c> temp = targetContactMap.values();
            upsert temp ContactId18__c;
            system.debug('temp='+temp);
            EncryptInsert(temp,ContactMap);
            system.debug('temp=' + temp);
            EncryptInsert(temp, ContactMap);
        }
    }
    
    static void EncryptInsert(List<Agency_Contact__c> aclist,Map < Id, Contact > ContactMap){
        if(!(system.isFuture() || system.isBatch())){

    static void EncryptInsert(List<Agency_Contact__c> aclist, Map<Id, Contact> ContactMap) {
        if (!(system.isFuture() || system.isBatch())) {
            //zhj MEBG新方案改造 2022-11-27 start
            //AwsServiceTool2.EncryptPushFuture(Json.serialize(aclist), 'Agency_Contact__c');

            Map<String,PIHelper.PIIntegration> staticResource = new Map<String,PIHelper.PIIntegration>();
            staticResource.put('Contact',PIHelper.getPIIntegrationInfo('Contact'));
            staticResource.put('Agency_Contact__c',PIHelper.getPIIntegrationInfo('Agency_Contact__c'));
            Map<String, Map<String, PI_Field_Policy_Detail__c>> mmsp = new Map<String, Map<String,PI_Field_Policy_Detail__c>>();
            Map<String, PIHelper.PIIntegration> staticResource = new Map<String, PIHelper.PIIntegration>();
            staticResource.put('Contact', PIHelper.getPIIntegrationInfo('Contact'));
            staticResource.put('Agency_Contact__c', PIHelper.getPIIntegrationInfo('Agency_Contact__c'));
            Map<String, Map<String, PI_Field_Policy_Detail__c>> mmsp = new Map<String, Map<String, PI_Field_Policy_Detail__c>>();
            for (String key : staticResource.keySet()) {
                mmsp.put(key, new Map<String,PI_Field_Policy_Detail__c>());
                mmsp.put(key, new Map<String, PI_Field_Policy_Detail__c>());
                for (PI_Field_Policy_Detail__c detail : staticResource.get(key).PIDetails) {
                    mmsp.get(key).put(detail.SF_Field_API_Name__c, detail);
                }
@@ -192,13 +181,13 @@

            System.debug('mmsp = ' + mmsp);
            List<AWSServiceTool2V2.EncryptPushRequestBody> EncryptPushList = new List<AWSServiceTool2V2.EncryptPushRequestBody>();
            for(Agency_Contact__c ac : aclist){
            for (Agency_Contact__c ac : aclist) {
                AWSServiceTool2V2.EncryptPushRequestBody EncryptPush = new AWSServiceTool2V2.EncryptPushRequestBody();
                EncryptPush.dataId = ac.AWS_Data_Id__c != null ?ac.AWS_Data_Id__c:'';
                EncryptPush.dataId = ac.AWS_Data_Id__c != null ? ac.AWS_Data_Id__c : '';
                EncryptPush.sfRecordId = ac.Id;
                EncryptPush.fieldsMapping = new Map<String, List<AWSServiceTool2V2.EncryptPushRes>>();
                List<AWSServiceTool2V2.EncryptPushRes> resList = new List<AWSServiceTool2V2.EncryptPushRes>();
                AWSServiceTool2V2.EncryptPushRes res= new AWSServiceTool2V2.EncryptPushRes();
                AWSServiceTool2V2.EncryptPushRes res = new AWSServiceTool2V2.EncryptPushRes();
                res.isQueryDb = true;
                res.value = '';
                res.table = staticResource.get('Contact').awsTableName;
@@ -207,7 +196,7 @@
                resList.add(res);

                List<AWSServiceTool2V2.EncryptPushRes> resList2 = new List<AWSServiceTool2V2.EncryptPushRes>();
                AWSServiceTool2V2.EncryptPushRes res2= new AWSServiceTool2V2.EncryptPushRes();
                AWSServiceTool2V2.EncryptPushRes res2 = new AWSServiceTool2V2.EncryptPushRes();
                res2.isQueryDb = true;
                res2.value = '';
                res2.table = staticResource.get('Contact').awsTableName;
@@ -216,7 +205,7 @@
                resList2.add(res2);

                List<AWSServiceTool2V2.EncryptPushRes> resList3 = new List<AWSServiceTool2V2.EncryptPushRes>();
                AWSServiceTool2V2.EncryptPushRes res3= new AWSServiceTool2V2.EncryptPushRes();
                AWSServiceTool2V2.EncryptPushRes res3 = new AWSServiceTool2V2.EncryptPushRes();
                res3.isQueryDb = true;
                res3.value = '';
                res3.table = staticResource.get('Contact').awsTableName;
@@ -224,7 +213,7 @@
                res3.field = mmsp.get('Contact').get('Doctor_Division1__c').AWS_Field_API__c;
                resList3.add(res3);

                System.debug('Agency_Contact__c Name = ' +mmsp.get('Agency_Contact__c').get('Name').AWS_Field_API__c);
                System.debug('Agency_Contact__c Name = ' + mmsp.get('Agency_Contact__c').get('Name').AWS_Field_API__c);
                System.debug('resList = ' + resList);
                EncryptPush.fieldsMapping.put(mmsp.get('Agency_Contact__c').get('Name').AWS_Field_API__c, resList);
                EncryptPush.fieldsMapping.put(mmsp.get('Agency_Contact__c').get('Type__c').AWS_Field_API__c, resList2);
@@ -235,27 +224,29 @@
            System.debug('EncryptPushListsfRecordId = ' + JSON.serialize(EncryptPushList[0].sfRecordId));
            System.debug('EncryptPushListfieldsMapping = ' + JSON.serialize(EncryptPushList[0].fieldsMapping));
            System.debug('EncryptPushList = ' + JSON.serialize(EncryptPushList));
            if(!Test.isRunningTest())
                AwsServiceTool2V2.EncryptPushFutureV2(Json.serialize(EncryptPushList),Json.serialize(aclist), 'Agency_Contact__c');
            if (!Test.isRunningTest())
                AwsServiceTool2V2.EncryptPushFutureV2(Json.serialize(EncryptPushList), Json.serialize(aclist), 'Agency_Contact__c');
            //zhj MEBG新方案改造 2022-11-27 end
        }else{
        } else {
            //Add By Li Jun for sync agency contact to aws 20220424 start
            if(!Test.isRunningTest()){
            if (!Test.isRunningTest()) {
                System.debug('ContactMap = ' + ContactMap);
                SyncAccountContactToAWS.assignOnceOneMinuteLater(aclist,ContactMap);
                SyncAccountContactToAWS.assignOnceOneMinuteLater(aclist, ContactMap);
            }
            //Add By Li Jun for sync agency contact to aws 20220424 end
        }
    }

    private void syncToAgencyContactDelete() {
        List < Id > cIdList = new List < Id > ();
        for (Contact oObj: oldList) {
        List<Id> cIdList = new List<Id>();
        for (Contact oObj : oldList) {
            cIdList.add(oObj.Id);
        }
        if (cIdList.size() > 0) {
            List < Agency_Contact__c > acList = [Select Id From Agency_Contact__c
                Where Contact__c =: null and Agency_ID__c = '000000000000000'
            List<Agency_Contact__c> acList = [
                SELECT Id
                FROM Agency_Contact__c
                WHERE Contact__c = :null AND Agency_ID__c = '000000000000000'
            ];
            if (acList.size() > 0) {
                delete acList;
@@ -265,27 +256,30 @@

    //更新经销商用户人数字段 精琢技术 pk 2021-08-26 start
    private void updateDealerNum() {
        Set < Id > accountSet = new Set < Id > ();
        Map < Id, Account > acMap = new Map < Id, Account > ();
        Set<Id> accountSet = new Set<Id>();
        Map<Id, Account> acMap = new Map<Id, Account>();
        if (Trigger.isUpdate) {
            for (Contact contactnew: newList) {
                if (contactnew.Agency_User__c != oldMap.get(contactnew.Id).Agency_User__c || (System.Label.onlyUpdate == '1' && UserInfo.getUserId() == '00510000005sEEMAA2')) {
            for (Contact contactnew : newList) {
                if (
                    contactnew.Agency_User__c != oldMap.get(contactnew.Id).Agency_User__c ||
                    (System.Label.onlyUpdate == '1' &&
                    UserInfo.getUserId() == '00510000005sEEMAA2')
                ) {
                    accountSet.add(contactnew.AccountId);
                }
            }
        }

        if (Trigger.isInsert) {
            for (Contact contactnew: newList) {
            for (Contact contactnew : newList) {
                if (contactnew.Agency_User__c) {
                    accountSet.add(contactnew.AccountId);
                }
            }
        }


        if (Trigger.isDelete) {
            for (Contact contactold: oldList) {
            for (Contact contactold : oldList) {
                if (contactold.Agency_User__c) {
                    accountSet.add(contactold.AccountId);
                }
@@ -293,10 +287,13 @@
        }

        if (accountSet.size() > 0) {
            List < AggregateResult > contactList = [select count(id) ctn, AccountId accid from Contact where Agency_User__c = true and AccountId =: accountSet and RecordTypeId = '01210000000QfWi'
                group by AccountId
            List<AggregateResult> contactList = [
                SELECT count(id) ctn, AccountId accid
                FROM Contact
                WHERE Agency_User__c = TRUE AND AccountId = :accountSet AND RecordTypeId = '01210000000QfWi'
                GROUP BY AccountId
            ];
            for (AggregateResult ar: contactList) {
            for (AggregateResult ar : contactList) {
                String accid = (String) ar.get('accid');
                Account account = new Account();
                account.id = accid;
@@ -304,7 +301,7 @@
                acMap.put(accid, account);
            }

            for (Id accountId: accountSet) {
            for (Id accountId : accountSet) {
                if (!acMap.containsKey(accountId)) {
                    Account account = new Account();
                    account.id = accountId;
@@ -317,17 +314,14 @@
                update acMap.values();
            }
        }


    }
    //更新经销商用户人数字段 精琢技术 pk 2021-08-26 end
    

    //zhj 新方案改造 将手机号去重及其验证规则移动到AWS和前端 start
    // 手机号去重及规则验证 及新增客户人员重名验证
    public void mobileNumberVerification(){

    public void mobileNumberVerification() {
        // Pattern pattern = Pattern.compile('^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$');
        Map<String, Map<String,Contact>> accountContactMap = new Map<String, Map<String,Contact>>();
        Map<String, Map<String, Contact>> accountContactMap = new Map<String, Map<String, Contact>>();
        Set<Id> accountIdSet = new Set<Id>();
        //用户对象上找对应的联系人
        // List<User> userList=[select ID,ContactID from User where ContactID != null];
@@ -339,19 +333,23 @@
        // }
        //查找联系人对象上对应的有效客户；医院直接使用有效/无效字段、经销商使用有效/无效公式字段
        List<String> accIdList = new List<String>();
        Map<String,String> accMap= new Map<String,String>();
        for (Contact contact1: newList) {
        Map<String, String> accMap = new Map<String, String>();
        for (Contact contact1 : newList) {
            accIdList.add(contact1.AccountId);
        }
        if (accIdList.size()>0){
            List<Account> accList=[select ID,Is_Active__c,Is_Active_Formula__c from Account where ID in:accIdList];
            if(accList.size()>0){
                for(Account acc:accList){
                    if (String.isNotBlank(acc.Is_Active__c)){
        if (accIdList.size() > 0) {
            List<Account> accList = [
                SELECT ID, Is_Active__c, Is_Active_Formula__c
                FROM Account
                WHERE ID IN :accIdList
            ];
            if (accList.size() > 0) {
                for (Account acc : accList) {
                    if (String.isNotBlank(acc.Is_Active__c)) {
                        accMap.put(acc.Id, acc.Is_Active__c);
                        continue;
                    }
                    if (String.isNotBlank(acc.Is_Active_Formula__c)){
                    if (String.isNotBlank(acc.Is_Active_Formula__c)) {
                        accMap.put(acc.Id, acc.Is_Active_Formula__c);
                    }
                }
@@ -362,23 +360,25 @@
        ID AgencyRecordTypeId = Schema.SObjectType.Contact.getRecordTypeInfosByDeveloperName().get('Agency').getRecordTypeId();
        for (Contact contactnew : newList) {
            // 手机号有值并且联系人有效，联系人的客户有效，进行手机号码验证
            if (('有效'.equals(contactnew.Isactive__c) || '有効'.equals(contactnew.Isactive__c))
                && ('有効'.equals(accMap.get(contactnew.AccountId)) || '有效'.equals(accMap.get(contactnew.AccountId)))) {
            if (
                ('有效'.equals(contactnew.Isactive__c) || '有効'.equals(contactnew.Isactive__c)) &&
                ('有効'.equals(accMap.get(contactnew.AccountId)) || '有效'.equals(accMap.get(contactnew.AccountId)))
            ) {
                // 经销商客户人员不进行手机号校验 thh 20220517 start
                if(AgencyRecordTypeId.equals(contactnew.RecordTypeId)){
                    if(String.isNotBlank(contactnew.MobilePhone)){
                if (AgencyRecordTypeId.equals(contactnew.RecordTypeId)) {
                    if (String.isNotBlank(contactnew.MobilePhone)) {
                        // Matcher isMobilePhone = pattern.matcher(contactnew.MobilePhone);
                        // if (isMobilePhone.matches()) {
                        contactnew.UniqueNumber__c = contactnew.MobilePhone;
                        // } else {
                            // 手机号唯一字段清空
                            // contactnew.UniqueNumber__c = null;
                        // 手机号唯一字段清空
                        // contactnew.UniqueNumber__c = null;
                        // }
                    } else {
                        contactnew.UniqueNumber__c = null;
                    }
                // 经销商客户人员不进行手机号校验 thh 20220517 end
                } 
                    // 经销商客户人员不进行手机号校验 thh 20220517 end
                }
                // else if(DoctorRecordTypeId.equals(contactnew.RecordTypeId)){
                //     if(String.isNotBlank(contactnew.MobilePhone_Encrypted__c)){
                //         contactnew.UniqueNumber__c = contactnew.MobilePhone_Encrypted__c;
@@ -389,9 +389,9 @@
            }
            // if (Trigger.isInsert) {
            // if(DoctorRecordTypeId.equals(contactnew.RecordTypeId)){
            //     accountIdSet.add(contactnew.AccountId);  
            //     accountIdSet.add(contactnew.AccountId);
            // }
            // }   
            // }
        }
        //手机号唯一校验-医院下新建客户人员校验使用加密手机号,经销商使用普通手机号 thh 20220328 end
        // 新增医院联系人时
@@ -401,14 +401,14 @@
        //         contactList = [SELECT Id,AccountId,FullName__c,LastName,FirstName,Account.Name,CManageCode__c,IsFromSPO__c,
        //                                         LastName_Encrypted__c// 20220314 PI改造 by Bright
        //                                         , MobilePhone_Encrypted__c // 通过姓名+手机号判断人员是否重复 thh 20220518
        //                                         FROM Contact 
        //                                         FROM Contact
        //                                         WHERE IsFromSPO__c = false AND AccountId IN:accountIdSet];
        //     }
        //     if(Trigger.isUpdate){
        //         contactList = [SELECT Id,AccountId,FullName__c,LastName,FirstName,Account.Name,CManageCode__c,IsFromSPO__c,
        //                                      LastName_Encrypted__c// 20220314 PI改造 by Bright
        //                                      , MobilePhone_Encrypted__c // 通过姓名+手机号判断人员是否重复 thh 20220518
        //                                     FROM Contact 
        //                                     FROM Contact
        //                                     WHERE IsFromSPO__c = false AND AccountId IN:accountIdSet AND Id Not IN: oldMap.keyset()];
        //     }
        //     System.debug('contactList:' + contactList);
@@ -417,12 +417,12 @@
        //             // 通过姓名+手机号判断人员是否重复 thh 20220518 start
        //             // String lastNameStr = String.isNotBlank(contact.LastName) ? contact.LastName:'';
        //             // String firstNameStr = String.isNotBlank(contact.FirstName) ? contact.FirstName:'';
        //             // String contactFullName = lastNameStr + firstNameStr + MobilePhoneStr; 
        //             // String contactFullName = lastNameStr + firstNameStr + MobilePhoneStr;
        //             String contactFullName = contact.LastName_Encrypted__c + contact.MobilePhone_Encrypted__c;// 20220314 PI改造 by Bright
        //             // 通过姓名+手机号判断人员是否重复 thh 20220518 end
        //             if(string.isBlank(contactFullName)){
        //                 continue;
        //             }      
        //             }
        //             String accountId = String.valueOf(contact.AccountId).SubString(0,15);
        //             Map<String,Contact> contactFullNameMap = new  Map<String,Contact>();
        //             if (accountContactMap.containsKey(accountId)) {
@@ -435,8 +435,8 @@
        // }

        // for (Contact contactnew: newList) {
        //     if(AgencyRecordTypeId.equals(contactnew.RecordTypeId) || (Trigger.isUpdate && !oldMap.isEmpty() && oldMap.get(contactnew.Id) != null 
        //         && String.isBlank(oldMap.get(contactnew.Id).MobilePhone_Encrypted__c) 
        //     if(AgencyRecordTypeId.equals(contactnew.RecordTypeId) || (Trigger.isUpdate && !oldMap.isEmpty() && oldMap.get(contactnew.Id) != null
        //         && String.isBlank(oldMap.get(contactnew.Id).MobilePhone_Encrypted__c)
        //         && String.isBlank(contactnew.MobilePhone_Encrypted__c))){
        //         continue;
        //     }
@@ -455,59 +455,63 @@
        //             // 跳过测试程序 和 SPO通过203接口创建的联系人
        //             if (!(Test.isRunningTest() || contactnew.IsFromSPO__c)) {
        //                 // if(Trigger.isInsert) {
        //                     contactnew.LastName.addError('客户 [ '+accountName+ ' ],已存在相同名字的联系人 人员管理编码 ['+cManageCode+' ] ，不能重复创建，请了解');     
        //                 // } 
        //                     contactnew.LastName.addError('客户 [ '+accountName+ ' ],已存在相同名字的联系人 人员管理编码 ['+cManageCode+' ] ，不能重复创建，请了解');
        //                 // }
        //                 // 客户人员删除手机号时,进行判断是否存在同名且手机号为空的客户人员 thh 20220523 start
        //                 // if(Trigger.isUpdate && !UserInfo.getUserId().equals(System.Label.interfaceUserID)) {
        //                 //     if (String.isNotBlank(oldMap.get(contactnew.Id).MobilePhone_Encrypted__c) && String.isBlank(contactnew.MobilePhone_Encrypted__c)){
        //                 //         contactnew.LastName.addError('相同名字的联系人 人员管理编码 ['+cManageCode+' ] 手机号为空已经存在，不能重复创建，请了解');
        //                 //     } 
        //                 //     }
        //                 //     if (oldMap.get(contactnew.Id).CManageCode__c != contactnew.CManageCode__c){
        //                 //         contactnew.LastName.addError('客户 [ '+accountName+ ' ],已存在相同名字的联系人 人员管理编码 ['+cManageCode+' ] ，不能重复创建，请了解'); 
        //                 //         contactnew.LastName.addError('客户 [ '+accountName+ ' ],已存在相同名字的联系人 人员管理编码 ['+cManageCode+' ] ，不能重复创建，请了解');
        //                 //     }
        //                 // }
        //                 // 客户人员删除手机号时,进行判断是否存在同名且手机号为空的客户人员 thh 20220523 end
        //             } 
        //             }
        //         }
        //     }
        // }
    }
    //zhj 新方案改造 将手机号去重及其验证规则移动到AWS和前端 end

    public static Map<Id,Id> NFM606_IdMap = new Map<Id,Id>();
    public static Map<Id, Id> NFM606_IdMap = new Map<Id, Id>();
    // 606接口调用问题修复 thh 20220330 start
    private void sendToComPlat() {
        List<Id> contactIdList = new List<Id>();
        List<String> interfaceUserUpsertContact = new List<String>();
        for (Contact local: newList) {
        for (Contact local : newList) {
            Contact old = null;
            if (Trigger.isUpdate) {
                old = oldMap.get(local.Id);
            }
            if (Trigger.isInsert
                        || old.LastName != local.LastName
                        || old.FirstName != local.FirstName
                        || old.Email != local.Email  //メール Email
                        || old.MobilePhone != local.MobilePhone  //手机号码 Mobile_Phone__c
                        || old.Employee_No_manual__c != local.Employee_No_manual__c  //员工号码 Employee_No__c
                        || old.Work_Location_manual__c != local.Work_Location_manual__c  //工作地 Work_Location__c
                        || old.Post_picklist__c != local.Post_picklist__c  //职位 post__c
                        || old.Job_Category_picklist__c != local.Job_Category_picklist__c  //职种 Job_Category__c
                        || old.Hire_date_text__c != local.Hire_date_text__c  //入职日 Hire_date__c
                        || old.Gender_text__c != local.Gender_text__c  //性别 Gender__c
                        || old.dept__c != local.dept__c  //本部 dept__c
                        || old.Pregnant_Rest__c != local.Pregnant_Rest__c // 是否产假 Pregnant_Rest__c
                        || old.Stay_or_not__c != local.Stay_or_not__c // 在职/离职 Stay_or_not__c
                        //|| old.Salesdepartment_Text__c != local.Salesdepartment_Text__c // 销售本部 Salesdepartment__c
                        || old.AccountId != local.AccountId//客户人员换客户
                        || old.Isactive__c != local.Isactive__c//状态变更
                        || old.ServicePlatformCode__c != local.ServicePlatformCode__c//服务平台编码
                        || old.UnifiedI_Contact_ID__c != local.UnifiedI_Contact_ID__c//智慧医疗编码
                        || old.ContactType__c != local.ContactType__c//人员类型
                        || (old.ChargeState__c != local.ChargeState__c && local.RecordTypeId == AgencyId)//负责省 // 20220830 ljh LLIU-CHR8FF add
                        ) {
            if (
                Trigger.isInsert ||
                old.LastName != local.LastName ||
                old.FirstName != local.FirstName ||
                old.Email != local.Email || //メール Email
                old.MobilePhone != local.MobilePhone || //手机号码 Mobile_Phone__c
                old.Employee_No_manual__c != local.Employee_No_manual__c || //员工号码 Employee_No__c
                old.Work_Location_manual__c != local.Work_Location_manual__c || //工作地 Work_Location__c
                old.Post_picklist__c != local.Post_picklist__c || //职位 post__c
                old.Job_Category_picklist__c != local.Job_Category_picklist__c || //职种 Job_Category__c
                old.Hire_date_text__c != local.Hire_date_text__c || //入职日 Hire_date__c
                old.Gender_text__c != local.Gender_text__c || //性别 Gender__c
                old.dept__c != local.dept__c || //本部 dept__c
                old.Pregnant_Rest__c != local.Pregnant_Rest__c || // 是否产假 Pregnant_Rest__c
                old.Stay_or_not__c != local.Stay_or_not__c || // 在职/离职 Stay_or_not__c
                //|| old.Salesdepartment_Text__c != local.Salesdepartment_Text__c // 销售本部 Salesdepartment__c
                old.AccountId != local.AccountId || //客户人员换客户
                old.Isactive__c != local.Isactive__c || //状态变更
                old.ServicePlatformCode__c != local.ServicePlatformCode__c || //服务平台编码
                old.UnifiedI_Contact_ID__c != local.UnifiedI_Contact_ID__c || //智慧医疗编码
                old.ContactType__c != local.ContactType__c || //人员类型
                (old.ChargeState__c != local.ChargeState__c &&
                local.RecordTypeId == AgencyId) //负责省 // 20220830 ljh LLIU-CHR8FF add
            ) {
                //获取客户人员的记录类型ID thh 20220330 start
                ID InternalStaffRecordTypeId = Schema.SObjectType.Contact.getRecordTypeInfosByDeveloperName().get('Internal_staff').getRecordTypeId();
                ID InternalStaffRecordTypeId = Schema.SObjectType.Contact.getRecordTypeInfosByDeveloperName()
                    .get('Internal_staff')
                    .getRecordTypeId();
                ID DoctorRecordTypeId = Schema.SObjectType.Contact.getRecordTypeInfosByDeveloperName().get('Doctor').getRecordTypeId();
                ID AgencyRecordTypeId = Schema.SObjectType.Contact.getRecordTypeInfosByDeveloperName().get('Agency').getRecordTypeId();
                //获取客户人员的记录类型ID thh 20220330 end
@@ -516,11 +520,11 @@
                // gzw 20220824 bugfix start
                // if (!local.IsFromSPO__c && !InternalStaffRecordTypeId.equals(local.RecordTypeId)) {
                if (!InternalStaffRecordTypeId.equals(local.RecordTypeId)) {
                // gzw 20220824 bugfix end
                    // gzw 20220824 bugfix end
                    // 医院 客户人员 统一平台编码有值 发送 PO
                    if (DoctorRecordTypeId.equals(local.RecordTypeId) && String.isNotBlank(local.UnifiedI_Contact_ID__c)) {
                        if (!NFM606_IdMap.containsKey(local.Id)) {
                            if(UserInfo.getUserId().equals(System.Label.interfaceUserID)){
                            if (UserInfo.getUserId().equals(System.Label.interfaceUserID)) {
                                interfaceUserUpsertContact.add(local.Id);
                            } else {
                                contactIdList.add(local.Id);
@@ -531,7 +535,7 @@
                    // 经销商 客户人员 手机号码有值 发送 PO
                    if (AgencyRecordTypeId.equals(local.RecordTypeId) && String.isNotBlank(local.MobilePhone)) {
                        if (!NFM606_IdMap.containsKey(local.Id)) {
                            if(UserInfo.getUserId().equals(System.Label.interfaceUserID)){
                            if (UserInfo.getUserId().equals(System.Label.interfaceUserID)) {
                                interfaceUserUpsertContact.add(local.Id);
                            } else {
                                contactIdList.add(local.Id);
@@ -540,41 +544,41 @@
                        }
                    }
                }
                
            }
        }
        //606标记
        if(!System.Test.isRunningTest()){
        if (!System.Test.isRunningTest()) {
            // NFM606Controller.executeNotFuture('', contactIdList);
            if (contactIdList.size() > 0) {
                // NFM606Controller.callout('', contactIdList);
                 //添加future 判断 add for pipl  sushanhu 20220317 start
                //添加future 判断 add for pipl  sushanhu 20220317 start
                // if (!(System.isFuture()||System.isBatch())) {
                NFM606Controller.callout('', contactIdList);

                // } else{
                    // NFM606Controller.executeNotFuture('', contactIdList);
                // NFM606Controller.executeNotFuture('', contactIdList);
                // }
               //添加future 判断 add for pipl  sushanhu 20220317 end 
                //添加future 判断 add for pipl  sushanhu 20220317 end
            }
            if (interfaceUserUpsertContact.size() > 0) {
                NFM606Controller.executeNotFuture('', interfaceUserUpsertContact);
                //添加future 判断 add for pipl  sushanhu 20220316 start
                // if (!(System.isFuture()||System.isBatch())) {
                    // NFM606Controller.executeNotFuture('', interfaceUserUpsertContact);
                // NFM606Controller.executeNotFuture('', interfaceUserUpsertContact);
                // }
               //添加future 判断 add for pipl  sushanhu 20220316 end 
                //添加future 判断 add for pipl  sushanhu 20220316 end
            }
        } 
        }
    }
    // 606接口调用问题修复 thh 20220330 end
    // 20220830 ljh LLIU-CHR8FF add start
    private void updateChargeState(){
    private void updateChargeState() {
        List<Contact> contactL = new List<Contact>();
        for (Contact nObj : newList) {
            if(nObj.RecordTypeId == AgencyId && String.isBlank(nObj.ChargeState__c)){
            if (nObj.RecordTypeId == AgencyId && String.isBlank(nObj.ChargeState__c)) {
                Contact cnew = new Contact();
                cnew.Id = nObj.Id;
                cnew.ChargeState__c =  nObj.ChargeState_F__c;
                cnew.ChargeState__c = nObj.ChargeState_F__c;
                contactL.add(cnew);
            }
        }
@@ -583,6 +587,4 @@
        }
    }
    // 20220830 ljh LLIU-CHR8FF add end

    
}
}