Commit d32cc721ab87a3d32262b500fe537cd819588603
1 parent
490393eddb
Exists in
master
and in
6 other branches
bug修复
Showing 2 changed files with 10 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java
View file @
d32cc72
| ... | ... | @@ -103,6 +103,7 @@ |
| 103 | 103 | * @return |
| 104 | 104 | */ |
| 105 | 105 | @RequestMapping(value = "/export", method = RequestMethod.GET) |
| 106 | + @TokenRequired | |
| 106 | 107 | public void export(HttpServletRequest request, HttpServletResponse response, Date startDate, Date endDate, String doctor, String key, Integer page, Integer limit) { |
| 107 | 108 | visitService.export(startDate, endDate, doctor, getUserId(request), response, key); |
| 108 | 109 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
View file @
d32cc72
| ... | ... | @@ -322,7 +322,9 @@ |
| 322 | 322 | /** |
| 323 | 323 | * 未闭合尺寸 |
| 324 | 324 | */ |
| 325 | - restMap.put("unclosedSize", newbornVisit.getUnclosedSize() + "cm X " + newbornVisit.getUnclosedSize2()); | |
| 325 | + if(StringUtils.isNotBlank(newbornVisit.getUnclosedSize()) && StringUtils.isNotBlank(newbornVisit.getUnclosedSize2())) { | |
| 326 | + restMap.put("unclosedSize", newbornVisit.getUnclosedSize() + "cm X " + newbornVisit.getUnclosedSize2()); | |
| 327 | + } | |
| 326 | 328 | |
| 327 | 329 | /** 访视信息 */ |
| 328 | 330 | restMap.put("checkTimeDesc", newbornVisit.getCheckTimeDesc()); /** 产后天数 */ |
| ... | ... | @@ -330,8 +332,12 @@ |
| 330 | 332 | restMap.put("doctor", mapper.getUserName(newbornVisit.getDoctor())); /** 访视医生 */ |
| 331 | 333 | restMap.put("checkTime", DateUtil.getYyyyMmDd(newbornVisit.getCheckTime())); /** 访视时间 */ |
| 332 | 334 | restMap.put("visitLocation", newbornVisit.getVisitLocation()); /** 访视地点 */ |
| 333 | - restMap.put("nextVisitTime", NextVisitTimeEnums.getName(newbornVisit.getNextVisitTime())); /** 预约下次访视时间 */ | |
| 334 | - restMap.put("nextVisitTimeDesc", DateUtil.getYyyyMmDd(newbornVisit.getNextVisitTimeDesc())); /** 预约下次访视时间 */ | |
| 335 | + if(newbornVisit.getNextVisitTime() != null) { | |
| 336 | + restMap.put("nextVisitTime", NextVisitTimeEnums.getName(newbornVisit.getNextVisitTime())); /** 预约下次访视时间 */ | |
| 337 | + } | |
| 338 | + if(newbornVisit.getNextVisitTimeDesc() != null){ | |
| 339 | + restMap.put("nextVisitTimeDesc", DateUtil.getYyyyMmDd(newbornVisit.getNextVisitTimeDesc())); /** 预约下次访视时间 */ | |
| 340 | + } | |
| 335 | 341 | /** 问诊 */ |
| 336 | 342 | restMap.put("feedType", FeedTypeEnums.getName(newbornVisit.getFeedType())); /** 喂养方式 */ |
| 337 | 343 | restMap.put("feedNumber", newbornVisit.getFeedNumber()); /** 喂奶量 */ |