fangcheng / regional-platform

Download as
Browse Code »

Commit ea3785d0283e9a092a7839d6c3742c28c85ab6ea

Authored by hujiaqi
1 parent bc35244b9b
Exists in master and in 1 other branch nobuildprocess

导出excel修改

Showing 3 changed files with 18 additions and 0 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java View file @ ea3785d
... ... @@ -137,6 +137,7 @@
137 137 return baseListResponse;
138 138 }
139 139  
  140 + @TokenRequired
140 141 @RequestMapping(value = "childbirthManagerExcel", method = RequestMethod.POST)
141 142 public void childbirthManagerExcel(HttpServletRequest httpServletRequest, @RequestBody ChildbirthManagerRequest childbirthManagerRequest, HttpServletResponse httpServletResponse) {
142 143 try {
... ... @@ -194,6 +195,7 @@
194 195 return baseListResponse;
195 196 }
196 197  
  198 + @TokenRequired
197 199 @RequestMapping(value = "newBabyManagerExcel", method = RequestMethod.POST)
198 200 public void newBabyManagerExcel(HttpServletRequest httpServletRequest, @RequestBody NewBabyManagerRequest newBabyManagerRequest, HttpServletResponse httpServletResponse) {
199 201 try {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ ea3785d
... ... @@ -1207,6 +1207,7 @@
1207 1207 List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
1208 1208 if (maternalDeliverModelList != null && maternalDeliverModelList.size() == 1) {
1209 1209 newBabyManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModelList.get(0).getDeliverDoctor())).getName());
  1210 + newBabyManagerQueryModel.setParentId(maternalDeliverModelList.get(0).getParentId());
1210 1211 }
1211 1212 } catch (Exception e) {
1212 1213 // 什么都不干，这么干是为了避开原始数据的问题
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java View file @ ea3785d
... ... @@ -9,6 +9,13 @@
9 9  
10 10 /**
11 11 * @auther HuJiaqi
  12 + * @createTime 2016年12月16日 10时35分
  13 + * @discription
  14 + */
  15 + private String parentId;
  16 +
  17 + /**
  18 + * @auther HuJiaqi
12 19 * @createTime 2016年12月08日 10时51分
13 20 * @discription 分娩日期
14 21 */
... ... @@ -230,6 +237,14 @@
230 237  
231 238 public void setDeliverDoctor(String deliverDoctor) {
232 239 this.deliverDoctor = deliverDoctor;
  240 + }
  241 +
  242 + public String getParentId() {
  243 + return parentId;
  244 + }
  245 +
  246 + public void setParentId(String parentId) {
  247 + this.parentId = parentId;
233 248 }
234 249 }