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/NFM624RestAbout.cls |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/force-app/main/default/classes/NFM624RestAbout.cls b/force-app/main/default/classes/NFM624RestAbout.cls
index c8807d2..8011d0b 100644
--- a/force-app/main/default/classes/NFM624RestAbout.cls
+++ b/force-app/main/default/classes/NFM624RestAbout.cls
@@ -278,7 +278,7 @@
                              System.debug('sMap'+sMap);
                              System.debug('sMap.containsKey(namekey)'+sMap.containsKey(namekey));
                              System.debug('Namekey'+namekey);
-                             if (sMap.containsKey(namekey)) {
+                             if (sMap.containsKey(namekey) && sMap.get(namekey).UnifiedI_Contact_ID__c == null) {
                                 system.debug('鏍规嵁鍚嶅瓧鍖归厤瀛樺湪');
                                 red.awsDataId = sMap.get(namekey).AWS_Data_Id__c;
                                 red.sfid = sMap.get(namekey).id;
@@ -287,11 +287,11 @@
                                 red.sfid = sMap.get(namekey1).id;
                                 
                             // // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 start
-                            } else if(sMap.containsKey(namekey2) ){
+                            } else if(sMap.containsKey(namekey2) && sMap.get(namekey2).UnifiedI_Contact_ID__c == null){
                                 system.debug('鎴樼暐绉戝瀛樺湪绉戝涓虹┖鐢佃瘽鏈夊��');
                                 red.awsDataId = sMap.get(namekey2).AWS_Data_Id__c;
                                 red.sfid = sMap.get(namekey2).id;
-                            }else if(sMap.containsKey(namekey3)){
+                            }else if(sMap.containsKey(namekey3) && sMap.get(namekey3).UnifiedI_Contact_ID__c == null){
                                 system.debug('鎴樼暐绉戝瀛樺湪绉戝涓虹┖鐢佃瘽鏃犲��');
                                 red.awsDataId = sMap.get(namekey3).AWS_Data_Id__c;
                                 red.sfid = sMap.get(namekey3).id;
@@ -301,18 +301,27 @@
                                 //red.dataID = gedata.dataID;
                                 //red.awsDataId = null;
                                 //red.sfid = null;
+                                for ( Integer i = 0; i < peopleList.size(); i++) {
+                                    if (peopleList[i].Account.parent.Name !=DepartmentClasskey && peopleList[i].MobilePhone_Encrypted__c ==null) {
+                                        red.awsDataId =peopleList[i].AWS_Data_Id__c;
+                                        red.sfid =peopleList[i].id;
+                                    }
+                                }
                             }
                             system.debug('red----------->'+red);
-                            responseList.ResponseDetails.add(red);
+                            //responseList.ResponseDetails.add(red);
                             system.debug('responseList.ResponseDetails'+responseList.ResponseDetails);
                         }else{
                             system.debug('鎴樼暐绉戝涓嶅瓨鍦�');
-                            if (peopleList.size()>0 && peopleList[0].MobilePhone_Encrypted__c ==null) {
-                                red.awsDataId =peopleList[0].AWS_Data_Id__c;
-                                red.sfid =peopleList[0].id;
+                            for ( Integer i = 0; i < peopleList.size(); i++) {
+                                if (peopleList[i].MobilePhone_Encrypted__c ==null) {
+                                    red.awsDataId =peopleList[i].AWS_Data_Id__c;
+                                    red.sfid =peopleList[i].id;
+                                }
                             }
-                            responseList.ResponseDetails.add(red);
+                            //responseList.ResponseDetails.add(red);
                         }
+                        responseList.ResponseDetails.add(red);
                     }    
                 }
             }

--
Gitblit v1.9.1