From b630edf8652c2518fa75a0c347c0e25c32a347b7 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 16 Aug 2017 23:34:55 +0800
Subject: [PATCH] update code

---
 .../msg/controller/MsgGenerateController.java      | 132 ++++++++++-----------
 .../operate/web/facade/SmsConfigFacade.java        |   8 ++
 2 files changed, 74 insertions(+), 66 deletions(-)

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 7fc8c74..58c0171 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,71 +18,71 @@ 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;
-
-    /**
-     * 生成孕妇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 "";
-    }
+//    private static final Logger logger = LoggerFactory.getLogger(MsgGenerateController.class);
+//
+//    @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 "";
+//    }
 
 }
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 f4c7ae4..5b97ad2 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
@@ -827,6 +827,10 @@ public class SmsConfigFacade {
 		if (StringUtils.isNotEmpty(config.getIsCharge()))
 		{
 			prefix = config.getAreaPrefix();
+			if (!StringUtils.isNotEmpty(prefix))
+			{
+				prefix = getPrefix(config, doctorId);
+			}
 			String isCharge = config.getIsCharge();
 			Map<String,String> chargeMap = JsonUtil.getMap(isCharge);
 			if (chargeMap != null && chargeMap.size() > 0)
@@ -860,6 +864,10 @@ public class SmsConfigFacade {
 				}
 			}
 		}
+		else
+		{
+			prefix =  getPrefix(config, doctorId);
+		}
 		return prefix;
 	}
 
-- 
1.8.3.1