Commit 2c0e14390b828c9e1bf69536373a00ba345850ef
1 parent
10ae3036b0
Exists in
master
and in
3 other branches
秦皇岛需求4.18
Showing 2 changed files with 26 additions and 18 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyEyeCheckController.java
View file @
2c0e143
... | ... | @@ -53,30 +53,30 @@ |
53 | 53 | } |
54 | 54 | /** |
55 | 55 | * 搜索儿童体检套餐是否使用 |
56 | - * @param babyCheck | |
56 | + * @param checkMonthId | |
57 | 57 | * @param request |
58 | 58 | * @return |
59 | 59 | */ |
60 | 60 | @ResponseBody |
61 | 61 | @TokenRequired |
62 | - @RequestMapping(value = "/findisTJTC",method = RequestMethod.POST) | |
63 | - public BaseResponse findisTJTC(@RequestBody LhBabyEyeCheck babyCheck, HttpServletRequest request) { | |
62 | + @RequestMapping(value = "/findisTJTC") | |
63 | + public BaseResponse findisTJTC(@RequestParam("checkMonthId") String checkMonthId, HttpServletRequest request) { | |
64 | 64 | |
65 | 65 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
66 | 66 | LhBabyEyelCheckQuery babyQuery = new LhBabyEyelCheckQuery(); |
67 | - babyQuery.setCheckMonthId(babyCheck.getCheckMonthId()); | |
67 | + babyQuery.setCheckMonthId(checkMonthId); | |
68 | 68 | List<LhBabyEyeCheck> lhBaby = lhBabyEyeCheckService.queryList(babyQuery, Sort.Direction.DESC,new String[]{"eyeCheckTime","created"}); |
69 | 69 | BaseObjectResponse br = new BaseObjectResponse(); |
70 | 70 | if (lhBaby.size()>1){ |
71 | - br.setErrorcode(ErrorCodeConstants.DATA_EXIST); | |
72 | - br.setErrormsg("失败"); | |
73 | - br.setData(babyCheck.getId()); | |
74 | - return br; | |
75 | - } | |
76 | 71 | br.setErrorcode(ErrorCodeConstants.SUCCESS); |
77 | 72 | br.setErrormsg("成功"); |
78 | - br.setData(babyCheck.getId()); | |
73 | + br.setData(checkMonthId); | |
79 | 74 | return br; |
75 | + } | |
76 | + br.setErrorcode(ErrorCodeConstants.DATA_EXIST); | |
77 | + br.setErrormsg("失败"); | |
78 | + br.setData(checkMonthId); | |
79 | + return br; | |
80 | 80 | } |
81 | 81 | |
82 | 82 | /** |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
View file @
2c0e143
... | ... | @@ -460,29 +460,37 @@ |
460 | 460 | // continue; |
461 | 461 | // } |
462 | 462 | String hname = organization.getName(); |
463 | - if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院")) { | |
464 | - continue; | |
463 | + if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院") ) { | |
464 | + if (!hname.equals("秦皇岛市妇幼保健院")){ | |
465 | + continue; | |
466 | + } | |
465 | 467 | } |
466 | 468 | } else if (StringUtils.isNotEmpty(isMaternityManagement) && isMaternityManagement.equalsIgnoreCase("2")) { |
467 | 469 | String hname = organization.getName(); |
468 | 470 | // if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) { |
469 | 471 | // continue; |
470 | 472 | // } |
471 | - if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院")) { | |
472 | - continue; | |
473 | + if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院") ) { | |
474 | + if (!hname.equals("秦皇岛市妇幼保健院")){ | |
475 | + continue; | |
476 | + } | |
473 | 477 | } |
474 | 478 | } else if (StringUtils.isNotEmpty(isMaternityManagement) && isMaternityManagement.equalsIgnoreCase("3")) { |
475 | 479 | String hname = organization.getName(); |
476 | 480 | // if ((hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) { |
477 | 481 | // continue; |
478 | 482 | // } |
479 | - if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院")) { | |
480 | - continue; | |
483 | + if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院") ) { | |
484 | + if (!hname.equals("秦皇岛市妇幼保健院")){ | |
485 | + continue; | |
486 | + } | |
481 | 487 | } |
482 | 488 | }else if (users.getOrgId()==216){ |
483 | 489 | String hname = organization.getName(); |
484 | - if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院")) { | |
485 | - continue; | |
490 | + if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院") ) { | |
491 | + if (!hname.equals("秦皇岛市妇幼保健院")){ | |
492 | + continue; | |
493 | + } | |
486 | 494 | } |
487 | 495 | } |
488 | 496 | data.add(organization); |