From fd9df05c48c09b4d7f39a3b401882bda226dedea Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期二, 31 十月 2023 20:38:18 +0800
Subject: [PATCH] 近期修改
---
force-app/main/default/classes/Add_Report.cls | 59 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/force-app/main/default/classes/Add_Report.cls b/force-app/main/default/classes/Add_Report.cls
index d925852..a91cd13 100644
--- a/force-app/main/default/classes/Add_Report.cls
+++ b/force-app/main/default/classes/Add_Report.cls
@@ -5,9 +5,7 @@
List<Account> aList = selectAccount(aId);
if(reportId != null && reportId != ''){
- //kk p璇鹃闇�瑕� 瀹炴柦浜�5浠庢煡鎵惧彉涓烘枃鏈瓧娈�
- // List<Report__c> rList = [select id, Daily_Report__c, RecordTypeId, Event_Id__c, Hospital_Department__c, Department_Class_Ref__c, Hospital_Reference__c, Date__c, Practitioner1__c, Practitioner2__c, Practitioner3__c, Practitioner4__c, Practitioner5__c, Comment__c from Report__c where id =:reportId];
- List<Report__c> rList = [select id, Daily_Report__c, RecordTypeId, Event_Id__c, Hospital_Department__c, Department_Class_Ref__c, Hospital_Reference__c, Date__c, Practitioner1__c, Practitioner2__c, Practitioner3__c, Practitioner4__c, Comment__c from Report__c where id =:reportId];
+ List<Report__c> rList = [select id, Daily_Report__c, RecordTypeId, Event_Id__c, Hospital_Department__c, Department_Class_Ref__c, Hospital_Reference__c, Date__c, Practitioner1__c, Practitioner2__c, Practitioner3__c, Practitioner4__c, Practitioner5__c, Comment__c from Report__c where id =:reportId];
if (rList.size() > 0) {
return rList.get(0).id;
}
@@ -43,9 +41,9 @@
if(visitor4 != null && visitor4 != ''){
r.Practitioner4__c = visitor4;
}
- // if(visitor5 != null && visitor5 != ''){
- // r.Practitioner5__c = visitor5;
- // }
+ if(visitor5 != null && visitor5 != ''){
+ r.Practitioner5__c = visitor5;
+ }
r.Comment__c = description;
upsert r;
@@ -66,9 +64,7 @@
List<Account> aList = selectAccount(aId);
if(reportId != null && reportId != ''){
- //搴峰悍p璇鹃闇�瑕佷慨鏀瑰瓧娈电被鍨� 鍚庣画璺熻繘锛圤pportunity5__c鍙樹负鏂囨湰绫诲瀷瀛楁锛�
- // List<Report__c> rList = [select id, Daily_Report__c, RecordTypeId, Event_Id__c, Hospital_Department__c, Department_Class_Ref__c, Hospital_Reference__c, Date__c, Practitioner1__c, Practitioner2__c, Practitioner3__c, Practitioner4__c, Practitioner5__c, Opportunity1__c, Opportunity2__c, Opportunity3__c, Opportunity4__c, Opportunity5__c from Report__c where id =:reportId];
- List<Report__c> rList = [select id, Daily_Report__c, RecordTypeId, Event_Id__c, Hospital_Department__c, Department_Class_Ref__c, Hospital_Reference__c, Date__c, Practitioner1__c, Practitioner2__c, Practitioner3__c, Practitioner4__c, Opportunity1__c, Opportunity2__c, Opportunity3__c, Opportunity4__c, Opportunity5__c from Report__c where id =:reportId];
+ List<Report__c> rList = [select id, Daily_Report__c, RecordTypeId, Event_Id__c, Hospital_Department__c, Department_Class_Ref__c, Hospital_Reference__c, Date__c, Practitioner1__c, Practitioner2__c, Practitioner3__c, Practitioner4__c, Practitioner5__c, Opportunity1__c, Opportunity2__c, Opportunity3__c, Opportunity4__c, Opportunity5__c from Report__c where id =:reportId];
if(rList.size() > 0){
return rList.get(0).id;
}
@@ -105,9 +101,9 @@
if(visitor4 != null && visitor4 != ''){
r.Practitioner4__c = visitor4;
}
- // if(visitor5 != null && visitor5 != ''){
- // r.Practitioner5__c = visitor5;
- // }
+ if(visitor5 != null && visitor5 != ''){
+ r.Practitioner5__c = visitor5;
+ }
List<String> oppIdList = new List<String>();
if(opp1 != null && opp1 != ''){
@@ -136,7 +132,6 @@
if(opp3 != null && opp3 != ''){
r.Opportunity3__c = opp3;
}
- //搴峰悍p璇鹃闇�瑕佷慨鏀瑰瓧娈电被鍨� 鍚庣画璺熻繘
if(opp4 != null && opp4 != ''){
r.Opportunity4__c = opp4;
}
@@ -171,8 +166,7 @@
List<Account> aList = selectAccount(aId);
if(reportId != null && reportId != ''){
- // List<Report__c> rList = [select id, Daily_Report__c, RecordTypeId, Event_Id__c, Hospital_Department__c, Department_Class_Ref__c, Hospital_Reference__c, Date__c, Practitioner1__c, Practitioner2__c, Practitioner3__c, Practitioner4__c, Practitioner5__c, From__c, To__c, Location__c from Report__c where id =:reportId];
- List<Report__c> rList = [select id, Daily_Report__c, RecordTypeId, Event_Id__c, Hospital_Department__c, Department_Class_Ref__c, Hospital_Reference__c, Date__c, Practitioner1__c, Practitioner2__c, Practitioner3__c, Practitioner4__c, From__c, To__c, Location__c from Report__c where id =:reportId];
+ List<Report__c> rList = [select id, Daily_Report__c, RecordTypeId, Event_Id__c, Hospital_Department__c, Department_Class_Ref__c, Hospital_Reference__c, Date__c, Practitioner1__c, Practitioner2__c, Practitioner3__c, Practitioner4__c, Practitioner5__c, From__c, To__c, Location__c from Report__c where id =:reportId];
if(rList.size() > 0){
return rList.get(0).id;
}
@@ -205,9 +199,9 @@
if(visitor4 != null && visitor4 != ''){
r.Practitioner4__c = visitor4;
}
- // if(visitor5 != null && visitor5 != ''){
- // r.Practitioner5__c = visitor5;
- // }
+ if(visitor5 != null && visitor5 != ''){
+ r.Practitioner5__c = visitor5;
+ }
if(sTime != null && sTime != ''){
//sTime = sTime.substring(0,16);
r.From__c = datetime.parse(sTime);
@@ -331,8 +325,12 @@
}
r.Generation_Source__c = '鏃ユ姤';
r.Name = '*';
-
- upsert r;
+ try {
+ upsert r;
+ } catch (Exception e) {
+ System.debug(e.getMessage());
+ }
+
updateEvent(r.id,eventId,recordType);
@@ -345,8 +343,7 @@
List<Account> aList = selectAccount(aId);
if(reportId != null && reportId != ''){
- // List<Report__c> rList = [select id, Daily_Report__c, RecordTypeId, Event_Id__c, Hospital_Department__c, Department_Class_Ref__c, Hospital_Reference__c, Date__c, Practitioner1__c, Practitioner2__c, Practitioner3__c, Practitioner4__c, Practitioner5__c, Comment__c from Report__c where id =:reportId];
- List<Report__c> rList = [select id, Daily_Report__c, RecordTypeId, Event_Id__c, Hospital_Department__c, Department_Class_Ref__c, Hospital_Reference__c, Date__c, Practitioner1__c, Practitioner2__c, Practitioner3__c, Practitioner4__c, Comment__c from Report__c where id =:reportId];
+ List<Report__c> rList = [select id, Daily_Report__c, RecordTypeId, Event_Id__c, Hospital_Department__c, Department_Class_Ref__c, Hospital_Reference__c, Date__c, Practitioner1__c, Practitioner2__c, Practitioner3__c, Practitioner4__c, Practitioner5__c, Comment__c from Report__c where id =:reportId];
if(rList.size() > 0){
return rList.get(0).id;
}
@@ -369,8 +366,12 @@
r.Date__c = date.parse(reportDate);
}
r.Comment__c = description;
-
- upsert r;
+ try {
+ upsert r;
+ } catch (Exception e) {
+ System.debug(e.getMessage());
+ }
+ // upsert r;
updateEvent(r.id,eventId,recordType);
@@ -383,8 +384,7 @@
List<Account> aList = selectAccount(aId);
if(reportId != null && reportId != ''){
- // List<Report__c> rList = [select id, Daily_Report__c, RecordTypeId, Event_Id__c, Hospital_Department__c, Department_Class_Ref__c, Hospital_Reference__c, Date__c, Practitioner1__c, Practitioner2__c, Practitioner3__c, Practitioner4__c, Practitioner5__c, Comment__c from Report__c where id =:reportId];
- List<Report__c> rList = [select id, Daily_Report__c, RecordTypeId, Event_Id__c, Hospital_Department__c, Department_Class_Ref__c, Hospital_Reference__c, Date__c, Practitioner1__c, Practitioner2__c, Practitioner3__c, Practitioner4__c, Comment__c from Report__c where id =:reportId];
+ List<Report__c> rList = [select id, Daily_Report__c, RecordTypeId, Event_Id__c, Hospital_Department__c, Department_Class_Ref__c, Hospital_Reference__c, Date__c, Practitioner1__c, Practitioner2__c, Practitioner3__c, Practitioner4__c, Practitioner5__c, Comment__c from Report__c where id =:reportId];
if(rList.size() > 0){
return rList.get(0).id;
}
@@ -406,7 +406,12 @@
}
r.Comment__c = description;
- upsert r;
+ try {
+ upsert r;
+ } catch (Exception e) {
+ System.debug(e.getMessage());
+ }
+ // upsert r;
updateEvent(r.id,eventId,recordType);
--
Gitblit v1.9.1