jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 1ce21fd8da1d1ff4a8fc770424e66152800122ce

Authored by liquanyu
1 parent d353c85413
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

服务

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 @ 1ce21fd
... ... @@ -974,18 +974,18 @@
974 974 jsonObject.put("createDate", DateUtil.getyyyy_MM_dd_hms(ps.getCreateDate()));
975 975  
976 976  
977   - jsonObject.put("device", ps.getDevice());
978   - jsonObject.put("deviceCon", ps.getDeviceCon());
979   - jsonObject.put("doctorWeek", ps.getDoctorWeek());
980   - jsonObject.put("serviceWeek", ps.getServiceWeek());
981   - jsonObject.put("serStartWeek", ps.getSerStartWeek());
982   - jsonObject.put("serEndWeek", ps.getSerEndWeek());
983   - jsonObject.put("serStartTime", DateUtil.getyyyy_MM_dd_hms(ps.getSerStartTime()));
984   - jsonObject.put("serEndTime", DateUtil.getyyyy_MM_dd_hms(ps.getSerEndTime()));
985   - jsonObject.put("docStartWeek", ps.getDocStartWeek());
986   - jsonObject.put("docEndWeek", ps.getDocEndWeek());
987   - jsonObject.put("docStartTime", DateUtil.getyyyy_MM_dd_hms(ps.getDocStartTime()));
988   - jsonObject.put("docEndTime", DateUtil.getyyyy_MM_dd_hms(ps.getDocEndTime()));
  977 + jsonObject.put("device", ps.getDevice() == null ? "" : ps.getDevice());
  978 + jsonObject.put("deviceCon", ps.getDeviceCon() == null ? "" : ps.getDeviceCon());
  979 + jsonObject.put("doctorWeek", ps.getDoctorWeek() == null ? "" : ps.getDoctorWeek());
  980 + jsonObject.put("serviceWeek", ps.getServiceWeek() == null ? "" : ps.getServiceWeek());
  981 + jsonObject.put("serStartWeek", ps.getSerStartWeek() == null ? "" : ps.getSerStartWeek());
  982 + jsonObject.put("serEndWeek", ps.getSerEndWeek() == null ? "" : ps.getSerEndWeek());
  983 + jsonObject.put("serStartTime", ps.getSerStartTime() == null ? "" : DateUtil.getyyyy_MM_dd_hms(ps.getSerStartTime()));
  984 + jsonObject.put("serEndTime", ps.getSerEndTime() == null ? "" : DateUtil.getyyyy_MM_dd_hms(ps.getSerEndTime()));
  985 + jsonObject.put("docStartWeek", ps.getDocStartWeek() == null ? "" : ps.getDocStartWeek());
  986 + jsonObject.put("docEndWeek", ps.getDocEndWeek() == null ? "" : ps.getDocEndWeek());
  987 + jsonObject.put("docStartTime", ps.getDocStartTime() == null ? "" : DateUtil.getyyyy_MM_dd_hms(ps.getDocStartTime()));
  988 + jsonObject.put("docEndTime", ps.getDocEndTime() == null ? "" : DateUtil.getyyyy_MM_dd_hms(ps.getDocEndTime()));
989 989  
990 990  
991 991 jsonArray.add(jsonObject);