From 00babe0bb0b56f4716d36b43ab7babb6d2f97eda Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Mon, 13 Nov 2017 11:12:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/platform/pojo/SmsConfigModel.java | 12 ++++++++++++
 .../lyms/platform/operate/web/facade/SmsConfigFacade.java    |  2 +-
 .../lyms/platform/operate/web/request/SmsConfigRequest.java  | 10 ++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

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 daa4d4c..8528c8b 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
@@ -57,6 +57,9 @@ public class SmsConfigModel{
     //对应医院中的孕妇，儿童，产妇是否收费
     private String isCharge;
 
+    //医院各项服务类型采用短信或者推送
+    private String serviceType;
+
     public void covertObj(SmsConfigModel model)
     {
         this.id =  model.getId();
@@ -74,6 +77,15 @@ public class SmsConfigModel{
         this.remark = model.getRemark();
         this.areaPrefix = model.getAreaPrefix();
         this.isCharge = model.getIsCharge();
+        this.serviceType = model.getServiceType();
+    }
+
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
     }
 
     public String getIsCharge() {
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 bcb428e..7c481f9 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
@@ -98,7 +98,7 @@ public class SmsConfigFacade {
 		model.setSmsService(JsonUtil.array2JsonString(request.getSmsService()));
 		model.setAreaPrefix(request.getAreaPrefix());
 		model.setIsCharge(request.getIsCharge() == null ? "" : JsonUtil.obj2Str(request.getIsCharge()));
-
+		model.setServiceType(request.getServiceType() == null ? "" : JsonUtil.obj2Str(request.getServiceType()));
 		return model;
 	}
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsConfigRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsConfigRequest.java
index 7f3aec6..2f095bc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsConfigRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsConfigRequest.java
@@ -45,6 +45,16 @@ public class SmsConfigRequest {
     //高危配置
     private String highConfig;
 
+    private List<Map<String,List<Map<String,String>>>> serviceType;
+
+    public List<Map<String, List<Map<String, String>>>> getServiceType() {
+        return serviceType;
+    }
+
+    public void setServiceType(List<Map<String, List<Map<String, String>>>> serviceType) {
+        this.serviceType = serviceType;
+    }
+
     public Map<String, String> getIsCharge() {
         return isCharge;
     }
-- 
1.8.3.1