jiangjiazhi / regional-platform | GitLab

Commit 779e13b058840ff8588e3d4f1d16b406ebff6b5a

Authored by gengxiaokai over 7 years ago

1 parent 8a9437f04c

Exists in master and in 6 other branches

秦皇岛基本公卫

Showing 2 changed files with 11 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QhdJbgwController.java

...	...	@@ -925,11 +925,11 @@
925	925	babyQuery1.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
926	926	models = babyBookbuildingService.queryBabyBuildByCond(babyQuery1);
927	927
928		- BabyModelQuery babyQuery = new BabyModelQuery();
	928	+ /*BabyModelQuery babyQuery = new BabyModelQuery();
929	929	babyQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
930	930	babyQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
931		- babyQuery.setYn(YnEnums.YES.getId());
932		- models1 = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
	931	+ //babyQuery.setYn(YnEnums.YES.getId());
	932	+ models1 = babyBookbuildingService.queryBabyBuildByCond(babyQuery);*/
933	933	if((null != models && models.size() > 0) \|\| (null != models1 && models1.size() > 0)){
934	934	allModels.addAll(models);
935	935	allModels.addAll(models1);

...	...	@@ -153,6 +153,14 @@
153	153	return null;
154	154	}
155	155
	156	+ @RequestMapping(method = RequestMethod.GET,value = "/qhd/testxse")
	157	+ @ResponseBody
	158	+ public List<Map<String,String>> qhdxinshenger(String startDate,String endDate){
	159	+ if(StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)){
	160	+ return qhdJbgwInterface.getXse(startDate, endDate);
	161	+ }
	162	+ return null;
	163	+ }
156	164
157	165	}