Commit 6dd125d99fe20631399faa21fa57403812cfca43
1 parent
e0b7edccec
Exists in
master
and in
6 other branches
服务同步
Showing 1 changed file with 12 additions and 12 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
View file @
6dd125d
... | ... | @@ -993,18 +993,18 @@ |
993 | 993 | jsonObject.put("createDate", DateUtil.getyyyy_MM_dd_hms(ps.getCreateDate())); |
994 | 994 | |
995 | 995 | |
996 | -// jsonObject.put("device", ps.getDevice() == null ? "" : ps.getDevice()); | |
997 | -// jsonObject.put("deviceCon", ps.getDeviceCon() == null ? "" : ps.getDeviceCon()); | |
998 | -// jsonObject.put("doctorWeek", ps.getDoctorWeek() == null ? "" : ps.getDoctorWeek()); | |
999 | -// jsonObject.put("serviceWeek", ps.getServiceWeek() == null ? "" : ps.getServiceWeek()); | |
1000 | -// jsonObject.put("serStartWeek", ps.getSerStartWeek() == null ? "" : ps.getSerStartWeek()); | |
1001 | -// jsonObject.put("serEndWeek", ps.getSerEndWeek() == null ? "" : ps.getSerEndWeek()); | |
1002 | -// jsonObject.put("serStartTime", ps.getSerStartTime() == null ? "" : DateUtil.getyyyy_MM_dd_hms(ps.getSerStartTime())); | |
1003 | -// jsonObject.put("serEndTime", ps.getSerEndTime() == null ? "" : DateUtil.getyyyy_MM_dd_hms(ps.getSerEndTime())); | |
1004 | -// jsonObject.put("docStartWeek", ps.getDocStartWeek() == null ? "" : ps.getDocStartWeek()); | |
1005 | -// jsonObject.put("docEndWeek", ps.getDocEndWeek() == null ? "" : ps.getDocEndWeek()); | |
1006 | -// jsonObject.put("docStartTime", ps.getDocStartTime() == null ? "" : DateUtil.getyyyy_MM_dd_hms(ps.getDocStartTime())); | |
1007 | -// jsonObject.put("docEndTime", ps.getDocEndTime() == null ? "" : DateUtil.getyyyy_MM_dd_hms(ps.getDocEndTime())); | |
996 | + jsonObject.put("device", ps.getDevice() == null ? "" : ps.getDevice()); | |
997 | + jsonObject.put("deviceCon", ps.getDeviceCon() == null ? "" : ps.getDeviceCon()); | |
998 | + jsonObject.put("doctorWeek", ps.getDoctorWeek() == null ? "" : ps.getDoctorWeek()); | |
999 | + jsonObject.put("serviceWeek", ps.getServiceWeek() == null ? "" : ps.getServiceWeek()); | |
1000 | + jsonObject.put("serStartWeek", ps.getSerStartWeek() == null ? "" : ps.getSerStartWeek()); | |
1001 | + jsonObject.put("serEndWeek", ps.getSerEndWeek() == null ? "" : ps.getSerEndWeek()); | |
1002 | + jsonObject.put("serStartTime", ps.getSerStartTime() == null ? "" : DateUtil.getyyyy_MM_dd_hms(ps.getSerStartTime())); | |
1003 | + jsonObject.put("serEndTime", ps.getSerEndTime() == null ? "" : DateUtil.getyyyy_MM_dd_hms(ps.getSerEndTime())); | |
1004 | + jsonObject.put("docStartWeek", ps.getDocStartWeek() == null ? "" : ps.getDocStartWeek()); | |
1005 | + jsonObject.put("docEndWeek", ps.getDocEndWeek() == null ? "" : ps.getDocEndWeek()); | |
1006 | + jsonObject.put("docStartTime", ps.getDocStartTime() == null ? "" : DateUtil.getyyyy_MM_dd_hms(ps.getDocStartTime())); | |
1007 | + jsonObject.put("docEndTime", ps.getDocEndTime() == null ? "" : DateUtil.getyyyy_MM_dd_hms(ps.getDocEndTime())); | |
1008 | 1008 | |
1009 | 1009 | |
1010 | 1010 | jsonArray.add(jsonObject); |