From e42a14bf15b56d595d4aadbee7605a055d5cf7a9 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 22 Apr 2016 15:40:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platform-biz-patient-service/pom.xml | 5 +---- .../main/java/com/lyms/platform/biz/service/PuerperaService.java | 8 ++++++-- .../src/main/java/com/lyms/platform/query/PuerperaModelQuery.java | 3 ++- .../java/com/lyms/platform/operate/web/facade/VisitFacade.java | 6 +++++- .../platform/operate/web/inteceptor/TokenValidateInteceptor.java | 2 -- platform-resource/resources/config-dev.properties | 2 +- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/platform-biz-patient-service/pom.xml b/platform-biz-patient-service/pom.xml index 6578c4e..28540a1 100644 --- a/platform-biz-patient-service/pom.xml +++ b/platform-biz-patient-service/pom.xml @@ -37,8 +37,5 @@ platform-biz-patient-service - - - - + \ No newline at end of file diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PuerperaService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PuerperaService.java index fea524d..4038249 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PuerperaService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PuerperaService.java @@ -2,6 +2,7 @@ package com.lyms.platform.biz.service; import java.util.List; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort.Direction; @@ -45,8 +46,11 @@ public class PuerperaService { * @return */ public PuerperaModel findOnePuerperaByCardNo(PuerperaModelQuery puerperaQuery) { - - return iPuerperaDao.queryPuerpera(puerperaQuery.convertToQuery()).get(0); + List result = iPuerperaDao.queryPuerpera(puerperaQuery.convertToQuery()); + if(CollectionUtils.isEmpty(result)){ + return result.get(0); + } + return null; } public PuerperaModel findOnePuerperaById(String id) { diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PuerperaModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PuerperaModelQuery.java index 2696c97..ad4c099 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PuerperaModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PuerperaModelQuery.java @@ -2,6 +2,7 @@ package com.lyms.platform.query; import java.util.Date; +import org.bson.types.ObjectId; import org.springframework.data.mongodb.core.query.Criteria; import com.lyms.platform.common.base.IConvertToNativeQuery; @@ -154,7 +155,7 @@ public class PuerperaModelQuery extends BaseQuery implements IConvertToNativeQue condition= condition.and("communityId", communityId, MongoOper.IS); } if(null!=id){ - condition= condition.and("id", id, MongoOper.IS); + condition= condition.and("id", new ObjectId(id), MongoOper.IS); } if(null!=cardNo){ condition=condition.and("cardno", cardNo, MongoOper.IS); 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 8c83f69..e4e1f83 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 @@ -69,7 +69,11 @@ public class VisitFacade { * @return */ public BaseObjectResponse findOneByCardNo(String cardNo) { - return doBiz(findOnePuerperaByCardNo(cardNo)); + PuerperaModel puerperaModel= findOnePuerperaByCardNo(cardNo); + if (null == puerperaModel) { + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("产妇信息不存在"); + } + return doBiz(puerperaModel); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java index b6f2559..173534b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java @@ -35,8 +35,6 @@ import java.util.Date; */ public class TokenValidateInteceptor extends HandlerInterceptorAdapter { @Autowired - private TokenService tokenService; - @Autowired private UsersService usersService; public static boolean isSiteController(Object handler) { diff --git a/platform-resource/resources/config-dev.properties b/platform-resource/resources/config-dev.properties index 76e79b0..fddab0c 100644 --- a/platform-resource/resources/config-dev.properties +++ b/platform-resource/resources/config-dev.properties @@ -1,6 +1,6 @@ mongo.db.host=localhost mongo.db.port=27017 -mongo.db.dbname=dev_mongo +mongo.db.dbname=platform mysql.db.name=platform -- 1.8.3.1