OlyMEBG.git - Gitblit

			@@ -57,6 +57,9 @@
			ActualVisitTimeThird__c, ResponseResultDesc__c, ProcessResult__c, Status__c,
			Department__r.Name, Department__r.Id,ActualVisitDateThird__c,
			EndTimeFirst__c,RepairsReportDate__c,ActualVisitDateFirst__c,ActualVisitDateSecon__c,
			// 2023-3-6 zyh add start
			DateReceiptQuestions__c,IfDeadHurt__c,ProblemOccurred__c,ProblemOccurredSelect__c,ReportAdverseEvents__c,WhatProject__c,OperationOrExaminationName__c,BreakORFallOff__c,UseFailProductFinish__c,SupportingProducts__c,AfterFailureInformation__c,Delay15Min__c,InformationFrom__c,FailureQInHospital__c,DelayReportReason__c,IsProductFaultRelated__c,IsOts__c,SenderOrgCode__c,SenderCompany__c,SenderName__c,SenderMobilePhone__c,SenderAddress__c,RecepientCompany__c,RecepientName__c,RecepientMobilePhone__c,RecepientAddress__c,ReturnWayType__c,OrderNumber__c,FailureReason__c,LogisticsSendDate__c,Item0010__c,Item0020__c,Item0030__c,Item0040__c,Item0050__c,
			// 2023-3-6 zyh add end
			OwnerId,Owner.Name
			FROM RepairSubOrder__c
			WHERE Id =: RepairSubOrderId
			@@ -217,6 +220,44 @@
			//XLIU-CJM7Z9 【委托】新建修理提示信息（停产及非修理对象品）LY 20221110 start
			String Excwork_location_Id = '';//跳过维修中心
			//XLIU-CJM7Z9 【委托】新建修理提示信息（停产及非修理对象品）LY 20221110 end
			// 2023-3-6 zyh add start
			// String dateReceiptQuestions;已存在
			String SupportingProducts = '00N10000008rsW4';//配套使用产品SupportingProducts__c
			String IfDeadHurt = '00N10000008rsW7';//是否有死亡、伤害、感染
			String ProblemOccurred = '00N10000008rsVv';//问题发生时间情况
			String ProblemOccurredSelect = '00N10000009hsvI';//问题发生时间情况其它
			String ReportAdverseEvents = '00N10000008rsW2';//医院有没有向政府机关报告不良事件或疑似不良事件
			String WhatProject = '00N10000008rsW6';//做的是哪个项目
			String OperationOrExaminationName = '00N10000008rsVk';//手术/检查名称
			String BreakORFallOff = '00N10000008rsVN';//是否有发生断裂或脱落
			String UseFailProductFinish = '00N10000008rsW5';//是否用该产品完成了手术/检查
			// String SupportingProducts = '00N10000008rsW4';//配套使用产品
			String AfterFailureInformation = '00N10000008rsVL';//发现故障后，医院对患者的处理情况
			String Delay15Min = '00N10000008rsVR';//发现故障现象后，有延误15分钟以上的手术实施的情况发生吗
			String InformationFrom = '00N10000008rsVZ';//信息是从医院的谁那里得到的
			String FailureQInHospital = '00N10000008rsVT';//在医院，故障发生的频率是多少
			String DelayReportReason = '00N10000008rsVS';//超时报告理由
			String IsProductFaultRelated = '00N10000008rsVw';//是否和这次的产品故障有关
			String IsOts = '';
			String SenderOrgCode = '';
			String SenderCompany = '';
			String SenderName = '';
			String SenderMobilePhone = '';
			String SenderAddress = '';
			String RecepientCompany = '';
			String RecepientName = '';
			String RecepientMobilePhone = '';
			String RecepientAddress = '';
			String ReturnWayType = '';
			String OrderNumber = '';
			String FailureReason = '';
			String LogisticsSendDate = '';
			String Item0010 = '';
			String Item0020 = '';
			String Item0030 = '';
			String Item0040 = '';
			String Item0050 = '';
			// 2023-3-6 zyh add end
			String engineerSendDate_Id= '';//工程师修理品寄送日
			// if (NFMUtil.isSandbox()) { //测试环境
			// RepairApplicant_Id = '00N1m0000054ufW'; //报修人
			@@ -347,6 +388,53 @@

			url += joint_3 + Incharge_Staff_Id + joint_1 + repairSubOrder.Owner.Name;
			url += joint_3 + Incharge_Staff_Id + joint_2 + repairSubOrder.OwnerId;
			// 2023-3-7 zyh add start
			if(repairSubOrder.SupportingProducts__c != null){
			url += joint_3 + SupportingProducts + joint_2 + repairSubOrder.SupportingProducts__c;//配套使用产品
			}
			if(repairSubOrder.IfDeadHurt__c != null){
			url += joint_3 + IfDeadHurt + joint_2 + repairSubOrder.IfDeadHurt__c;//是否有死亡、伤害、感染
			}
			if(repairSubOrder.ProblemOccurred__c != null){
			url += joint_3 + ProblemOccurred + joint_2 + repairSubOrder.ProblemOccurred__c;//问题发生时间情况
			}
			if(repairSubOrder.ProblemOccurredSelect__c != null){
			url += joint_3 + ProblemOccurredSelect + joint_2 + repairSubOrder.ProblemOccurredSelect__c;//问题发生时间情况其它
			}
			if(repairSubOrder.ReportAdverseEvents__c != null){
			url += joint_3 + ReportAdverseEvents + joint_2 + repairSubOrder.ReportAdverseEvents__c;//医院有没有向政府机关报告不良事件或疑似不良事件
			}
			if(repairSubOrder.WhatProject__c != null){
			url += joint_3 + WhatProject + joint_2 + repairSubOrder.WhatProject__c;//做的是哪个项目
			}
			if(repairSubOrder.OperationOrExaminationName__c != null){
			url += joint_3 + OperationOrExaminationName + joint_2 + repairSubOrder.OperationOrExaminationName__c;//手术/检查名称
			}
			if(repairSubOrder.BreakORFallOff__c != null){
			url += joint_3 + BreakORFallOff + joint_2 + repairSubOrder.BreakORFallOff__c;//是否有发生断裂或脱落
			}
			if(repairSubOrder.UseFailProductFinish__c != null){
			url += joint_3 + UseFailProductFinish + joint_2 + repairSubOrder.UseFailProductFinish__c;//是否用该产品完成了手术/检查
			}
			if(repairSubOrder.AfterFailureInformation__c != null){
			url += joint_3 + AfterFailureInformation + joint_2 + repairSubOrder.AfterFailureInformation__c;//发现故障后，医院对患者的处理情况
			}
			if(repairSubOrder.Delay15Min__c != null){
			url += joint_3 + Delay15Min + joint_2 + repairSubOrder.Delay15Min__c;//发现故障现象后，有延误15分钟以上的手术实施的情况发生吗
			}
			if(repairSubOrder.InformationFrom__c != null){
			url += joint_3 + InformationFrom + joint_2 + repairSubOrder.InformationFrom__c;//信息是从医院的谁那里得到的
			}
			if(repairSubOrder.FailureQInHospital__c != null){
			url += joint_3 + FailureQInHospital + joint_2 + repairSubOrder.FailureQInHospital__c;//在医院，故障发生的频率是多少
			}
			if(repairSubOrder.DelayReportReason__c != null){
			url += joint_3 + DelayReportReason + joint_2 + repairSubOrder.DelayReportReason__c;//超时报告理由
			}
			if(repairSubOrder.IsProductFaultRelated__c != null){
			url += joint_3 + IsProductFaultRelated + joint_2 + repairSubOrder.IsProductFaultRelated__c;//是否和这次的产品故障有关
			}
			// 2023-3-7 zyh add start
			} else if ('QIS'.equals(dataType)) {

			String Delivered_Product_Id = '00N10000002FHFK'; //设备型号