From 4e56efecafd47fd2c82bf67743c776c47d165d13 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 19 Sep 2016 10:44:11 +0800 Subject: [PATCH] code update --- .../com/lyms/platform/data/service/impl/SmsServiceImpl.java | 10 +++++----- .../com/lyms/platform/operate/web/facade/ApplyOrderFacade.java | 10 ++++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java index 7670e3e..fca3b78 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java @@ -1062,7 +1062,7 @@ public class SmsServiceImpl implements SmsService{ String messagePrefix = getSmsPrefix(config, model.getBuildDoctor()); String messageContent = "【"+messagePrefix+"】"+template.getContent(); messageContent = replaceEL(model.getName(), yuYueDate, messageContent); - MessageRequest request = getMessageRequest(messageContent,model.getMphone(),ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(), + MessageRequest request = getMessageRequest(messageContent,model.getMphone(),ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), model.getHospitalId(),template.getId(),model.getId()); messages.add(request); } @@ -1120,7 +1120,7 @@ public class SmsServiceImpl implements SmsService{ String messagePrefix = getSmsPrefix(config, model.getBuildDoctor()); String messageContent = "【"+messagePrefix+"】"+template.getContent(); messageContent = replaceName(model.getName(), messageContent); - MessageRequest request = getMessageRequest(messageContent,model.getMphone(),ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(), + MessageRequest request = getMessageRequest(messageContent,model.getMphone(),ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), model.getHospitalId(),template.getId(),model.getId()); messages.add(request); @@ -1161,7 +1161,7 @@ public class SmsServiceImpl implements SmsService{ String messagePrefix = getSmsPrefix(config, model.getBuildDoctor()); String messageContent = "【"+messagePrefix+"】"+template.getContent(); messageContent = replaceName(model.getName(), messageContent); - MessageRequest request = getMessageRequest(messageContent,model.getMphone(),ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(), + MessageRequest request = getMessageRequest(messageContent,model.getMphone(),ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), model.getHospitalId(),template.getId(),model.getId()); messages.add(request); @@ -1325,7 +1325,7 @@ public class SmsServiceImpl implements SmsService{ String messagePrefix = getSmsPrefix(config, model.getBuildDoctor()); String messageContent = "【"+messagePrefix+"】"+template.getContent(); messageContent = replaceName(model.getName(), messageContent); - MessageRequest request = getMessageRequest(messageContent,model.getMphone(),ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(), + MessageRequest request = getMessageRequest(messageContent,model.getMphone(),ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), model.getHospitalId(),template.getId(),model.getId()); messages.add(request); @@ -1413,7 +1413,7 @@ public class SmsServiceImpl implements SmsService{ query.setId(orderModel.getId()); //id就是parentId //查询符合条件的产妇 - List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); + List patients = yunBookbuildingService.queryPregnantWithQuery(query); if (CollectionUtils.isNotEmpty(patients)) { for (Patients pat : patients) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index c8d03ca..b10f69f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -787,6 +787,7 @@ public class ApplyOrderFacade { //1转入 if ("1".equals(applyOrderQueryRequest.getAction())) { + cnames.put("name", "姓名"); cnames.put("age","年龄"); cnames.put("dueWeek","转入孕周"); @@ -796,10 +797,10 @@ public class ApplyOrderFacade { cnames.put("rRisk", "高危风险因素"); cnames.put("score","高危评分"); cnames.put("transferredDisease","转院必要性"); - cnames.put("zhuanRname","转入医院"); + cnames.put("zhuanCName","转出医院"); cnames.put("created","转出日期"); cnames.put("received","接收日期"); - cnames.put("applyDoctor","申请医生"); + cnames.put("recDoctor","接收医生"); cnames.put("phone","联系方式"); cnames.put("status","状态"); } @@ -816,12 +817,13 @@ public class ApplyOrderFacade { cnames.put("rRisk", "高危风险因素"); cnames.put("score","高危评分"); cnames.put("transferredDisease","转院必要性"); - cnames.put("zhuanCName","转出医院"); + cnames.put("zhuanRname","转入医院"); cnames.put("created","转出日期"); cnames.put("received","接收日期"); - cnames.put("recDoctor","接收医生"); + cnames.put("applyDoctor","申请医生"); cnames.put("phone","联系方式"); cnames.put("status","状态"); + } response.setContentType("application/octet-stream"); -- 1.8.3.1