jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b630edf8652c2518fa75a0c347c0e25c32a347b7

Authored by liquanyu
1 parent c4c466339b
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update code

Showing 2 changed files with 74 additions and 66 deletions

platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java View file @ b630edf
... ... @@ -18,72 +18,72 @@
18 18 @RequestMapping("/msg")
19 19 public class MsgGenerateController extends BaseController {
20 20  
21   - private static final Logger logger = LoggerFactory.getLogger(MsgGenerateController.class);
22   -
23   - @Autowired
24   - private IMsgGenerateService msgGenerateService;
25   -
26   - /**
27   - * 生成孕妇ams消息
28   - * @param hospitalId
29   - * @return
30   - */
31   - @RequestMapping(method = RequestMethod.GET, value = "/generatePatAmsMsg")
32   - @ResponseBody
33   - public String generatePatAmsMsg(@RequestParam(required = false) String hospitalId)
34   - {
35   -
36   - logger.info("The request hospital id is {} ", hospitalId);
37   - msgGenerateService.generatePatAmsMsg(hospitalId);
38   - return "";
39   - }
40   -
41   -
42   - /**
43   - * 生成儿童ams消息
44   - * @param hospitalId
45   - * @return
46   - */
47   - @RequestMapping(method = RequestMethod.GET, value = "/generateBabyAmsMsg")
48   - @ResponseBody
49   - public String generateBabyAmsMsg(@RequestParam(required = false) String hospitalId)
50   - {
51   -
52   - logger.info("The request hospital id is {} ", hospitalId);
53   - msgGenerateService.generateBabyAmsMsg(hospitalId);
54   - return "";
55   - }
56   -
57   -
58   - /**
59   - * 生成产妇ams消息
60   - * @param hospitalId
61   - * @return
62   - */
63   - @RequestMapping(method = RequestMethod.GET, value = "/generateChanAmsMsg")
64   - @ResponseBody
65   - public String generateChanAmsMsg(@RequestParam(required = false) String hospitalId)
66   - {
67   -
68   - logger.info("The request hospital id is {} ", hospitalId);
69   - msgGenerateService.generateChanAmsMsg(hospitalId);
70   - return "";
71   - }
72   -
73   - /**
74   - * 生成模板推送消息
75   - * @param hospitalId
76   - * @return
77   - */
78   - @RequestMapping(method = RequestMethod.GET, value = "/generateTemplateMsg")
79   - @ResponseBody
80   - public String generateTemplateMsg(@RequestParam(required = false) String hospitalId)
81   - {
82   -
83   - logger.info("The request hospital id is {} ", hospitalId);
84   - msgGenerateService.generateTemplateMsg(hospitalId);
85   - return "";
86   - }
  21 +// private static final Logger logger = LoggerFactory.getLogger(MsgGenerateController.class);
  22 +//
  23 +// @Autowired
  24 +// private IMsgGenerateService msgGenerateService;
  25 +//
  26 +// /**
  27 +// * 生成孕妇ams消息
  28 +// * @param hospitalId
  29 +// * @return
  30 +// */
  31 +// @RequestMapping(method = RequestMethod.GET, value = "/generatePatAmsMsg")
  32 +// @ResponseBody
  33 +// public String generatePatAmsMsg(@RequestParam(required = false) String hospitalId)
  34 +// {
  35 +//
  36 +// logger.info("The request hospital id is {} ", hospitalId);
  37 +// msgGenerateService.generatePatAmsMsg(hospitalId);
  38 +// return "";
  39 +// }
  40 +//
  41 +//
  42 +// /**
  43 +// * 生成儿童ams消息
  44 +// * @param hospitalId
  45 +// * @return
  46 +// */
  47 +// @RequestMapping(method = RequestMethod.GET, value = "/generateBabyAmsMsg")
  48 +// @ResponseBody
  49 +// public String generateBabyAmsMsg(@RequestParam(required = false) String hospitalId)
  50 +// {
  51 +//
  52 +// logger.info("The request hospital id is {} ", hospitalId);
  53 +// msgGenerateService.generateBabyAmsMsg(hospitalId);
  54 +// return "";
  55 +// }
  56 +//
  57 +//
  58 +// /**
  59 +// * 生成产妇ams消息
  60 +// * @param hospitalId
  61 +// * @return
  62 +// */
  63 +// @RequestMapping(method = RequestMethod.GET, value = "/generateChanAmsMsg")
  64 +// @ResponseBody
  65 +// public String generateChanAmsMsg(@RequestParam(required = false) String hospitalId)
  66 +// {
  67 +//
  68 +// logger.info("The request hospital id is {} ", hospitalId);
  69 +// msgGenerateService.generateChanAmsMsg(hospitalId);
  70 +// return "";
  71 +// }
  72 +//
  73 +// /**
  74 +// * 生成模板推送消息
  75 +// * @param hospitalId
  76 +// * @return
  77 +// */
  78 +// @RequestMapping(method = RequestMethod.GET, value = "/generateTemplateMsg")
  79 +// @ResponseBody
  80 +// public String generateTemplateMsg(@RequestParam(required = false) String hospitalId)
  81 +// {
  82 +//
  83 +// logger.info("The request hospital id is {} ", hospitalId);
  84 +// msgGenerateService.generateTemplateMsg(hospitalId);
  85 +// return "";
  86 +// }
87 87  
88 88 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java View file @ b630edf
... ... @@ -827,6 +827,10 @@
827 827 if (StringUtils.isNotEmpty(config.getIsCharge()))
828 828 {
829 829 prefix = config.getAreaPrefix();
  830 + if (!StringUtils.isNotEmpty(prefix))
  831 + {
  832 + prefix = getPrefix(config, doctorId);
  833 + }
830 834 String isCharge = config.getIsCharge();
831 835 Map<String,String> chargeMap = JsonUtil.getMap(isCharge);
832 836 if (chargeMap != null && chargeMap.size() > 0)
... ... @@ -859,6 +863,10 @@
859 863 }
860 864 }
861 865 }
  866 + }
  867 + else
  868 + {
  869 + prefix = getPrefix(config, doctorId);
862 870 }
863 871 return prefix;
864 872 }