From 1ce21fd8da1d1ff4a8fc770424e66152800122ce Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sat, 16 Feb 2019 16:09:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/PatientServiceFacade.java | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index f9ffbe2..efc6d5c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -974,18 +974,18 @@ public class PatientServiceFacade { jsonObject.put("createDate", DateUtil.getyyyy_MM_dd_hms(ps.getCreateDate())); - jsonObject.put("device", ps.getDevice()); - jsonObject.put("deviceCon", ps.getDeviceCon()); - jsonObject.put("doctorWeek", ps.getDoctorWeek()); - jsonObject.put("serviceWeek", ps.getServiceWeek()); - jsonObject.put("serStartWeek", ps.getSerStartWeek()); - jsonObject.put("serEndWeek", ps.getSerEndWeek()); - jsonObject.put("serStartTime", DateUtil.getyyyy_MM_dd_hms(ps.getSerStartTime())); - jsonObject.put("serEndTime", DateUtil.getyyyy_MM_dd_hms(ps.getSerEndTime())); - jsonObject.put("docStartWeek", ps.getDocStartWeek()); - jsonObject.put("docEndWeek", ps.getDocEndWeek()); - jsonObject.put("docStartTime", DateUtil.getyyyy_MM_dd_hms(ps.getDocStartTime())); - jsonObject.put("docEndTime", DateUtil.getyyyy_MM_dd_hms(ps.getDocEndTime())); + jsonObject.put("device", ps.getDevice() == null ? "" : ps.getDevice()); + jsonObject.put("deviceCon", ps.getDeviceCon() == null ? "" : ps.getDeviceCon()); + jsonObject.put("doctorWeek", ps.getDoctorWeek() == null ? "" : ps.getDoctorWeek()); + jsonObject.put("serviceWeek", ps.getServiceWeek() == null ? "" : ps.getServiceWeek()); + jsonObject.put("serStartWeek", ps.getSerStartWeek() == null ? "" : ps.getSerStartWeek()); + jsonObject.put("serEndWeek", ps.getSerEndWeek() == null ? "" : ps.getSerEndWeek()); + jsonObject.put("serStartTime", ps.getSerStartTime() == null ? "" : DateUtil.getyyyy_MM_dd_hms(ps.getSerStartTime())); + jsonObject.put("serEndTime", ps.getSerEndTime() == null ? "" : DateUtil.getyyyy_MM_dd_hms(ps.getSerEndTime())); + jsonObject.put("docStartWeek", ps.getDocStartWeek() == null ? "" : ps.getDocStartWeek()); + jsonObject.put("docEndWeek", ps.getDocEndWeek() == null ? "" : ps.getDocEndWeek()); + jsonObject.put("docStartTime", ps.getDocStartTime() == null ? "" : DateUtil.getyyyy_MM_dd_hms(ps.getDocStartTime())); + jsonObject.put("docEndTime", ps.getDocEndTime() == null ? "" : DateUtil.getyyyy_MM_dd_hms(ps.getDocEndTime())); jsonArray.add(jsonObject); -- 1.8.3.1