Merge branch 'PIPLFunctionFixIssue0424'

Li Jun

2022-04-24 dd10019315aa7e0b26432bb48716da308cc11d82

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

@@ -13,7 +13,9 @@
        this.oldList = (List < Contact > ) Trigger.old;
    }
    protected override void beforeInsert() {
        mobileNumberVerification();
        if(Test.isRunningTest()||UserInfo.getUserId()!=System.Label.ByPassTrigger){ //Add by Li Jun for PIPL 20220331
            mobileNumberVerification();
        }
    }

    protected override void afterInsert() {
@@ -138,13 +140,41 @@
                        //                        )
                    )
                ) {
                    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);
                    //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);
                    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,
                        Name_Encrypted__c = nObj.LastName_Encrypted__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,
                        Doctor_Division1_Encrypted__c = nObj.Doctor_Division1_Encrypted__c
                    );
                    targetContactMap.put(nObj.Id, acObj);
                }
            }
        }
        if (targetContactMap.size() > 0) {
            upsert targetContactMap.values() ContactId18__c;
            List<Agency_Contact__c> temp = targetContactMap.values();
            upsert temp ContactId18__c;
            system.debug('temp='+temp);
            EncryptInsert(temp);
        }
    }
    
    static void EncryptInsert(List<Agency_Contact__c> aclist){
        if(!(system.isFuture() || system.isBatch())){
            AwsServiceTool2.EncryptPushFuture(Json.serialize(aclist), 'Agency_Contact__c');
        }else{
            //Add By Li Jun for sync agency contact to aws 20220424 start
            if(!Test.isRunningTest()){
                SyncAccountContactToAWS.assignOnceOneMinuteLater();
            }
            //Add By Li Jun for sync agency contact to aws 20220424 end
        }
    }

@@ -341,7 +371,6 @@
            }   
        }
    }

    public static Map<Id,Id> NFM606_IdMap = new Map<Id,Id>();
    // 606接口调用问题修复 thh 20220330 start
    private void sendToComPlat() {
@@ -379,8 +408,9 @@
                ID DoctorRecordTypeId = Schema.SObjectType.Contact.getRecordTypeInfosByDeveloperName().get('Doctor').getRecordTypeId();
                ID AgencyRecordTypeId = Schema.SObjectType.Contact.getRecordTypeInfosByDeveloperName().get('Agency').getRecordTypeId();
                //获取客户人员的记录类型ID thh 20220330 end
                System.debug('local.UnifiedI_Contact_ID__c1:' + local.UnifiedI_Contact_ID__c);
                System.debug('local.MobilePhone1:' + local.MobilePhone);
                if (!local.IsFromSPO__c && !InternalStaffRecordTypeId.equals(local.RecordTypeId)) {
 
                    // 医院 客户人员 统一平台编码有值 发送 PO
                    if (DoctorRecordTypeId.equals(local.RecordTypeId) && String.isNotBlank(local.UnifiedI_Contact_ID__c)) {
                        if (!NFM606_IdMap.containsKey(local.Id)) {
@@ -414,7 +444,7 @@
                // NFM606Controller.callout('', contactIdList);
                 //添加future 判断 add for pipl  sushanhu 20220317 start
                // if (!(System.isFuture()||System.isBatch())) {
                    NFM606Controller.callout('', contactIdList);
                NFM606Controller.callout('', contactIdList);
                // } else{
                    // NFM606Controller.executeNotFuture('', contactIdList);
                // }