From 4f8c66917706bfeb62e7cbdd39f7e2a1ae4801fc Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 24 Oct 2017 14:04:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E8=8A=82=E7=82=B9=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/operate/web/facade/AreaCountFacade.java | 4 ++-- .../java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java index 26d4cbe..bff17eb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java @@ -534,7 +534,7 @@ public class AreaCountFacade { for (Map map : list) { Map result = new HashMap<>(); - result.put("createDate", map.get("CREATE_DATE") == null ? "" : DateUtil.getyyyy_MM_dd((Date)map.get("CREATE_DATE"))); //建档日期 + result.put("createDate", map.get("CREATE_DATE")); //建档日期 result.put("name", map.get("NAME")); //姓名 result.put("buildWeek", map.get("YZ_NAME")); //建档孕周 result.put("hospitalName", map.get("HOSPITAL_NAME")); //建档机构 @@ -814,7 +814,7 @@ public class AreaCountFacade { for (Map map : ticketList) { Map result = new HashMap<>(); - result.put("examineDate", map.get("EXAMINE_DATE") == null ? "" : DateUtil.getyyyy_MM_dd((Date)map.get("EXAMINE_DATE"))); //产检日期 + result.put("examineDate", map.get("EXAMINE_DATE")); //产检日期 result.put("name", map.get("NAME")); //姓名 result.put("checkWeek", map.get("YZ_NAME")); //产检孕周 result.put("examineHistoryNum", map.get("EXAMINE_HISTORY_NUM")); //产检第次 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 2e527eb..0549af5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -107,6 +107,8 @@ public class BookbuildingFacade { private SieveService sieveService; @Autowired private OrganizationGroupsFacade groupsFacade; + @Autowired + private OperateLogFacade operateLogFacade; @Autowired private AutoIncermentService autoIncermentService; @@ -249,6 +251,8 @@ public class BookbuildingFacade { patient.setOperator(userId); Patients p = yunBookbuildingService.addPregnantBookbuilding(patient); +// operateLogFacade.addOptLog(userId,Integer.valueOf(yunRequest.getHospitalId()),JsonUtil.array2JsonString(p),"",OptActionEnums.ADD.getId(),""); + /** 孕妇建档后把所有以前未使用的优惠券作废 */ couponService.invalid(p.getPid(), "1,2,3,4,5,6,7,8"); -- 1.8.3.1