jiangjiazhi / regional-platform

Commit 335c42a2510173308261f3cd523f2a0c00f38324

Authored by wtt over 6 years ago

Exists in master and in 6 other branches

建档字段匹配

Showing 3 changed files with 10 additions and 7 deletions

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/facade/SaveByV2ThreadPoolFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SyncV2HistoryWorkerx.java

...	...	@@ -784,6 +784,7 @@
784	784	jsonObject.put("P_RRVILLAGE", "");
785	785	jsonObject.put("P_POSTPARTUMVILLAGE", "");
786	786	jsonObject.put("P_RESIDETYPE", "");
	787	+ jsonObject.put("P_ACCOUNTTYPE", "");
787	788	jsonObject.put("P_HUSBANDNAME", patients.getHusbandName());//丈夫姓名
788	789	jsonObject.put("P_HUSBANDCARDTYPE", patients.getHcertificateTypeId());//丈夫证件类型
789	790	jsonObject.put("P_HUSBANDCARDNO", patients.getHusbandBirth());//丈夫证件号码
790	791
...	...	@@ -804,9 +805,9 @@
804	805	jsonObject.put("P_HUSBANDRRCOUNTY", patients.getHareaRegisterId());//丈夫户口所在地县
805	806	jsonObject.put("P_HUSBANDRRSTREET", patients.getHstreetRegisterId());//丈夫户口所在地街道
806	807	jsonObject.put("P_CLINICNO", patients.getVcCardNo());//条码号
807		- jsonObject.put("P_DOCID", patients.getBookbuildingDoctor());//建档人
	808	+ jsonObject.put("P_DOCID", "建档人");//todo建档人
808	809	//让写死桃城区，董勤说最后定
809		- jsonObject.put("P_HOSPITALID", "todo");//建党机构
	810	+ jsonObject.put("P_HOSPITALID", "52c15438-455f-4838-ae79-b18a2315a96e");//todo建党机构
810	811	jsonObject.put("P_FILINGTIME", sdf.format(patients.getBookbuildingDate()));//建档时间
811	812
812	813	if (patients.getReqHusband() != null) {//丈夫信息是否必须
...	...	@@ -2362,7 +2363,9 @@
2362	2363	} else {
2363	2364	param.setReqHusband(null);
2364	2365	}
2365		- param.setHospitalId("216");
	2366	+ param.setTownOrgId("429663d7-acdb-7c90-e053-1164010a77c8");//todo
	2367	+ param.setBookbuildingDoctor("1000000185");//todo
	2368	+ param.setHospitalId("216");//todo
2366	2369	return param;
2367	2370	}
2368	2371

...	...	@@ -92,8 +92,7 @@
92	92	"t.P_HUSBANDNATION as husbandNationId," +//丈夫民族
93	93	"t.P_DOCID as bookbuildingDoctor," +//建档医生
94	94	"t.P_CARDNO as pregnantCertificateNum," +//证件号
95		- "t.P_CARDNO as pregnantNationId," +// 孕妇民族
96		- "t.P_CARDNO as pregnantPhone," +// 孕妇手机号
	95	+ "t.P_MOBILEPHONE as pregnantPhone," +// 孕妇手机号
97	96	"t.P_RRPROVINCE as pregnantLiveProvinceId," +//户口——省
98	97	"t.P_RRCITY as pregnantLiveCityId," +//户口——市
99	98	"t.P_RRCOUNTY as pregnantLiveAreaId," +//户口——区县
...	...	@@ -114,6 +113,7 @@
114	113	"t.P_LASTMENSTRUALPERIOD as lastMenstrualPeriod," +//末次月经
115	114	"t.YCQ as dueDate," +//预产期
116	115	"t.P_FILINGTIME as bookbuildingDate," +//建档日期
	116	+ "t.P_NAME as pregnantName," +//孕妇姓名
117	117	"t.P_HOSPITALID as hospitalId ";//医院Id
118	118
119	119	String sql = "select " + str + " from " +

...	...	@@ -45,8 +45,8 @@
45	45	BaseObjectResponse p=null;
46	46	for (YunBookbuildingAddRequest list : lists) {
47	47	//董勤让写死的
48		- list.setHospitalId("216");
49		- list.setBookbuildingDoctor("1000000185");
	48	+ list.setHospitalId("216");//todo
	49	+ list.setBookbuildingDoctor("1000000185");//todo
50	50
51	51	p = bookbuildingFacade.addPregnantBookbuilding(list, null, false);
52	52	System.out.println("当前线程名称："+Thread.currentThread().getName()+"===保存好建档_id："+p.getData());