From d23c62c9bf48bc12fc25e8425671f4ef149d5e1b Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Fri, 21 Jul 2017 11:03:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=9B=E7=94=B3=E5=B0=94=E8=AE=BF=E8=A7=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/NewbornVisit.java | 22 +++++++++++----------- .../web/controller/NewbornVisitControoler.java | 11 +++++++++++ .../operate/web/service/INewbornVisitService.java | 2 ++ .../web/service/impl/NewbornServiceImpl.java | 18 +++++++++++++++++- 4 files changed, 41 insertions(+), 12 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java b/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java index 8ebbc87..c9be5e3 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java @@ -21,7 +21,7 @@ public class NewbornVisit { // 操作人ID private String operationId; - private String hositalId; + private String hospitalId; private String parentId; @@ -36,7 +36,7 @@ public class NewbornVisit { private String checkTimeDesc; // 访视机构 - private String visitHositalId; + private String visitHospitalId; // 喂养方式 纯母乳/混合/人工 private String feedType; @@ -178,12 +178,12 @@ public class NewbornVisit { this.operationId = operationId; } - public String getHositalId() { - return hositalId; + public String getHospitalId() { + return hospitalId; } - public void setHositalId(String hositalId) { - this.hositalId = hositalId; + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; } public String getParentId() { @@ -226,12 +226,12 @@ public class NewbornVisit { this.checkTimeDesc = checkTimeDesc; } - public String getVisitHositalId() { - return visitHositalId; + public String getVisitHospitalId() { + return visitHospitalId; } - public void setVisitHositalId(String visitHositalId) { - this.visitHositalId = visitHositalId; + public void setVisitHospitalId(String visitHospitalId) { + this.visitHospitalId = visitHospitalId; } public String getFeedType() { @@ -274,7 +274,7 @@ public class NewbornVisit { this.height = height; } - public String isVomit() { + public String getVomit() { return vomit; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java index a4e7d44..e74a22d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java @@ -46,6 +46,17 @@ public class NewbornVisitControoler extends BaseController { } /** + * 新生儿访视查询 + * @param pid + * @return + */ + @RequestMapping(value = "/query", method = RequestMethod.GET) + @ResponseBody + public BaseObjectResponse query(HttpServletRequest request, String pid) { + return visitService.query(getUserId(request), pid); + } + + /** * 新生儿访视导出 * @param startDate 访视开始日期 * @param endDate 访视结束日期 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java index ccbc934..bbb8f4d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java @@ -15,4 +15,6 @@ public interface INewbornVisitService extends IBaseService { BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit); void export(Date startDate, Date endDate, String doctor, Integer userId, HttpServletResponse response, String key); + + BaseObjectResponse query(Integer userId, String pid); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java index 5c139e4..051edc6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java @@ -74,7 +74,7 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit newbornVisit.setSkin(newbornVisit.getSkin() == null ? null : SkinEnums.get(Integer.parseInt(newbornVisit.getSkin())).getName()); newbornVisit.setComplexion(newbornVisit.getComplexion() == null ? null : BregmaticEnums.get(Integer.parseInt(newbornVisit.getComplexion())).getName()); newbornVisit.setUmbilicalCord(newbornVisit.getUmbilicalCord() == null ? null : UmbilicalCordEnums.get(Integer.parseInt(newbornVisit.getUmbilicalCord())).getName()); - newbornVisit.setHositalId(autoMatchFacade.getHospitalId(userId)); + newbornVisit.setHospitalId(autoMatchFacade.getHospitalId(userId)); // newbornVisit.setNextVisitTime(newbornVisit.getUmbilicalCord() == null ? null : UmbilicalCordEnums.get(Integer.parseInt(newbornVisit.getUmbilicalCord())).getName()); if(StringUtils.isEmpty(newbornVisit.getId())) { String babyId = null; @@ -217,4 +217,20 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit ResponseUtil.responseExcel(cnames, results, response); } + @Override + public BaseObjectResponse query(Integer userId, String pid) { + String hospitalId = autoMatchFacade.getHospitalId(userId); + List newbornVisits = mongoTemplate.find(Query.query(Criteria.where("pid").is(pid).and("hospitalId").is(hospitalId)) + .with(new Sort(Sort.Direction.ASC, "checkTime")), NewbornVisit.class); + List> rest = new ArrayList<>(); + for (NewbornVisit newbornVisit : newbornVisits) { + Map temp = new HashMap<>(); + temp.put("pid", newbornVisit.getPid()); + temp.put("checkTime", newbornVisit.getCheckTime() == null ? null : DateUtil.getyyyy_MM_dd(newbornVisit.getCheckTime())); + temp.put("checkTimeDesc", newbornVisit.getCheckTimeDesc()); + rest.add(temp); + } + return RespBuilder.buildSuccess(rest); + } + } -- 1.8.3.1