From 1727a4f4d02e429475608e60f142a63bc24127bc Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期一, 23 十月 2023 10:07:34 +0800
Subject: [PATCH] 近期修改
---
force-app/main/default/classes/Add_Report.cls | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/force-app/main/default/classes/Add_Report.cls b/force-app/main/default/classes/Add_Report.cls
index d82c888..d925852 100644
--- a/force-app/main/default/classes/Add_Report.cls
+++ b/force-app/main/default/classes/Add_Report.cls
@@ -5,7 +5,9 @@
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];
+ //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];
if (rList.size() > 0) {
return rList.get(0).id;
}
@@ -41,9 +43,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 +68,10 @@
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];
- // if(rList.size() > 0){
- // return rList.get(0).id;
- // }
+ 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];
+ if(rList.size() > 0){
+ return rList.get(0).id;
+ }
}
Report__c r = new Report__c();
@@ -102,9 +105,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 != ''){
@@ -137,9 +140,9 @@
if(opp4 != null && opp4 != ''){
r.Opportunity4__c = opp4;
}
- // if(opp5 != null && opp5 != ''){
- // r.Opportunity5__c = opp5;
- // }
+ if(opp5 != null && opp5 != ''){
+ r.Opportunity5__c = opp5;
+ }
r.Opportunity_Situation__c = '寮曞悎鐧虹敓';
}
else{
@@ -168,7 +171,8 @@
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, 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];
if(rList.size() > 0){
return rList.get(0).id;
}
@@ -201,9 +205,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);
@@ -341,7 +345,8 @@
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, 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];
if(rList.size() > 0){
return rList.get(0).id;
}
@@ -378,7 +383,8 @@
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, 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];
if(rList.size() > 0){
return rList.get(0).id;
}
--
Gitblit v1.9.1