From 5b1eef3bd2fdc6c85acc2e4c7528dd810644fc12 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 20 Sep 2019 10:46:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=90=8E=E6=96=B9=E5=BC=8F=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/MatDeliverFacade.java | 13 ++++++++++++- .../web/session/strategy/LocalCacheSessionStrategy.java | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index cf5b857..21e66bf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1881,7 +1881,18 @@ public class MatDeliverFacade { // 访视列表无需加上分娩医院，因此注释 //matDeliverQuery.setFmHospitalList(hospitalList); - matDeliverQuery.setFsHospitalId(hospitalId); + if (StringUtils.isNotEmpty(matdeliverFollowRequest.getIsArea())) + { + if (StringUtils.isNotEmpty(matdeliverFollowRequest.getFsHospitalId())) + { + matDeliverQuery.setFsHospitalId(matdeliverFollowRequest.getFsHospitalId()); + } + } + else + { + matDeliverQuery.setFsHospitalId(hospitalId); + } + matDeliverQuery.setContactResult(matdeliverFollowRequest.getContactResult()); if (matdeliverFollowRequest.getContactReason() != null) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/strategy/LocalCacheSessionStrategy.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/strategy/LocalCacheSessionStrategy.java index 341b7ef..ad11454 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/strategy/LocalCacheSessionStrategy.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/strategy/LocalCacheSessionStrategy.java @@ -97,7 +97,7 @@ public class LocalCacheSessionStrategy implements ISessionProvider { } public static void main(String[] args) { - System.out.print(MD5Utils.md5("181818").toUpperCase()); + System.out.print(MD5Utils.md5("733d7be2196ff70efaf6913fc8bdcabf").toUpperCase()); } @Override -- 1.8.3.1