jiangjiazhi / regional-platform

Commit 9337de1edc333da92866d90c7815f36280740c35

Authored by liquanyu about 2 years ago

Exists in master and in 6 other branches

分娩记录

Showing 3 changed files with 29 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java

...	...	@@ -789,6 +789,7 @@
789	789	areaQueryMap.put("patientId", "");
790	790	areaQueryMap.put("pid", "");
791	791	areaQueryMap.put("yyzyfmHospitalId", "预约住院分娩医院");
	792	+ areaQueryMap.put("firstHospitalId", "首次建档医院");
792	793	areaQueryMap.put("czWeek", "初诊孕周");
793	794	areaQueryMap.put("hivkt", "艾滋病检测结果");
794	795	areaQueryMap.put("syjg", "梅毒检测结果");

...	...	@@ -13,6 +13,7 @@
13	13
14	14	//预约住院分娩医院(滦平定制)
15	15	private String yyzyfmHospitalId;
	16	+ private String firstHospitalId;
16	17
17	18
18	19	/承德定制/
...	...	@@ -1017,6 +1018,14 @@
1017	1018
1018	1019	public void setUmbilicalCordEx(String umbilicalCordEx) {
1019	1020	this.umbilicalCordEx = umbilicalCordEx;
	1021	+ }
	1022	+
	1023	+ public String getFirstHospitalId() {
	1024	+ return firstHospitalId;
	1025	+ }
	1026	+
	1027	+ public void setFirstHospitalId(String firstHospitalId) {
	1028	+ this.firstHospitalId = firstHospitalId;
1020	1029	}
1021	1030
1022	1031	public String getUmbilicalCordExType() {

...	...	@@ -89,11 +89,17 @@
89	89	BeanUtils.copy(patients, childbirthManagerQueryModel);
90	90	childbirthManagerQueryModel.setCoupon(patients.isSendCoupon() == null
91	91	? null : String.valueOf(patients.isSendCoupon()));
	92	+
	93	+ //建档机构的医院id
	94	+ String hospitalId = null;
	95	+
92	96	// 承德定制使用
93	97	if(antExService != null && initQuery.contains("fmHospital") && initQuery.contains("buildWeek")
94	98	&& initQuery.contains("czWeek") && initQuery.contains("hivkt")
95	99	&& initQuery.contains("syjg") && initQuery.contains("ygbmky")){
96	100
	101	+
	102	+
97	103	AntExChuQuery antExChuQuery = new AntExChuQuery();
98	104	antExChuQuery.setYn(YnEnums.YES.getId());
99	105	antExChuQuery.setParentId(patients.getId());
...	...	@@ -108,6 +114,7 @@
108	114	List <Patients> patientsList = new ArrayList <>();
109	115	//获取主档案
110	116	Patients patients1 = mongoTemplate.findOne(Query.query(Criteria.where("id").is(patients.getSource())), Patients.class);
	117	+ hospitalId = patients1.getHospitalId();
111	118	patientsList.add(patients1);
112	119	//获取隐藏档案
113	120	List<Patients> pats = mongoTemplate.find(Query.query(Criteria.where("source").is(patients.getSource()).and("enable").is("2")), Patients.class);
114	121
...	...	@@ -115,8 +122,11 @@
115	122	for (Patients p: patientsList ) {
116	123	setCzInfo(p, childbirthManagerQueryModel);
117	124	}
118		-
119	125	}
	126	+ else
	127	+ {
	128	+ hospitalId = patients.getHospitalId();
	129	+ }
120	130
121	131	}
122	132
...	...	@@ -142,6 +152,14 @@
142	152	String organizationName = organizationService.getOrganizationName(patients.getYyzyfmHospitalId());
143	153	if(org.apache.commons.lang.StringUtils.isNotEmpty(organizationName)){
144	154	childbirthManagerQueryModel.setYyzyfmHospitalId(organizationName);
	155	+ }
	156	+ }
	157	+
	158	+ //建档机构
	159	+ if(StringUtils.isNotEmpty(hospitalId)){
	160	+ String organizationName = organizationService.getOrganizationName(hospitalId);
	161	+ if(org.apache.commons.lang.StringUtils.isNotEmpty(organizationName)){
	162	+ childbirthManagerQueryModel.setFirstHospitalId(organizationName);
145	163	}
146	164	}
147	165	//区域妇幼管理--分挽管理---导出:增加建挡孕周、初诊孕周、艾梅乙结果，区域妇幼管理--分挽管理---列表及导出