From dafba4c200ea6620dfb22ebc89807251ff2572d9 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 8 Sep 2016 16:21:57 +0800 Subject: [PATCH] code update --- .../java/com/lyms/platform/pojo/SmsConfigModel.java | 17 +++++++++++++++++ .../operate/web/facade/BabyBookbuildingFacade.java | 4 ++-- .../lyms/platform/operate/web/facade/PatientFacade.java | 2 +- .../platform/operate/web/facade/SmsConfigFacade.java | 4 ++-- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java index 3352cc8..69e002c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java @@ -53,6 +53,23 @@ public class SmsConfigModel extends BaseModel { //备注 private String remark; + public void covertObj(SmsConfigModel model) + { + this.id = model.getId(); + this.prefixType= model.getPrefixType(); + this.hospitalPrefix = model.getHospitalPrefix(); + this.deptPrefix= model.deptPrefix; + this.guideTime = model.getGuideTime(); + this.smsService = model.smsService; + this.created = model.getCreated(); + this.modified = model.modified; + this.createId= model.createId; + this.yn= model.getYn(); + this.hospitalId=model.getHospitalId(); + this.highConfig = model.getHighConfig(); + this.remark = model.getRemark(); + } + public String getRemark() { return remark; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 1d51407..16fe4ab 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -487,7 +487,7 @@ public class BabyBookbuildingFacade { { //判断医院是否启动和对应的服务项是否启用 - SmsConfigModel configModel = null; + SmsConfigModel configModel = new SmsConfigModel(); BaseResponse response = smsConfigFacade.hospitalIsStart(babyModel.getHospitalId(),configModel); if (response != null) { @@ -1550,7 +1550,7 @@ public class BabyBookbuildingFacade { } //判断医院是否启动和对应的服务项是否启用 - SmsConfigModel configModel = null; + SmsConfigModel configModel = new SmsConfigModel(); BaseResponse response = smsConfigFacade.hospitalIsStart(hospitalId,configModel); if (response != null) { 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 462f482..9c99325 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 @@ -519,7 +519,7 @@ public class PatientFacade { String hospital = autoMatchFacade.getHospitalId(userId); //判断医院是否启动和对应的服务项是否启用 - SmsConfigModel configModel = null; + SmsConfigModel configModel = new SmsConfigModel(); BaseResponse response = smsConfigFacade.hospitalIsStart(hospital,configModel); if (response != null) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java index 0e1e8ea..dc9c6f1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java @@ -751,8 +751,8 @@ public class SmsConfigFacade { boolean isStart = false; if (CollectionUtils.isNotEmpty(configs)) { - configModel = configs.get(0); - String serviceStr = configModel.getSmsService(); + configModel.covertObj(configs.get(0)); + String serviceStr = configs.get(0).getSmsService(); if (StringUtils.isNotEmpty(serviceStr)) { isStart = isStartService(SmsServiceEnums.FWKT.getId(), serviceStr); -- 1.8.3.1