jiangjiazhi / regional-platform

Commit 2295e456822037719aeabf82d0a074b7c0370d76

Authored by wtt over 6 years ago

Exists in master and in 6 other branches

修改医院id和医生id

Showing 3 changed files with 18 additions and 14 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SyncV2HistoryWorkerx.java

...	...	@@ -118,16 +118,18 @@
118	118	}
119	119
120	120	/**
	121	+ *2.0同步3.0代码注释
	122	+ *
121	123	* 将来源于v2.0的数据同步到当前版本中
122	124	*
123	125	* @param param
124		- */
	126	+
125	127	@RequestMapping(method = RequestMethod.POST, value = "/v2/saveOrUpdate")
126	128	@ResponseBody
127	129	public BaseResponse saveOrUpdateByV2(@RequestBody SyncV2YunBookbuildingRequest param) {
128		- param.setBookbuildingDoctor("1000000185");//todo
	130	+ param.setBookbuildingDoctor("2100004880");
129	131	param.setLastMenstrualPeriod(null);//todo
130		- param.setHospitalId("216");//todo
	132	+ param.setHospitalId("2100001981");
131	133
132	134	// //1、使用JSONObject
133	135	// JSONObject json = JSONObject.fromObject(param);
...	...	@@ -144,6 +146,7 @@
144	146
145	147	return bookbuildingFacade.addPregnantBookbuildingV2(param, Integer.parseInt(param.getBookbuildingDoctor()), false);
146	148	}
	149	+ */
147	150
148	151	/**
149	152	* 将v2.0的历史数据保存到当前库中

...	...	@@ -731,7 +731,10 @@
731	731	* @param userId userId
732	732	*/
733	733	private void syncDataToV2(final Patients patients, String id, Integer userId) {
734		- try {
	734	+
	735	+ /*
	736	+ 3.0同步2.0代码注释
	737	+ try {
735	738	Thread syncThread = new Thread(new Runnable() {
736	739	@Override
737	740	public void run() {
...	...	@@ -739,8 +742,6 @@
739	742	HttpHeaders headers = new HttpHeaders();
740	743	headers.setContentType(MediaType.APPLICATION_JSON);
741	744	JSONObject jsonObject = getQueryParam(patients);
742		-// String result = restTemplate.postForObject(syncToV2Url + "/v3/bookbuilding/savaOrUpdate", jsonObject, String.class);
743		-// logger.info("建档数据同步到2.0系统，返回结果： {}", result);
744	745	Map<String, Object> map = new HashMap<>();
745	746	map.put("jsonObject", jsonObject);
746	747	ResponseEntity<String> responseEntity = restTemplate.getForEntity(syncToV2Url +"/GetPatient.asmx/GetPatientInfo?data={jsonObject}", String.class, map);
...	...	@@ -751,7 +752,7 @@
751	752	} catch (Exception e) {
752	753	e.printStackTrace();
753	754	logger.error("建档数据同步到2.0系统失败", e);
754		- }
	755	+ }*/
755	756	}
756	757
757	758	/**
...	...	@@ -799,7 +800,7 @@
799	800	jsonObject.put("P_HUSBANDCARDNO", patients.getHusbandBirth());//丈夫证件号码
800	801	jsonObject.put("P_HUSBANDBIRTHDAY", sdf.format(patients.getHusbandBirth()));//丈夫出生日期
801	802	jsonObject.put("P_HUSBANDEDUCATIONLEVEL","");
802		- jsonObject.put("P_HOSPITALID", "");//todo建党机构
	803	+ jsonObject.put("P_HOSPITALID", "2100001981");
803	804	jsonObject.put("P_HUSBANDOCCUPATIONID","");
804	805	jsonObject.put("P_HUSBANDRRTOWNSHIP","");
805	806	jsonObject.put("P_HUSBANDRRVILLAGE","");
...	...	@@ -815,7 +816,7 @@
815	816	jsonObject.put("P_HUSBANDRRCOUNTY", patients.getHareaRegisterId());//丈夫户口所在地县
816	817	jsonObject.put("P_HUSBANDRRSTREET", patients.getHstreetRegisterId());//丈夫户口所在地街道
817	818	jsonObject.put("P_CLINICNO", patients.getVcCardNo());//条码号
818		- jsonObject.put("P_DOCID", "建档人");//todo建档人
	819	+ jsonObject.put("P_DOCID", "2100004880");
819	820	//让写死桃城区，董勤说最后定
820	821	jsonObject.put("P_FILINGTIME", sdf.format(patients.getBookbuildingDate()));//建档时间
821	822
...	...	@@ -2372,9 +2373,9 @@
2372	2373	} else {
2373	2374	param.setReqHusband(null);
2374	2375	}
2375		- param.setTownOrgId("429663d7-acdb-7c90-e053-1164010a77c8");//todo
2376		- param.setBookbuildingDoctor("1000000185");//todo
2377		- param.setHospitalId("216");//todo
	2376	+ param.setTownOrgId("429663d7-acdb-7c90-e053-1164010a77c8");
	2377	+ param.setBookbuildingDoctor("2100004880");
	2378	+ param.setHospitalId("2100001981");
2378	2379	return param;
2379	2380	}
2380	2381

...	...	@@ -57,8 +57,8 @@
57	57	continue;
58	58	}
59	59
60		- list.setHospitalId("216");//todo
61		- list.setBookbuildingDoctor("1000000185");//todo
	60	+ list.setHospitalId("2100001981");
	61	+ list.setBookbuildingDoctor("2100004880");
62	62	list.setBookbuildingDate(DateUtil.getyyyy_MM_dd(new Date()));
63	63	list.setHusbandNationId(queryParentConfig(list.getHusbandNationId()));
64	64	list.setPregnantNationId(queryParentConfig(list.getPregnantNationId()));