jiangjiazhi / regional-platform | GitLab

Commit 380cc3500805d65a2d1bde713d26ab6703fed0cc

Authored by gengxiaokai about 7 years ago

1 parent c4d8363af0

Exists in master and in 6 other branches

威海分娩记录导出修改

Showing 4 changed files with 11 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.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

...	...	@@ -312,7 +312,7 @@
312	312	map.put("num",num);
313	313	map.put("dueDate",queryModel.getDueDate());
314	314	map.put("fmTime",queryModel.getFmTime());
315		- map.put("zyNo","-");
	315	+ map.put("zyNo",queryModel.getBhnum());
316	316	map.put("name",queryModel.getName());
317	317	map.put("age", queryModel.getAge());
318	318	//居住地

...	...	@@ -208,8 +208,6 @@
208	208	}else{
209	209	return new BaseObjectResponse().setErrormsg("请输入查询条件！").setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
210	210	}
211		-
212		-
213	211	return new BaseObjectResponse().setErrormsg("成功！").setErrorcode(ErrorCodeConstants.SUCCESS).setData(postpartumRecordsResult);
214	212	}
215	213

...	...	@@ -423,6 +423,15 @@
423	423	private String dlfm;//导乐分娩(0:未选择；1:已选择)
424	424	private String fmzty;//分娩镇痛仪(0:未选择；1:已选择)
425	425	private String zypbfm;//专业陪伴分娩(0:未选择；1:已选择)
	426	+ private String bhnum;//住院号
	427	+
	428	+ public String getBhnum() {
	429	+ return bhnum;
	430	+ }
	431	+
	432	+ public void setBhnum(String bhnum) {
	433	+ this.bhnum = bhnum;
	434	+ }
426	435
427	436	public String getZgnmz() {
428	437	return zgnmz;

...	...	@@ -500,6 +500,7 @@
500	500	childbirthManagerQueryModel.setZypbfm(maternalDeliverModel.getZypbfm());//专业陪伴分娩(0:未选择；1:已选择)
501	501	childbirthManagerQueryModel.setDueCount(maternalDeliverModel.getDueCount());//产次
502	502	childbirthManagerQueryModel.setMyzd(maternalDeliverModel.getMyzd());//母婴阻断
	503	+ childbirthManagerQueryModel.setBhnum(maternalDeliverModel.getBhNum());//住院号
503	504
504	505	childbirthManagerQueryModelList.add(childbirthManagerQueryModel);
505	506