Commit 87f9fbcb4e5608010ce6fe16b567986b41db49cf
1 parent
932aecb5b3
Exists in
master
and in
6 other branches
update code
Showing 3 changed files with 14 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java
View file @
87f9fbc
| ... | ... | @@ -280,7 +280,17 @@ |
| 280 | 280 | model.setPostDoc(checkDoctor); |
| 281 | 281 | model.setApplyInfo("产检"); |
| 282 | 282 | model.setApplyTime(DateUtil.getyyyy_MM_dd_hms(new Date())); |
| 283 | - model.setRemark(""); | |
| 283 | + | |
| 284 | + Users users = usersService.getUsers(getUserId(request)); | |
| 285 | + if (users != null) { | |
| 286 | + model.setRemark(users.getAccount()); | |
| 287 | + } | |
| 288 | + else | |
| 289 | + { | |
| 290 | + model.setRemark(""); | |
| 291 | + } | |
| 292 | + | |
| 293 | + | |
| 284 | 294 | |
| 285 | 295 | } |
| 286 | 296 | String result = HospitalCouponPrintUtils.qhdCouponUse(model); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
87f9fbc
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java
View file @
87f9fbc
| ... | ... | @@ -267,9 +267,9 @@ |
| 267 | 267 | // map.setList(JsonUtil.toList(list, SmsObj.class)); |
| 268 | 268 | // System.out.print(map); |
| 269 | 269 | |
| 270 | - queryMsgList("216", null,null, | |
| 271 | - null,"2017-08-01%2000:00:00", | |
| 272 | - "2017-08-01%2023:59:59",null, | |
| 270 | + queryMsgList("246", null,null, | |
| 271 | + null,null, | |
| 272 | + null,null, | |
| 273 | 273 | null,null , |
| 274 | 274 | 1,10); |
| 275 | 275 |