From 1980197036a53d69d3a234bf9759ba73e1ff10fa Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 7 Sep 2016 17:08:11 +0800 Subject: [PATCH] code update --- .../lyms/platform/biz/BasicConfigServiceTest.java | 30 +++++++- .../operate/web/facade/BabyBookbuildingFacade.java | 85 ++++++++++++++++++---- .../operate/web/facade/BookbuildingFacade.java | 8 +- 3 files changed, 105 insertions(+), 18 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java index c5a6f18..db98743 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java @@ -82,7 +82,7 @@ public class BasicConfigServiceTest { // addaw(applicationContext, "0-83月龄体重标准差数值表（男、女）.csv", 0); // addZhenduan(applicationContext); - addCountry(applicationContext); + addMingzu(applicationContext); } public static void addZhenduan(ApplicationContext applicationContext) { @@ -354,6 +354,34 @@ public class BasicConfigServiceTest { } } + + public static void addMingzu(ApplicationContext applicationContext) { + MongoTemplate mongoTemplate + =(MongoTemplate)applicationContext.getBean("mongoTemplate"); + mongoTemplate.getDb().authenticate("platform", "platform123".toCharArray()); + + try { + List list = FileUtils.readLines(new File("F:\\temp\\mingz.txt"),"gbk"); + for (String line:list) { + if (line != null) { + BasicConfig config = new BasicConfig(); + config.setYn(YnEnums.YES.getId()); + config.setCode(PingYinUtil.getFirstSpell(line).toUpperCase()); + config.setName(line); + config.setEnable(1); + Thread.sleep(1000); + config.setCreateDate(new Date().getTime()); + config.setParentId("4bc86dd6-2217-4a33-95f4-dc22ee70f2e3"); + mongoTemplate.save(config); + System.out.println(line); + } + } + + } catch (Exception e) { + e.printStackTrace(); + } + } + public static void addVisit(ApplicationContext applicationContext){ VisitModel visitModel = new VisitModel(); 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 ec3b1cb..0099310 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 @@ -145,20 +145,6 @@ public class BabyBookbuildingFacade { Collections.reverse(tempList); list.addAll(tempList); } -// //查询儿童的基本信息 -// BabyModel model = babyCheckFacade.getBabyModel(babyId, base); -// -// -// List> tempList = new ArrayList<>(); -// if(CollectionUtils.isNotEmpty(models)){ -// for(BabyModel babyModel:models){ -// babyCheckFacade.getBabyCheckList(babyModel.getId(), babyModel, tempList); -// } -// } -// -// list.addAll(tempList); - - resMap.put("baseInfo", base); resMap.put("checkList", list); @@ -533,7 +519,6 @@ public class BabyBookbuildingFacade { { isStart = isStartService(SmsServiceEnums.FWKT.getId(), serviceStr); } - } if (!isStart) { @@ -642,13 +627,16 @@ public class BabyBookbuildingFacade { if (CollectionUtils.isNotEmpty(sendList)) { + + //短信前缀 + String messagePrefix = getSmsPrefix(configs.get(0),babyModel.getBuildDoctor()); for (SmsTemplateModel templateModel : sendList) { if (templateModel != null && templateModel.getStatus() == 1) { MessageListRequest smsList = new MessageListRequest(); List messages = new ArrayList<>(); MessageRequest mr = new MessageRequest(); - mr.setContent(templateModel.getContent()); + mr.setContent("【"+messagePrefix+"】"+templateModel.getContent()); mr.setObjType(ServiceObjEnums.BABYOBJ.getId()); mr.setPhone(babyModel.getMphone()); //短信商 @@ -678,6 +666,71 @@ public class BabyBookbuildingFacade { } + + /** + * 获取发送短信的前缀 如果配置为发送科室前缀 就通过医生查询到医生所在科室 + * 然后取对应科室前缀 如果为空就取医院前缀 + * @return + */ + public String getSmsPrefix(SmsConfigModel config,String doctorId) + { + String messagePrefix = config.getHospitalPrefix(); + //前缀类型 0医院前缀 1科室前缀 + if (config.getPrefixType() != null && config.getPrefixType() == 1) + { + String res = getDeptPrefix(doctorId, config.getDeptPrefix()); + messagePrefix = res == "" ? messagePrefix : res; + } + return messagePrefix; + } + + /** + * /通过医生查询科室前缀 + * @param doctorId + * @param detpPrefixStr + * @return + */ + private String getDeptPrefix(String doctorId,String detpPrefixStr) + { + + if (StringUtils.isEmpty(doctorId) || StringUtils.isEmpty(detpPrefixStr)) + { + return ""; + } + Integer userId = null; + try { + userId = Integer.valueOf(doctorId); + }catch (Exception e) + { + System.out.println(doctorId); + return ""; + } + + //通过建档医生查询用户信息 + Users user = usersService.getUsers(userId); + if (user != null) + { + //得到医生对应的部门id + Integer deptId = user.getDeptId(); + if (StringUtils.isNotEmpty(detpPrefixStr)) + { + List detpPrefixs = JsonUtil.toList(detpPrefixStr, Map.class); + if (CollectionUtils.isNotEmpty(detpPrefixs)) + { + for (Map map : detpPrefixs) + { + Integer preDeptId = Integer.valueOf(String.valueOf(map.get("deptId"))); + if (preDeptId == deptId) + { + return String.valueOf(map.get("deptPrefix")); + } + } + } + } + } + return ""; + } + /** * 判断对应服务是否启动 */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 433372f..ac5da43 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -72,6 +72,9 @@ public class BookbuildingFacade { @Autowired private BasicConfigService basicConfigService; + @Autowired + private BabyBookbuildingFacade babyBookbuildingFacade; + /** * 添加孕妇建档 * @param yunRequest @@ -378,6 +381,9 @@ public class BookbuildingFacade { if (CollectionUtils.isNotEmpty(sendList)) { + + //短信前缀 + String messagePrefix = babyBookbuildingFacade.getSmsPrefix(configs.get(0), patient.getBookbuildingDoctor()); for (SmsTemplateModel templateModel : sendList) { if (templateModel != null && templateModel.getStatus() == 1) @@ -385,7 +391,7 @@ public class BookbuildingFacade { MessageListRequest smsList = new MessageListRequest(); List messages = new ArrayList<>(); MessageRequest mr = new MessageRequest(); - mr.setContent(templateModel.getContent()); + mr.setContent("【"+messagePrefix+"】"+templateModel.getContent()); mr.setObjType(ServiceObjEnums.YUNOBJ.getId()); mr.setPhone(patient.getPhone()); //短信商 -- 1.8.3.1