~liucheng/OlyMEBG.git

			@@ -10,6 +10,10 @@

			@RestResource(urlMapping = '/NFM624/*')
			global with sharing class NFM624Rest {
			//add to AWS 回复 start sushanhu 20220225
			static Boolean SFStatus=true;
			static String SFMessage='';
			//add to AWS 回复 end sushanhu 20220225
			private static final String LOG_TYPE = 'NFM624';
			// global class GeDatasRest {
			// public GeDatas GeDatas;
			@@ -21,13 +25,15 @@
			}

			global class GeData {
			public String ContactId; //统一平台ID
			public String ContactId; //统一平台ID//Update to aws 存储的AWSContactId 20220225 SUSHANHU
			public String ServiceUserId; //服务平台用户ID
			public String PersonManagementCode; //人员管理编码
			public String HospitalManagementCode2; //医院平台编码平台编码 PlatformCode__c
			public String DepartmentManagementCode2; //科室平台编码平台编码 PlatformCode__c
			public String Name; //姓名
			public String NameEncrypted;//姓名密文 add 20220215
			public String Mobile; //手机号码
			public String MobileEncrypted;//手机号码密文 add 20220215
			public String State; //单位所在省份
			public String City; //市
			public String AccountName; //医院名
			@@ -36,11 +42,14 @@
			public String DepartmentName; //所属科室
			public String RelatedDepartment; //关联SFDC科室客户管理编码(手写) AgentCode_Ext__c
			public String Type; //职种
			public String TypeEncrypted;//职种Hash add for pipl 20220316 sushanhu
			public String ContactAddress; //联系地址
			public Boolean ForbiddenStatus; //平台用户禁用标识
			public String ContactAddressEncrypted;//联系地址密文
			public Boolean ForbiddenStatus; //平台用户禁用标识
			public String RegSource; //注册平台来源
			public Boolean AgentFlag; //经销商标识
			public String ApproverID; //审核人员员工编码
			public String DataId;//aws存储凭据
			}

			@HttpPost
			@@ -49,7 +58,7 @@
			// 取得接口传输内容
			String strData = RestContext.request.requestBody.toString();
			GeDatas ges = (GeDatas) JSON.deserializeStrict(strData, GeDatas.class);

			system.debug('ges---'+ges);

			if (ges == null) {
			return;
			@@ -71,8 +80,16 @@
			RestResponse res = RestContext.response;
			res.addHeader('Content-Type', 'application/json');
			res.statusCode = 200;
			String jsonResponse = '{"status": "Success", "Message":""}';
			res.responseBody = blob.valueOf(jsonResponse);
			// String jsonResponse = '{"status": "Success", "Message":""}';
			// res.responseBody = blob.valueOf(jsonResponse);
			//updata response toAWS 20220225 sushanhu start
			NFMUtil.NFMResponse result = NFMUtil.getNFMResponse();
			result.SFStatus=SFStatus;
			result.SFMessage=SFMessage;
			String jsonResponse =JSON.serialize(result);
			system.debug('result---'+jsonResponse);
			res.responseBody = blob.valueOf(jsonResponse);
			//updata response toAWS 20220225 sushanhu end
			return;
			}

			@@ -130,7 +147,11 @@
			try { //根据传过来的管理编码查询如果可以查询得到结果则更新，查询不到则新增
			List < Gedata > newGeDataList = new List < Gedata > ();
			for (Gedata gedata: GeDataList) {
			string dataComplete = verify(gedata);
			//for test
			gedata.AgentFlag=false;
			// string dataComplete = verify(gedata);
			string dataComplete =null;
			// test end for pi
			if (!String.isBlank(dataComplete)) {
			logstr += dataComplete;
			rowData.Is_Error__c = 1;
			@@ -140,8 +161,12 @@
			StateList.add(gedata.State);
			CityList.add(gedata.City);
			ApproverIDList.add(gedata.ApproverID);
			ManagementList.add(gedata.HospitalManagementCode2);
			ManagementList.add(gedata.DepartmentManagementCode2);
			if(string.isnotblank(gedata.HospitalManagementCode2)){
			ManagementList.add(gedata.HospitalManagementCode2);
			}
			if(string.isnotblank(gedata.DepartmentManagementCode2)){
			ManagementList.add(gedata.DepartmentManagementCode2);
			}
			//system.debug('AccountCodeList'+AccountCodeList);
			if (string.isnotblank(gedata.RelatedHospital)) {
			SFDCCodeList.add(gedata.RelatedHospital);
			@@ -165,13 +190,14 @@
			for (Address_Level__c temp: statetempList) {
			StateMap.put(temp.Name, temp.Id);
			}
			system.debug('StateMap----->'+StateMap);
			//查询市区Id
			Map < String, String > CityMap = new Map < String, String > (); //市Map
			List < Address_Level2__c > citytempList = [select Id, Name from Address_Level2__c where Name IN: CityList];
			for (Address_Level2__c temp: citytempList) {
			CityMap.put(temp.Name, temp.Id);
			}

			system.debug('CityMap----->'+CityMap);
			//查询医院所有人
			Map<string,String> ownerMap = new Map<string,String>();
			List<User> ownerList = [select Id,Employee_No__c from User where Employee_No__c IN:ApproverIDList];
			@@ -195,13 +221,15 @@
			Account.PlatformCode__c,
			Account.Management_Code__c,
			Account.parent.Department_Class_Label__c,
			Name,
			Name,LastName_Encrypted__c,
			Account.Parent_Management_Code__c,
			Account.Parent_PlatformCode__c,
			CManageCode__c,
			CManageCode__c,
			AccountId
			from Contact
			where CManageCode__c IN: PersonManagementCodeList
			OR Account.PlatformCode__c IN: ManagementList
			OR Account.Management_Code__c IN: SFDCCodeList
			OR Account.Parent_PlatformCode__c IN: ManagementList
			OR Account.Parent_Management_Code__c IN: SFDCCodeList]; //根据人员管理编码检索联系人
			Map < String, Contact > peopleMap = new Map < String, Contact > (); //联系人
			@@ -210,22 +238,21 @@
			if (string.isnotblank(ct.Account.parent.Name)) {
			Map < String, Contact > snameMap = new Map < String, Contact > ();
			string Name = ct.Name.replaceAll(' ','');
			string namekey = ct.Account.Name + ' ' + Name;
			string namekey = ct.Account.Name + ' ' + ct.LastName_Encrypted__c;
			// snameMap.put(namekey,ct);
			if (nameMap.containsKey(ct.Account.parent.Name)) {
			snameMap = nameMap.get(ct.Account.parent.Name);
			}
			snameMap.put(namekey, ct);
			snameMap.put(ct.Name, ct);
			snameMap.put(ct.LastName_Encrypted__c, ct);
			nameMap.put(ct.Account.parent.Name, snameMap);
			}
			peopleMap.put(ct.CManageCode__c, ct);
			System.debug('peopleMap'+peopleMap);
			// peopleMap.put(ct.Name, ct);
			//string temp = ct.Name + ct.Account.parent.Department_Class_Label__c;
			// peopleMap.put(temp, ct);
			}

			System.debug('peopleMap'+peopleMap);
			//查询医院科室
			//List<Account> AccountList = [select Id,PlatformCode__c,PlatformCode__c,Department_Class_Label__c,Name,Management_Code__c,Is_Active__c,AgentCode_Ext__c,ParentId,Parent.ParentId from Account where PlatformCode__c IN :HpCodeList OR parent.PlatformCode__c IN :HpCodeList OR PlatformCode__c IN :HpCodeList OR Management_Code__c IN :RelatedHospitalList OR Parent_Management_Code__c IN :RelatedHospitalList];
			//List < Account > AccountList = [select Id, PlatformCode__c, Department_Class_Label__c, Name, Management_Code__c, Is_Active__c, AgentCode_Ext__c, ParentId, Parent.ParentId from Account where Management_Code__c IN :AccountCodeList OR Parent_Management_Code__c IN :AccountCodeList OR PlatformCode__c IN :AccountCodeList OR Parent.Parent.PlatformCode__c IN :AccountCodeList];
			@@ -236,12 +263,16 @@
			OCM_man_province_HP__c,
			Name, Management_Code__c,
			Is_Active__c, AgentCode_Ext__c,
			RelatedMessageGroupNumber__c,
			ParentId,
			Parent.ParentId,
			OwnerId
			from Account
			where Parent_PlatformCode__c IN: ManagementList
			OR Parent_Management_Code__c IN: SFDCCodeList];
			OR Parent_Management_Code__c IN: SFDCCodeList
			OR PlatformCode__c IN: ManagementList
			OR Management_Code__c IN: SFDCCodeList
			OR (State_Master__c IN:StateMap.Values() AND City_Master__c IN:CityMap.Values())];
			Map <String,Account> DepartmentClassMap = new Map <String,Account>();//战略科室Map
			Map < String, Account > AccountMap = new Map < String, Account > (); //医院科室
			for (Account ac: AccountList) {
			@@ -251,6 +282,9 @@
			}
			if (string.isNotBlank(ac.PlatformCode__c)) {
			AccountMap.put(ac.PlatformCode__c, ac);
			}
			if(string.isNotBlank(ac.Name) && ac.ParentId == null && ac.Parent.ParentId == null){
			AccountMap.put(ac.name,ac);
			}
			}
			system.debug('AccountMap '+AccountMap);
			@@ -279,15 +313,22 @@
			ct.LastName = gedata.Name;
			ct.FirstName = '';
			ct.Type__c = gedata.Type;
			ct.Type_Encrypted__c = gedata.TypeEncrypted;//add for pipl sushanhu 20220316
			ct.MobilePhone = gedata.Mobile;
			ct.RegSource__c = comefrom;
			ct.UnifiedI_Contact_ID__c = gedata.ContactId; //统一平台Id
			// //UPDATE TO AWS 存储的统一平台id
			// ct.AWS_UnifiedI_Contact_ID__c=gedata.ContactId; //统一平台Id
			ct.ServicePlatformCode__c = gedata.ServiceUserId; //服务平台用户Id
			ct.Contact_address__c = gedata.ContactAddress;//联系地址
			ct.Contact_address_Encrypted__c=gedata.ContactAddressEncrypted;//联系地址密文 add 20220215
			ct.Platform_disabled_representation__c = gedata.ForbiddenStatus;//平台禁用标识
			//ct.IsFromPlatform__c = true; //来自智慧医疗创建
			ct.Ignore_Same_Name__c = true; //不是重复的客户名
			//ct.SendToComPlat__c = true;
			ct.AWS_Data_Id__c =gedata.DataId;//add 20220215 aws存储凭证
			ct.MobilePhone_Encrypted__c =gedata.MobileEncrypted;//add 20220215 手机密文
			ct.LastName_Encrypted__c =gedata.NameEncrypted;//add 20220215 姓名密文

			String personCode = gedata.PersonManagementCode;

			@@ -313,14 +354,14 @@
			dpt.Hospital__c = hospital.Id;

			//判断医院是否有效
			if ('有效'.equals(hospital.Is_Active_Formula__c)) {
			if ('有效'.equals(hospital.Is_Active_Formula__c) \|\| '无效'.equals(hospital.Is_Active_Formula__c)) {
			string DepartmentCode = string.isNotBlank(gedata.RelatedDepartment) ? gedata.RelatedDepartment : gedata.DepartmentManagementCode2;
			string DepartmentClasskey = gedata.AccountName + ' ' + gedata.DepartmentClass;
			//科室存在
			if (AccountMap.containsKey(DepartmentCode)) {
			//人员管理编码存在
			ct.AccountId = AccountMap.get(DepartmentCode).id;//科室确定，将联系人挂在该科室下
			ct.OwnerId = AccountMap.get(DepartmentCode).OwnerId;//可是确定，将将联系人所有人的值赋为科室所有人
			ct.OwnerId = AccountMap.get(DepartmentCode).OwnerId;//科室确定，将将联系人所有人的值赋为科室所有人
			system.debug('personCode' + personCode);
			if (string.isnotblank(personCode)) {
			system.debug('人员管理编码存在');
			@@ -337,7 +378,8 @@
			} else { //人员管理编码不存在
			//搜索人名/且在当前战略科室科室下
			System.debug('人员管理编码不存在');
			string namekey = gedata.Name;
			string namekey = gedata.NameEncrypted;
			system.debug('namekey----->'+namekey);
			system.debug('DepartmentClasskey = '+DepartmentClasskey);
			system.debug('nameMap22222222 '+nameMap);
			if (nameMap.containskey(DepartmentClasskey)) { // 6 完成更新操作
			@@ -408,29 +450,141 @@
			contactMap.put(Gedata.DepartmentManagementCode2, ct);
			}
			}
			}else if('无效'.equals(hospital.Is_Active_Formula__c)){
			logstr += 'error:该医院无效，此条数据跳过';
			continue;
			}else{
			logstr += '该医院处于草案中，请等待审批完成';
			logstr += '该医院处于草案中/申请中，请等待审批完成';
			//状态------>草案中/申请中------->等待，plan1:把医院Id写到日志表上（后续检索根据医院id检索未处理过的日志）,plan2:把MessageGroupNumber存到医院上
			rowData.NFM624_Secondary_processing__c = false;
			continue;
			}
			} else { //医院不存在
			system.debug('新建医院逻辑5逻辑10 无论人员管理编码是否有值都需要新建医院');
			hp.Name = gedata.AccountName; //医院名赋值
			if(ownerMap.containsKey(gedata.ApproverID)){
			hp.OwnerId = ownerMap.get(gedata.ApproverID);//审核人员员工编码赋值给用户所有人
			} else { //医院不存在则需要增加判断根据名判重
			if(accountMap.containskey(gedata.AccountName)){//如果根据名字判断有重复则数据新建指向这个医院
			Account dpt = new Account();
			Account hospital = AccountMap.get(gedata.AccountName);
			dpt.PlatformCode__c = gedata.DepartmentManagementCode2;
			dpt.Hospital__c = hospital.Id;
			//医院存在↓取状态,有效无效都新建
			if ('有效'.equals(hospital.Is_Active_Formula__c) \|\| '无效'.equals(hospital.Is_Active_Formula__c)) {
			string DepartmentCode = string.isNotBlank(gedata.RelatedDepartment) ? gedata.RelatedDepartment : gedata.DepartmentManagementCode2;
			string DepartmentClasskey = gedata.AccountName + ' ' + gedata.DepartmentClass;
			//科室存在
			if (AccountMap.containsKey(DepartmentCode)) {//因为SOQL没有检索到科室所以没有判定为没有科室
			//人员管理编码存在
			ct.AccountId = AccountMap.get(DepartmentCode).id;//科室确定，将联系人挂在该科室下
			ct.OwnerId = AccountMap.get(DepartmentCode).OwnerId;//可是确定，将将联系人所有人的值赋为科室所有人
			system.debug('personCode' + personCode);
			if (string.isnotblank(personCode)) {
			system.debug('人员管理编码存在');
			//联系人存在 11 医院名字排重存在，科室存在，更新联系人，完成
			if (peopleMap.containsKey(personCode)) {
			system.debug('11逻辑名字查重医院有科室有人员管理编码且查找有此人动作：更新');
			ct.Id = peopleMap.get(personCode).Id;
			upsertContactList.add(ct);
			} else { //联系人不存在 12 完成
			system.debug('12逻辑名字查重医院有科室有人员管理编码但查找无此人动作：报错');
			logstr += 'error:人员管理编码 [PersonManagementCode] 对应的联系人不存在，此条数据跳过';
			continue;
			}
			} else { //人员管理编码不存在
			//搜索人名/且在当前战略科室科室下
			System.debug('人员管理编码不存在');
			string namekey = gedata.NameEncrypted;
			system.debug('DepartmentClasskey = '+DepartmentClasskey);
			system.debug('nameMap22222222 '+nameMap);
			system.debug('nameMap.containskey(DepartmentClasskey)'+nameMap.containskey(DepartmentClasskey));
			if (nameMap.containskey(DepartmentClasskey)) { // 16 完成更新操作
			Map < String, Contact > sMap = nameMap.get(DepartmentClasskey);
			if (sMap.containsKey(namekey)) {
			system.debug('Id赋值'+sMap);
			ct.id = sMap.get(namekey).id;
			system.debug('16逻辑无人员管理编码医院查重存在有科室人名查找有动作：更新联系人 ');
			} else { // 17 完成
			system.debug('17逻辑无人员管理编码医院查重存在有科室人名查找无动作：新建联系人 ');
			}
			}
			upsertContactList.add(ct);
			}
			dpt.Id = AccountMap.get(DepartmentCode).Id;
			upsertAccountList.add(dpt);
			} else { //科室不存在
			//为科室赋值
			dpt.Name = gedata.DepartmentName;
			dpt.RecordTypeId = RecordTypeMap.get(gedata.DepartmentClass);
			//因为没有医院管理编码，无法检索到战略科室，所以在给科室的战略科室字段赋值时空指针
			dpt.Department_Class__c = DepartmentClassMap.get(gedata.DepartmentClass).Id;
			dpt.ParentId = DepartmentClassMap.get(gedata.DepartmentClass).Id;
			if (string.isnotblank(personCode)) { //人员管理编码存在
			if (peopleMap.containsKey(personCode)) { //人员管理编码查找有值 13 完成
			System.debug('13逻辑');
			//新建科室+新建联系人,
			ct.id = peopleMap.get(personCode).id;
			contactMap.put(Gedata.DepartmentManagementCode2, ct);
			system.debug('contactMap ' + contactMap);
			dpt.Department_Name__c = gedata.DepartmentName;
			upsertAccountList.add(dpt);
			//upsertContactList.add(ct);
			} else { //人员管理编码查找无值 14 完成
			system.debug('14逻辑');
			logstr += 'error:人员管理编码 [PersonManagementCode] 对应的联系人不存在，此条数据跳过';
			continue;
			}
			} else { //人员管理编码不存在
			system.debug('人员管理编码不存在');
			string namekey = gedata.DepartmentName+ ' ' + gedata.Name;
			//string namekey = gedata.AccountName + ' ' + gedata.DepartmentName + ' ' + gedata.DepartmentClass + ' ' + gedata.Name;
			system.debug('DepartmentClasskey'+DepartmentClasskey);
			system.debug('351nameMap '+nameMap);
			if (nameMap.containsKey(DepartmentClasskey)) { //查找是否存在该战略科室
			System.debug('人员管理编码不存在的情况下战略科室存在');
			system.debug('战略科室存在' + nameMap.get(DepartmentClasskey));
			Map < String, Contact > sMap = nameMap.get(DepartmentClasskey);
			if (sMap.containsKey(namekey)) { //查找存在 18 完成
			system.debug('18逻辑');
			system.debug('该联系人存在');
			ct.id = sMap.get(namekey).id;
			upsertAccountList.add(dpt);
			upsertContactList.add(ct);
			// if(sMap.containsKey(gedata.Name)){
			// ct.Id = sMap.get(gedata.Name).Id;
			// }
			}else if(sMap.containsKey(gedata.Name)){
			system.debug('1234567890');
			ct.Id = sMap.get(gedata.Name).Id;
			//upsertAccountList.add(dpt);
			}
			system.debug('contactMap ' + contactMap);
			System.debug('19逻辑');
			contactMap.put(Gedata.DepartmentManagementCode2, ct);
			}
			system.debug('创建联系人和科室');
			dpt.Department_Name__c = gedata.DepartmentName;
			upsertAccountList.add(dpt);
			contactMap.put(Gedata.DepartmentManagementCode2, ct);
			}
			}
			}else{
			logstr += '该医院处于草案中/申请中，请等待审批完成';
			//状态------>草案中/申请中------->等待，plan1:把医院Id写到日志表上（后续检索根据医院id检索未处理过的日志）,plan2:把MessageGroupNumber存到医院上
			hospital.RelatedMessageGroupNumber__c += iflog.MessageGroupNumber__c + ';';
			rowData.NFM624_Secondary_processing__c = false;
			upsertAccountList.add(hospital);
			}
			}else{
			//↓新建医院
			system.debug('新建医院逻辑5逻辑10逻辑15逻辑20 无论人员管理编码是否有值都需要新建医院');
			hp.Name = gedata.AccountName; //医院名赋值
			if(ownerMap.containsKey(gedata.ApproverID)){
			hp.OwnerId = ownerMap.get(gedata.ApproverID);//审核人员员工编码赋值给用户所有人
			}
			hp.RecordTypeId = '01210000000QemG';
			hp.OCM_Category__c = 'L';
			hp.PlatformCode__c = gedata.HospitalManagementCode2;
			hp.State_Master__c = StateMap.get(gedata.State); // 省
			hp.City_Master__c = CityMap.get(gedata.City); // 市
			hp.Hospital_Source__c = '智慧医疗';
			upsertAccountList.add(hp);
			System.debug('upsertAccountList'+upsertAccountList);
			rowData.NFM624_Secondary_processing__c = false;//数据需要二次处理标记
			}
			hp.RecordTypeId = '01210000000QemG';
			hp.OCM_Category__c = 'L';
			hp.PlatformCode__c = gedata.HospitalManagementCode2;
			hp.State_Master__c = StateMap.get(gedata.State); // 省
			hp.City_Master__c = CityMap.get(gedata.City); // 市
			hp.Hospital_Source__c = '智慧医疗';
			upsertAccountList.add(hp);
			System.debug('upsertAccountList'+upsertAccountList);
			rowData.NFM624_Secondary_processing__c = false;//数据需要二次处理标记
			}
			}
			system.debug('upsertContactList ' + upsertContactList);
			@@ -518,11 +672,19 @@
			if (string.isblank(gda.Name)) {
			result += 'DataError：姓名为空\n';
			}
			if (string.isblank(gda.NameEncrypted)) {
			result += 'DataError：姓名密文为空\n';
			}
			if (string.isblank(gda.Mobile)) {
			result += 'DataError：手机号为空\n';
			}
			if (string.isblank(gda.MobileEncrypted)) {
			result += 'DataError：手机号密文为空\n';
			}
			if (string.isblank(gda.RegSource)) {
			result += 'DataError：注册平台来源为空\n';
			}if (string.isblank(gda.DataId)) {
			result += 'DataError：AWS加密凭据为空\n';
			}
			if (gda.AgentFlag) {
			if (string.isblank(gda.PersonManagementCode)) {
			@@ -559,55 +721,7 @@
			}
			return result;
			}
			// global static String contactAllName(String contactName){
			// // 中国复姓大全
			// String CompoundSurname = '濮阳、公冶、太叔、申屠、公孙、慕容、仲孙、钟离、长孙、宇文、司徒、鲜于、司空、闾丘、子车、亓官、司寇、巫马、公西、颛孙、壤驷、公良、漆雕、乐正、宰父、谷梁、拓跋、夹谷、轩辕、令狐、段干、百里、呼延、东郭、南门、羊舌、微生、公户、公玉、公仪、梁丘、公仲、公上、公门、公山、公坚、左丘、公伯、西门、公祖、第五、公乘、贯丘、公皙、南荣、东里、东宫、仲长、子书、子桑、即墨、达奚、褚师、吴铭';
			// // string allname = '朱启贤';
			// // contactName = '第五惆怅';
			// String lastName = '';
			// String firstName = '';
			// String result = '';
			// if (contactName.contains('·')) {
			// lastName = contactName.split('·')[0];
			// firstName = contactName.split('·')[1];
			// } else {
			// if (contactName.length() > 2) {

			// system.debug('CompoundSurname--->01' + contactName.subString(0, 2));
			// if (CompoundSurname.contains(contactName.subString(0, 2))) {
			// lastName = contactName.substring(0,2);
			// firstName = contactName.substring(2,contactName.length());
			// system.debug('lastName--->'+lastName);
			// system.debug('firstName--->'+firstName);
			// } else {
			// lastName = contactName.substring(0,1);
			// firstName = contactName.substring(1,contactName.length());
			// system.debug('lastName--->'+lastName);
			// system.debug('firstName--->'+firstName);
			// }
			// } else {
			// if (contactName.length() == 2) {
			// lastName = contactName.substring(0,1);
			// firstName = contactName.substring(1,contactName.length());
			// system.debug('lastName--->'+lastName);
			// system.debug('firstName--->'+firstName);
			// } else {
			// lastName = contactName;
			// firstName = contactName;
			// system.debug('lastName--->'+lastName);
			// system.debug('firstName--->'+firstName);
			// }
			// }
			// }
			// if (!contactName.equals(lastName+firstName)) {
			// lastName = contactName;
			// firstName = contactName;
			// }
			// result = lastName + '_' + firstName;
			// //system.debug('CompoundSurname--->02' + CompoundSurname);
			// return result;
			// }


			private static void supplement (String ContactId){
			//把620Batch 和 623Batch 搬过来
			//补充询问单部分 start
			@@ -618,12 +732,11 @@
			List<Inquiry_form__c> InquiryList = [select Id,Inquiry_No__c,ContactId__c,Hospital_Name__c,Department_Class__c,Contact_Name__c from Inquiry_form__c where ContactId__c = :ContactId];
			system.debug('InquiryList'+InquiryList);
			//根据统一用户Id查询联系人
			//select Id,Name,UnifiedI_Contact_ID__c,AccountId,Account.Name from Contact
			List<Contact> contactList = [select Id,Name,UnifiedI_Contact_ID__c,Account.Id,Strategic_dept_Class__c,AccountId,Account.Name,Strategic_dept_Class__r.OwnerId from Contact where UnifiedI_Contact_ID__c = :ContactId];
			system.debug('contactList' + contactList);

			system.debug('contactList' + contactList);

			if(InquiryList.size()>0){
			//统一用户ID存入List、询问单ID存Map
			//统一用户ID存入List、询问单ID存Map
			Map<String, String> inquiryMap = new Map<String, String>();
			//List<String> contactIdList = new List<String>();
			for (Inquiry_form__c inquiryInfo : inquiryList) {
			@@ -649,7 +762,8 @@
			//补充询问单部分 end

			//补充学会部分 start
			List<CampaignMember__c> capMemList = [select Id,Contact_ID__c,Campaign__c,Campaign__r.Num__c,ViewContactId__c from CampaignMember__c where ViewContactId__c = :ContactId];
			//List<CampaignMember__c> campaignMemberList = new List<CampaignMember__c>();
			List<CampaignMember__c> capMemList = [select Id,Contact_ID__c,Campaign__c,Campaign__r.Num__c,ViewContactId__c from CampaignMember__c where Contact_ID__c = :ContactId];
			if(capMemList.size() > 0){
			system.debug('capMemList=================>'+capMemList);
			Map<String, String> capMemMap = new Map<String, String>();
			@@ -680,4 +794,29 @@
			}
			//补充学会部分 end
			}
			//前置条件，医院管理编码不存在的时候执行这个操作
			// private static Account duplicate_removal (Map<String,ACcount> accountNameMap,Gedate ged,BatchIF_Log__c iflog){//医院名Map,接口数据，日志表
			// //查询医院是新增条件OR （省 = 传入省 AND 市 = 传入市），增加一个一名字为key的map，根据传入数据的名字判断是否存在
			// //不存在———>新建
			// //存在——>取状态
			// //状态------>草案中/申请中------->等待，plan1:把医院Id写到日志表上（后续检索根据医院id检索未处理过的日志）,plan2:把MessageGroupNumber存到医院上
			// //状态------>有效，数据新建到该医院下,发送联系人信息
			// //状态------>无效，数据新建到该医院下,先发送联系人信息，再发送医院信息
			// if(accountNameMap.containskey(ged.AccountName)){//根据医院名判断医院是否存在
			// //医院存在
			// Account tempHp = accountNameMap.get(ged.AccountName);
			// if('草案中'.equals(tempHp.Is_Active_Formula__c) \|\| '申请中'.equals(tempHp.Is_Active_Formula__c)){//判断医院状态
			// //草案中/申请中状态
			// tempHp.RelatedMessageGroupNumber__c += iflog.MessageGroupNumber__c + ';';
			// //continue;
			// return tempHp;
			// }else{

			// }
			// }else{
			// //医院不存在

			// return hp;
			// }
			// }
			}