OlyMEBGProduct.git

			@@ -6,9 +6,14 @@
			public list<InstructedstaffInfo> checkedISList { get; private set; }
			public list<InstructedstaffInfo> uncheckedISList { get; private set; }
			public boolean ReadOnly { get; private set; }

			// 20220222 PI改造 by Bright--start
			public string staticResource { get; private set; }
			// 20220222 PI改造 by Bright--end

			public InstructReportController() {
			this.ReadOnly = true;

			staticResource = JSON.serialize(PIHelper.getPIIntegrationInfo('Contact'));// 20220222 PI改造 by Bright
			}
			public InstructReportController(ApexPages.StandardController controller) {
			this();
			@@ -102,6 +107,7 @@
			Is_Active_Formula__c
			//增加检索有效/无效精琢技术 wql 2021/02/04 end
			,Contact_ID__c, Contact_ID__r.Name,
			Contact_ID__r.AWS_Data_Id__c,// 20220222 PI改造 by Bright
			// LJPH-BVNBMM start
			Contact_ID__r.AccountId,
			Department_Service__c,
			@@ -123,6 +129,7 @@
			,Is_Active_Formula__c
			//增加检索有效/无效精琢技术 wql 2021/02/04 end
			, ContactID__C
			,ContactID__r.AWS_Data_Id__c// 20220222 PI改造 by Bright
			//带教报告新增查询字段：带教地点、带教地点（其他）、设备类别、具体型号、备注精琢技术 wql 2020/04/14 start
			, Instruct_place_other__c, Specific_model__c,
			Instruct_remarks__c, Equipment_category__c, Instruct_place__c, Instruct_content__c
			@@ -169,12 +176,14 @@
			for (InstructedstaffInfo uncheckedIS : uncheckedISList) {

			if (uncheckedIS.rec_checkBox) {
			System.debug('uncheckedIS.CamMem.Contact_ID__r='+uncheckedIS.CamMem.Contact_ID__r.AWS_Data_Id__c);
			uncheckedIS.IS = new Instructed_staff__c(Name = uncheckedIS.CamMem.Contact_ID__r.Name,
			// LJPH-BVNBMM 改为同步当前联系人所在的科室 start
			Department__c = uncheckedIS.CamMem.Contact_ID__r.AccountId,
			// LJPH-BVNBMM 改为同步当前联系人所在的科室 start
			CampaignMember__c = uncheckedIS.CamMem.id,
			ContactID__c = uncheckedIS.CamMem.Contact_ID__c
			ContactID__c = uncheckedIS.CamMem.Contact_ID__c,
			ContactID__r = uncheckedIS.CamMem.Contact_ID__r // 20220222 PI改造 by Bright
			);
			uncheckedIS.lineNo = temuncheckedISList.size();
			temcheckedISList.add(uncheckedIS);