Commit 974c42243c5f771870e1f54090bbbf30b259c4f9
1 parent
2e1fff4207
Exists in
master
and in
1 other branch
增加是否通知
Showing 1 changed file with 10 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
View file @
974c422
... | ... | @@ -141,12 +141,19 @@ |
141 | 141 | setAge(destModel.getAge()); |
142 | 142 | setDueWeek("孕周"); |
143 | 143 | setrLevel(destModel.getRiskLevelId()); |
144 | - setcTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime())); | |
145 | - setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate())); | |
144 | + if(null!=destModel.getNextCheckTime()) { | |
145 | + setcTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime())); | |
146 | + } | |
147 | + if(null!=destModel.getDueDate()){ | |
148 | + | |
149 | + setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate())); | |
150 | + } | |
146 | 151 | setPhone(destModel.getPhone()); |
147 | 152 | setCheckDoctor(destModel.getLastReportDoctorName()); |
148 | 153 | setlName("登记人"); |
149 | - setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType())); | |
154 | + if(null!=destModel.getServiceType()){ | |
155 | + setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType())); | |
156 | + } | |
150 | 157 | return this; |
151 | 158 | } |
152 | 159 | } |