fangcheng / regional-platform

Download as
Browse Code »

Commit 9b4fc00f7da42ed7d690f0d5f2236f9f2746fe20

Authored by jiangjiazhi
2 parents 8c90f08f2d fa68d6d322
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java View file @ 9b4fc00
... ... @@ -34,10 +34,10 @@
34 34 * @param request
35 35 * @return
36 36 */
37   - @RequestMapping(value = "/addPremaritalCheckup", method = RequestMethod.POST)
  37 + @RequestMapping(value = "/addOrUpdatePremaritalCheckup", method = RequestMethod.POST)
38 38 @ResponseBody
39 39 @TokenRequired
40   - public BaseResponse addPremaritalCheckup(@RequestBody PremaritalCheckupAddRequest addRequest,
  40 + public BaseResponse addOrUpdatePremaritalCheckup(@RequestBody PremaritalCheckupAddRequest addRequest,
41 41 HttpServletRequest request){
42 42 //获取当前登录用户ID
43 43 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 9b4fc00
... ... @@ -1453,7 +1453,7 @@
1453 1453 if(!StringUtils.isEmpty(request.getHospitalId())){
1454 1454 hospitalIdList.add(request.getHospitalId());
1455 1455 }else if(!StringUtils.isEmpty(request.getHospitalAreaId())){
1456   - organizationQuery.setAreaId(request.getAreaId());
  1456 + organizationQuery.setAreaId(request.getHospitalAreaId());
1457 1457 List<Organization> organizationList = organizationService.queryOrganization(organizationQuery);
1458 1458 for (Organization organization : organizationList) {
1459 1459 hospitalIdList.add(String.valueOf(organization.getId()));
... ... @@ -1464,8 +1464,8 @@
1464 1464 for (Organization organization : organizationList) {
1465 1465 hospitalIdList.add(String.valueOf(organization.getId()));
1466 1466 }
1467   - }else if(!StringUtils.isEmpty(request.getProvinceId())){
1468   - organizationQuery.setProvinceId(request.getProvinceId());
  1467 + }else if(!StringUtils.isEmpty(request.getHospitalProvinceId())){
  1468 + organizationQuery.setProvinceId(request.getHospitalProvinceId());
1469 1469 List<Organization> organizationList = organizationService.queryOrganization(organizationQuery);
1470 1470 for (Organization organization : organizationList) {
1471 1471 hospitalIdList.add(String.valueOf(organization.getId()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ 9b4fc00
... ... @@ -397,23 +397,6 @@
397 397 }
398 398  
399 399 /**
400   - * 把json对象串转换成map对象
401   - * @param jsonObjStr e.g. {'name':'get','int':1,'double',1.1,'null':null}
402   - * @return Map
403   - */
404   - public static Map getMapFromJsonObjStr(String jsonObjStr) {
405   - JSONObject jsonObject = JSONObject.fromObject(jsonObjStr);
406   -
407   - Map map = new HashMap();
408   - for (Iterator iter = jsonObject.keys(); iter.hasNext();) {
409   - String key = (String) iter.next();
410   - map.put(key, jsonObject.get(key));
411   - }
412   - return map;
413   - }
414   -
415   -
416   - /**
417 400 * 妇女健康管理
418 401 * @param queryRequest
419 402 * @param userId
... ... @@ -439,7 +422,7 @@
439 422 query.setAreaId(queryRequest.getAreaId());
440 423 query.setVcCardNo(queryRequest.getVcCardNo());
441 424 query.setCertificateNum(queryRequest.getCardNo());
442   - query.setCertificateTypeId(queryRequest.getCertificateTypeId());
  425 +// query.setCertificateTypeId(queryRequest.getCertificateTypeId());
443 426 query.setUsername(queryRequest.getUsername());
444 427 query.setPhone(queryRequest.getPhone());
445 428