~liucheng/OlyMEBG.git

			@@ -35,14 +35,14 @@
			public string staticResourceFile { get; private set; }
			public Boolean addFlag { get; private set; }//敏感地址使用标记
			public String qrcode { get; private set; }
			public String barcode { get; private set; }
			public FixtureRentalPDFController() {
			pageNum = Integer.valueOf(ApexPages.currentPage().getParameters().get('page'));
			rentalApplyIdIMG = ApexPages.currentPage().getParameters().get('raid');
			//Apexpages.currentPage().getHeaders().put('X-UA-Compatible', 'IE=8');
			// rentalApplyId = ApexPages.currentPage().getParameters().get('raid');//20201120 ljh
			String tempStr = ApexPages.currentPage().getParameters().get('raid');
			staticResource = JSON.serialize(PIHelper.getPIIntegrationInfo('Rental_Apply__c'));
			staticResourceFile = JSON.serialize(PIHelper.getPIIntegrationInfo('Document'));

			addFlag = false;
			rentalApplyId = new List<String>();
			if(tempStr != null){
			@@ -56,6 +56,8 @@

			// 画面初始化
			public void init() {
			staticResource = JSON.serialize(PIHelper.getPIIntegrationInfo('Rental_Apply__c'));
			staticResourceFile = JSON.serialize(PIHelper.getPIIntegrationInfo('Document'));
			// 新规奥林巴斯备品签收单PDF画面初始化
			PageCutList = new List<List<String>>();
			List<Rental_Apply__c> ApplyList = new List<Rental_Apply__c>();
			@@ -103,6 +105,7 @@
			Agency_Address_Id__c,//20201124 LJH OCSM_BP5-61 add
			Root_Rental_Apply__c,//20210617 ljh 1732 add
			BRId__c, // 20211209 ljh SFDC-C923SR add
			direct_send__c,
			QRImg__c,
			QRId__c,
			AWS_Data_Id__c,//20220304
			@@ -115,6 +118,7 @@
			if(ApplyList.size()>0){
			ApplyHeadShow = ApplyList[0];
			qrcode = ConsumTrialPDFController.GetImageBase64(ApplyHeadShow.QRId__c);
			barcode = ConsumTrialPDFController.GetImageBase64(ApplyHeadShow.BRId__c);
			}
			//增加借出备品SET一览List，为了获取借出备品SET一览明细
			List<String> RAESSearchList = New List<String>();