From a29fed85e2afeb904ec330cfdc10996bd0613884 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 2 May 2016 11:29:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E5=AD=A9=E5=B7=B2?= =?UTF-8?q?=E8=AE=BF=E8=A7=86=E4=BA=86=E3=80=82=E6=98=BE=E7=A4=BA=E6=9C=AA?= =?UTF-8?q?=E8=AE=BF=E8=A7=86=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/biz/dal/IBabyVisitDao.java | 2 +- .../platform/biz/dal/impl/BabyVisitDaoImpl.java | 2 +- .../platform/biz/service/BabyVisitService.java | 7 +++++- .../platform/operate/web/facade/VisitFacade.java | 28 ++++++++++++++++++++-- 4 files changed, 34 insertions(+), 5 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBabyVisitDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBabyVisitDao.java index 8389469..51c8c3d 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBabyVisitDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBabyVisitDao.java @@ -14,7 +14,7 @@ public interface IBabyVisitDao { public BabyVisitModel getOneBabyVisitById(String id); - public int queryBabyCount(MongoQuery query); + public int queryBabyVisitCount(MongoQuery query); public List queryBabyVisitWithQuery(MongoQuery query); diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyVisitDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyVisitDaoImpl.java index 1adae38..5954943 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyVisitDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyVisitDaoImpl.java @@ -31,7 +31,7 @@ public class BabyVisitDaoImpl extends BaseMongoDAOImpl implement } @Override - public int queryBabyCount(MongoQuery query) { + public int queryBabyVisitCount(MongoQuery query) { return (int) count(query.convertToMongoQuery()); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyVisitService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyVisitService.java index 09bb60f..2ad71a9 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyVisitService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyVisitService.java @@ -2,6 +2,7 @@ package com.lyms.platform.biz.service; import java.util.List; +import com.lyms.platform.query.VisitQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.Assert; @@ -36,7 +37,11 @@ public class BabyVisitService { MongoCondition condition = MongoCondition.newInstance("parentId", parentId, MongoOper.IS); return iBabyVisitDao.queryBabyVisitWithQuery(condition.toMongoQuery()); } - + + + public int queryVisitCount(VisitQuery visitQuery){ + return iBabyVisitDao.queryBabyVisitCount(visitQuery.convertToQuery()); + } /** * * 根据id查询访视记录 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java index ee32ae4..98d5471 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java @@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.List; @@ -244,11 +245,18 @@ public class VisitFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - public String getFindTips(String parentId) { + public String getFindTips(String parentId,boolean isM) { + VisitQuery visitQuery = new VisitQuery(); visitQuery.setParentId(parentId); + int count =0; + if(isM){ - int count = visitService.queryVisitCount(visitQuery); + count= visitService.queryVisitCount(visitQuery); + }else + { + count=babyVisitService.queryVisitCount(visitQuery); + } return count <= 0 ? "未访视" : "访视" + count + "次"; } @@ -266,6 +274,22 @@ public class VisitFacade { } return findBabyVisit(puerperaModel);*/ BabyModel babyModel = findOneBabyByMphone(cardNo); + + PatientsQuery patientsQuery =new PatientsQuery(); + patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setType(3); + patientsQuery.setPhone(cardNo); + + List patientses = patientsService.queryPatient(patientsQuery); + + if(CollectionUtils.isNotEmpty(patientses)){ + Patients patients = patientses.get(0); + BabyVisitResult babyVisitResult = new BabyVisitResult(); + babyVisitResult.convertToResult1(patients, CommonsHelper.fullAddress(patients, basicConfigService)); + babyVisitResult.setData(Collections.EMPTY_LIST); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(babyVisitResult); + } + if (null == babyModel) { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("新生儿信息不存在"); } -- 1.8.3.1