From 74f89ce8351b463465344fffb8d0004d9636d8e3 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 4 May 2017 17:39:47 +0800 Subject: [PATCH] update --- .../platform/permission/model/LisReportModel.java | 11 ++++ .../operate/web/controller/LisController.java | 8 +-- .../platform/operate/web/facade/LisFacade.java | 69 ++++++++++++++++++---- 3 files changed, 72 insertions(+), 16 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportModel.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportModel.java index c68c16a..25b39f5 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportModel.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportModel.java @@ -57,6 +57,17 @@ public class LisReportModel { //检验明细json private String itemJson; + //医院名称 + private String hospitalName; + + public String getHospitalName() { + return hospitalName; + } + + public void setHospitalName(String hospitalName) { + this.hospitalName = hospitalName; + } + public Integer getStatus() { return status; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java index e1f015e..c618885 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java @@ -126,7 +126,7 @@ public class LisController extends BaseController { */ @RequestMapping(method = RequestMethod.GET, value = "/getAppLis") @ResponseBody - public BaseResponse getLisAndRisData(@RequestParam("patientIds") String patientIds, + public List getLisAndRisData(@RequestParam("patientIds") String patientIds, @RequestParam("page") Integer page, @RequestParam("limit") Integer limit, @RequestParam(required = false) Integer status, @@ -135,7 +135,7 @@ public class LisController extends BaseController { if (!"3d19960bf3e81e7d816c4f26051c49ba".equals(token)) { ExceptionUtils.catchException("The request token is " + token); - return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("Token is error"); + return new ArrayList<>(); } return lisFacade.getAppLisList(patientIds, status, page, limit); @@ -150,13 +150,13 @@ public class LisController extends BaseController { */ @RequestMapping(method = RequestMethod.GET, value = "/getAppLisById") @ResponseBody - public BaseResponse getAppLisById(@RequestParam("id") Integer id, + public List getAppLisById(@RequestParam("id") Integer id, @RequestHeader("Authorization") String token) { if (!"3d19960bf3e81e7d816c4f26051c49ba".equals(token)) { ExceptionUtils.catchException("The request token is " + token); - return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("Token is error"); + return new ArrayList<>(); } return lisFacade.getAppLisById(id); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java index a3ab882..46943e7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java @@ -403,7 +403,7 @@ public class LisFacade { * @param patientIds 院内系统孕妇建档id * @return */ - public BaseResponse getAppLisList(String patientIds,Integer status,Integer page,Integer limit) { + public List getAppLisList(String patientIds,Integer status,Integer page,Integer limit) { List ids = new ArrayList<>(); if (StringUtils.isNotEmpty(patientIds)) @@ -448,11 +448,14 @@ public class LisFacade { query.setStatus(status); query.setHospitalIds(hosptalIds); + Map hospitalNames = getHospitalNames(hosptalIds); + lises = lisService.queryLisDataByQuery(query); if (CollectionUtils.isNotEmpty(lises)) { for(LisReportModel lisReportModel : lises) { + lisReportModel.setHospitalName(hospitalNames.get(lisReportModel.getHospitalId())); String json = lisReportModel.getItemJson(); if (StringUtils.isNotEmpty(json)) { @@ -463,11 +466,12 @@ public class LisFacade { } } } - BaseObjectResponse objectResponse = new BaseObjectResponse(); - objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); - objectResponse.setData(lises); - objectResponse.setErrormsg("成功"); - return objectResponse; +// BaseObjectResponse objectResponse = new BaseObjectResponse(); +// objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); +// objectResponse.setData(lises); +// objectResponse.setErrormsg("成功"); +// return objectResponse; + return lises; } /** @@ -500,7 +504,7 @@ public class LisFacade { * @param id * @return */ - public BaseResponse getAppLisById(Integer id) { + public List getAppLisById(Integer id) { LisReportQuery query = new LisReportQuery(); query.setId(id); @@ -510,19 +514,60 @@ public class LisFacade { { for(LisReportModel lisReportModel : lises) { + Organization organization = null; + if (StringUtils.isNotEmpty(lisReportModel.getHospitalId())) + { + organization = organizationService.getOrganization(Integer.parseInt(lisReportModel.getHospitalId())); + } String json = lisReportModel.getItemJson(); if (StringUtils.isNotEmpty(json)) { + if (organization != null) + { + lisReportModel.setHospitalName(organization.getName()); + } List items = JsonUtil.toList(json, LisReportItemModel.class); lisReportModel.setItems(items); lisReportModel.setItemJson(null); } } } - BaseObjectResponse objectResponse = new BaseObjectResponse(); - objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); - objectResponse.setData(lises); - objectResponse.setErrormsg("成功"); - return objectResponse; +// BaseObjectResponse objectResponse = new BaseObjectResponse(); +// objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); +// objectResponse.setData(lises); +// objectResponse.setErrormsg("成功"); +// return objectResponse; + return lises; + } + + + /** + * 查询医院名称 + * @param hospitalIds + * @return + */ + private Map getHospitalNames(List hospitalIds) + { + Map hospitalNames = new HashMap<>(); + List ids = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(hospitalIds)) + { + for(String hId : hospitalIds) + { + ids.add(Integer.parseInt(hId)); + } + } + + OrganizationQuery query = new OrganizationQuery(); + query.setIdList(ids); + + List organizations = organizationService.queryHospitals(query); + if (CollectionUtils.isNotEmpty(organizations)) + { + for (Organization organization : organizations){ + hospitalNames.put(organization.getId()+"",organization.getName()); + } + } + return hospitalNames; } } \ No newline at end of file -- 1.8.3.1