diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java index eb9afd9..14f4b2c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java @@ -280,7 +280,17 @@ public class CouponPrintController extends BaseController{ model.setPostDoc(checkDoctor); model.setApplyInfo("产检"); model.setApplyTime(DateUtil.getyyyy_MM_dd_hms(new Date())); - model.setRemark(""); + + Users users = usersService.getUsers(getUserId(request)); + if (users != null) { + model.setRemark(users.getAccount()); + } + else + { + model.setRemark(""); + } + + } String result = HospitalCouponPrintUtils.qhdCouponUse(model); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 1a7703f..5891e72 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -687,7 +687,6 @@ public class PatientFacade { if (CollectionUtils.isNotEmpty(messages)) { smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); smsList.setMessages(messages); - smsList.setMessages(messages); //调用发送接口 if ("4".equals(HIS_VERSION)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java index 2fddd92..b3ab993 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java @@ -267,9 +267,9 @@ public class MessageCenterService { // map.setList(JsonUtil.toList(list, SmsObj.class)); // System.out.print(map); - queryMsgList("216", null,null, - null,"2017-08-01%2000:00:00", - "2017-08-01%2023:59:59",null, + queryMsgList("246", null,null, + null,null, + null,null, null,null , 1,10);