From c4bb380ba7c7cbad84417a1b3d4ab3e55fd1c62a Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 2 Nov 2016 10:49:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AC=E8=AF=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../permission/service/impl/UsersServiceImpl.java  | 25 ++++++++++++----------
 .../web/facade/AntenatalExaminationFacade.java     |  5 ++---
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UsersServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UsersServiceImpl.java
index e2159a8..beb415f 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UsersServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UsersServiceImpl.java
@@ -28,16 +28,16 @@ public class UsersServiceImpl extends DataAccessLayerService implements UsersSer
     @Autowired
     private ISyncDataDao iSyncDataDao;
 
-    private LoadingCache<Integer, Users> cached = null;
+//    private LoadingCache<Integer, Users> cached = null;
 
     public UsersServiceImpl() {
         //cache size 为400 缓存3分钟
-        cached = CacheHelper.cached(new CacheLoader<Integer, Users>() {
-            @Override
-            public Users load(Integer key) throws Exception {
-                return usersMapper.getUsers(key);
-            }
-        }, 400, 3);
+//        cached = CacheHelper.cached(new CacheLoader<Integer, Users>() {
+//            @Override
+//            public Users load(Integer key) throws Exception {
+//                return usersMapper.getUsers(key);
+//            }
+//        }, 400, 3);
     }
 
 
@@ -50,6 +50,9 @@ public class UsersServiceImpl extends DataAccessLayerService implements UsersSer
     @Override
     public void updateUsers(Users obj) {
         usersMapper.updateUsers(obj);
+//        if(null!=obj.getId()){
+//            cached.invalidate(obj.getId());
+//        }
         iSyncDataDao.addSyncData("MysqlUpdate", obj, obj.getId().toString());
     }
 
@@ -61,10 +64,10 @@ public class UsersServiceImpl extends DataAccessLayerService implements UsersSer
 
     @Override
     public Users getUsers(final Integer id) {
-        try {
-            return cached.get(id);
-        }catch (Exception e){
-        }
+//        try {
+//            return cached.get(id);
+//        }catch (Exception e){
+//        }
         return usersMapper.getUsers(id);
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
index 804cae0..033233b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
@@ -131,9 +131,6 @@ public class AntenatalExaminationFacade {
 
             Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId());
 
-            //修改最后一次检查时间
-            setLashCTimes(hospitalId, antExAddRequest.getParentId(), 2);
-
             patients.setLastCheckEmployeeId(antExAddRequest.getCheckDoctor());
 
             patientsService.updatePatient(patients);
@@ -142,6 +139,8 @@ public class AntenatalExaminationFacade {
 
             //修改本院最后一次定义高危
             updateLastRhTime(patients.getId(), hospitalId);
+            //修改最后一次检查时间
+            setLashCTimes(hospitalId, antExAddRequest.getParentId(), 2);
         } else {
             AntenatalExaminationModel model = antExAddRequest.convertToDataModel();
             model.setOperator(userId);
-- 
1.8.3.1