diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java
index 9ffd874..4563fed 100644
--- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java
+++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java
@@ -18,84 +18,84 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @RequestMapping("/msg")
 public class MsgGenerateController extends BaseController {
 
-//    private static final Logger logger = LoggerFactory.getLogger(MsgGenerateController.class);
-////
-//    @Autowired
-//    private IMsgGenerateService msgGenerateService;
+    private static final Logger logger = LoggerFactory.getLogger(MsgGenerateController.class);
 //
-//    /**
-//     * 生成孕妇ams消息
-//     * @param hospitalId
-//     * @return
-//     */
-//    @RequestMapping(method = RequestMethod.GET, value = "/generatePatAmsMsg")
-//    @ResponseBody
-//    public String generatePatAmsMsg(@RequestParam(required = false) String hospitalId)
-//    {
-//
-//        logger.info("The request hospital id is {} ", hospitalId);
-//        msgGenerateService.generatePatAmsMsg(hospitalId);
-//        return "";
-//    }
-//
-//
-//    /**
-//     * 生成儿童ams消息
-//     * @param hospitalId
-//     * @return
-//     */
-//    @RequestMapping(method = RequestMethod.GET, value = "/generateBabyAmsMsg")
-//    @ResponseBody
-//    public String generateBabyAmsMsg(@RequestParam(required = false) String hospitalId)
-//    {
-//
-//        logger.info("The request hospital id is {} ", hospitalId);
-//        msgGenerateService.generateBabyAmsMsg(hospitalId);
-//        return "";
-//    }
-//
-//
-//    /**
-//     * 生成产妇ams消息
-//     * @param hospitalId
-//     * @return
-//     */
-//    @RequestMapping(method = RequestMethod.GET, value = "/generateChanAmsMsg")
-//    @ResponseBody
-//    public String generateChanAmsMsg(@RequestParam(required = false) String hospitalId)
-//    {
-//
-//        logger.info("The request hospital id is {} ", hospitalId);
-//        msgGenerateService.generateChanAmsMsg(hospitalId);
-//        return "";
-//    }
-//
-//    /**
-//     * 生成模板推送消息
-//     * @param hospitalId
-//     * @return
-//     */
-//    @RequestMapping(method = RequestMethod.GET, value = "/generateTemplateMsg")
-//    @ResponseBody
-//    public String generateTemplateMsg(@RequestParam(required = false) String hospitalId)
-//    {
-//
-//        logger.info("The request hospital id is {} ", hospitalId);
-//        msgGenerateService.generateTemplateMsg(hospitalId);
-//        return "";
-//    }
-//
-//
-//    /**
-//     * 生成所有
-//     * @return
-//     */
-//    @RequestMapping(method = RequestMethod.GET, value = "/generaterAllMsg")
-//    @ResponseBody
-//    public String generaterAllMsg()
-//    {
-//        msgGenerateService.generaterAllMsg();
-//        return "";
-//    }
+    @Autowired
+    private IMsgGenerateService msgGenerateService;
+
+    /**
+     * 生成孕妇ams消息
+     * @param hospitalId
+     * @return
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/generatePatAmsMsg")
+    @ResponseBody
+    public String generatePatAmsMsg(@RequestParam(required = false) String hospitalId)
+    {
+
+        logger.info("The request hospital id is {} ", hospitalId);
+        msgGenerateService.generatePatAmsMsg(hospitalId);
+        return "";
+    }
+
+
+    /**
+     * 生成儿童ams消息
+     * @param hospitalId
+     * @return
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/generateBabyAmsMsg")
+    @ResponseBody
+    public String generateBabyAmsMsg(@RequestParam(required = false) String hospitalId)
+    {
+
+        logger.info("The request hospital id is {} ", hospitalId);
+        msgGenerateService.generateBabyAmsMsg(hospitalId);
+        return "";
+    }
+
+
+    /**
+     * 生成产妇ams消息
+     * @param hospitalId
+     * @return
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/generateChanAmsMsg")
+    @ResponseBody
+    public String generateChanAmsMsg(@RequestParam(required = false) String hospitalId)
+    {
+
+        logger.info("The request hospital id is {} ", hospitalId);
+        msgGenerateService.generateChanAmsMsg(hospitalId);
+        return "";
+    }
+
+    /**
+     * 生成模板推送消息
+     * @param hospitalId
+     * @return
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/generateTemplateMsg")
+    @ResponseBody
+    public String generateTemplateMsg(@RequestParam(required = false) String hospitalId)
+    {
+
+        logger.info("The request hospital id is {} ", hospitalId);
+        msgGenerateService.generateTemplateMsg(hospitalId);
+        return "";
+    }
+
+
+    /**
+     * 生成所有
+     * @return
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/generaterAllMsg")
+    @ResponseBody
+    public String generaterAllMsg()
+    {
+        msgGenerateService.generaterAllMsg();
+        return "";
+    }
 
 }
diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/BaseServiceImpl.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/BaseServiceImpl.java
index 95b9225..925ad05 100644
--- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/BaseServiceImpl.java
+++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/BaseServiceImpl.java
@@ -209,7 +209,7 @@ public class BaseServiceImpl implements IBaseService {
      */
     public int isStartService(Integer smsType,String serviceStr,String serviceType)
     {
-        if (StringUtils.isEmpty(serviceStr))
+        if (StringUtils.isEmpty(serviceStr) || StringUtils.isEmpty(serviceType) || smsType == null)
         {
             return 0;
         }
@@ -228,7 +228,7 @@ public class BaseServiceImpl implements IBaseService {
                         Map<String,String> parents = JsonUtil.getMap(serviceType);
                         if (parents != null && !parents.isEmpty())
                         {
-                            String type = parents.get(smsType);
+                            String type = parents.get(String.valueOf(smsType));
                             if (StringUtils.isNotEmpty(type))
                             {
                                 Map<String,String> child = JsonUtil.getMap(type);
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 9299bf2..3145b3e 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
@@ -830,7 +830,7 @@ public class SmsConfigFacade {
 	 */
 	private int isStartService(Integer smsType,String serviceStr,String serviceType)
 	{
-		if (StringUtils.isEmpty(serviceStr))
+		if (StringUtils.isEmpty(serviceStr) || StringUtils.isEmpty(serviceType) || smsType == null)
 		{
 			return 0;
 		}
@@ -849,7 +849,7 @@ public class SmsConfigFacade {
 						Map<String,String> parents = JsonUtil.getMap(serviceType);
 						if (parents != null && !parents.isEmpty())
 						{
-							String type = parents.get(smsType);
+							String type = parents.get(String.valueOf(smsType));
 							if (StringUtils.isNotEmpty(type))
 							{
 								Map<String,String> child = JsonUtil.getMap(type);
@@ -859,11 +859,11 @@ public class SmsConfigFacade {
 									String push = child.get("push");
 									if (StringUtils.isNotEmpty(message)  && "true".equals(message) && StringUtils.isNotEmpty(push)  && "true".equals(push))
 									{
-										return 3;
+										return 2;
 									}
 									else if (StringUtils.isNotEmpty(message)  && "true".equals(message))
 									{
-										return 2;
+										return 3;
 									}
 									else if (StringUtils.isNotEmpty(push)  && "true".equals(push))
 									{