From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新
---
force-app/main/default/classes/NFM624Rest.cls | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/classes/NFM624Rest.cls b/force-app/main/default/classes/NFM624Rest.cls
index 591f2bc..93a2f1c 100644
--- a/force-app/main/default/classes/NFM624Rest.cls
+++ b/force-app/main/default/classes/NFM624Rest.cls
@@ -61,6 +61,7 @@
// 鍙栧緱鎺ュ彛浼犺緭鍐呭
String strData = RestContext.request.requestBody.toString();
+ system.debug('strData---'+strData);
GeDatas ges = (GeDatas) JSON.deserializeStrict(strData, GeDatas.class);
system.debug('ges---'+ges);
@@ -201,9 +202,11 @@
}
//鏌ヨ甯傚尯Id
Map < String, String > CityMap = new Map < String, String > (); //甯侻ap
- List < Address_Level2__c > citytempList = [select Id, Name from Address_Level2__c where Name IN: CityList];
+ //鐪佸競瀵瑰簲璇ュ叧绯� LY 20230206 start
+ List < Address_Level2__c > citytempList = [select Id, Name,Level1_Name__c from Address_Level2__c where Name IN: CityList];
for (Address_Level2__c temp: citytempList) {
- CityMap.put(temp.Name, temp.Id);
+ CityMap.put(temp.Level1_Name__c+temp.Name, temp.Id);
+ //鐪佸競瀵瑰簲璇ュ叧绯� LY 20230206 end
}
//鏌ヨ鍖婚櫌鎵�鏈変汉
@@ -585,7 +588,10 @@
//Ly 鐪佹枃鏈祴鍊� start
hp.State_Text__c = gedata.State; // 鐪�(鏂囨湰)
//Ly 鐪佹枃鏈祴鍊� end
- hp.City_Master__c = CityMap.get(gedata.City); // 甯�
+ //鐪佸競瀵瑰簲璇ュ叧绯� LY 20230206 start
+ //hp.City_Master__c = CityMap.get(gedata.City); // 甯�
+ hp.City_Master__c = CityMap.get(gedata.State+gedata.City); // 甯�
+ //鐪佸競瀵瑰簲璇ュ叧绯� LY 20230206 end
hp.Hospital_Source__c = '鏅烘収鍖荤枟';
upsertAccountList.add(hp);
System.debug('upsertAccountList'+upsertAccountList);
@@ -740,7 +746,7 @@
List<CampaignMember__c> campaignMemberList = new List<CampaignMember__c>();
List<Inquiry_form__c> inquiryFormList = new List<Inquiry_form__c>();
//鏍规嵁缁熶竴鐢ㄦ埛Id鏌ヨ璇㈤棶鍗�
- List<Inquiry_form__c> InquiryList = [select Id,Inquiry_No__c,ContactId__c,Hospital_Name__c,Department_Class__c,Contact_Name__c from Inquiry_form__c where ContactId__c = :ContactId];
+ List<Inquiry_form__c> InquiryList = [select Id,Inquiry_No__c,ContactId__c,Hospital_Name__c,Department_Class__c,Contact_Name__c from Inquiry_form__c where ContactId__c = :ContactId and Hospital_Name__c = null and Department_Class__c = null and Contact_Name__c = null];
system.debug('InquiryList'+InquiryList);
//鏍规嵁缁熶竴鐢ㄦ埛Id鏌ヨ鑱旂郴浜�
List<Contact> contactList = [select Id,Name,UnifiedI_Contact_ID__c,Account.Id,Strategic_dept_Class__c,AccountId,Account.Name,Strategic_dept_Class__r.OwnerId from Contact where UnifiedI_Contact_ID__c = :ContactId];
@@ -782,7 +788,7 @@
//琛ュ厖瀛︿細閮ㄥ垎 start
//List<CampaignMember__c> campaignMemberList = new List<CampaignMember__c>();
- List<CampaignMember__c> capMemList = [select Id,Contact_ID__c,Campaign__c,Campaign__r.Num__c,ViewContactId__c from CampaignMember__c where Contact_ID__c = :ContactId];
+ List<CampaignMember__c> capMemList = [select Id,Contact_ID__c,Campaign__c,Campaign__r.Num__c,ViewContactId__c from CampaignMember__c where ViewContactId__c = :ContactId and Contact_ID__c = null];
if(capMemList.size() > 0){
system.debug('capMemList=================>'+capMemList);
Map<String, String> capMemMap = new Map<String, String>();
--
Gitblit v1.9.1