From 80b512dcb9b48e1fd3839a37bac1fdfca037b302 Mon Sep 17 00:00:00 2001 From: yangfei Date: Fri, 13 Apr 2018 11:51:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=A4=9A=E7=BA=BF=E7=A8=8B?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/common/utils/DateUtil.java | 3 +++ .../lyms/platform/operate/web/facade/AntenatalExaminationFacade.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index c0c6738..d0b5c03 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -461,9 +461,12 @@ public class DateUtil { return null; } try { + lock.lock(); return y_m_d.format(d); } catch (Exception e) { return null; + }finally { + lock.unlock(); } } 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 01fe3ea..1190f1d 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 @@ -927,7 +927,7 @@ public class AntenatalExaminationFacade { if (null != groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId))) { patientsQuery.setExtEnable(false); } - System.out.println("查询孕妇档案：" + patientsQuery.convertToQuery().convertToMongoQuery()); + // System.out.println("查询孕妇档案：" + patientsQuery.convertToQuery().convertToMongoQuery()); //获取所有的建档记录 List list = patientsService.queryPatient(patientsQuery); AntexListResult antexListResult = new AntexListResult(); -- 1.8.3.1