liquanyu / regional-platform

Download as
Browse Code »

Commit 4e56efecafd47fd2c82bf67743c776c47d165d13

Authored by liquanyu
1 parent c0c0b048e8
Exists in master and in 3 other branches 0116, dev, nobuildprocess

code update

Showing 2 changed files with 11 additions and 9 deletions

platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java View file @ 4e56efe
... ... @@ -1062,7 +1062,7 @@
1062 1062 String messagePrefix = getSmsPrefix(config, model.getBuildDoctor());
1063 1063 String messageContent = "【"+messagePrefix+"】"+template.getContent();
1064 1064 messageContent = replaceEL(model.getName(), yuYueDate, messageContent);
1065   - MessageRequest request = getMessageRequest(messageContent,model.getMphone(),ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(),
  1065 + MessageRequest request = getMessageRequest(messageContent,model.getMphone(),ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(),
1066 1066 model.getHospitalId(),template.getId(),model.getId());
1067 1067 messages.add(request);
1068 1068 }
... ... @@ -1120,7 +1120,7 @@
1120 1120 String messagePrefix = getSmsPrefix(config, model.getBuildDoctor());
1121 1121 String messageContent = "【"+messagePrefix+"】"+template.getContent();
1122 1122 messageContent = replaceName(model.getName(), messageContent);
1123   - MessageRequest request = getMessageRequest(messageContent,model.getMphone(),ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(),
  1123 + MessageRequest request = getMessageRequest(messageContent,model.getMphone(),ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(),
1124 1124 model.getHospitalId(),template.getId(),model.getId());
1125 1125 messages.add(request);
1126 1126  
... ... @@ -1161,7 +1161,7 @@
1161 1161 String messagePrefix = getSmsPrefix(config, model.getBuildDoctor());
1162 1162 String messageContent = "【"+messagePrefix+"】"+template.getContent();
1163 1163 messageContent = replaceName(model.getName(), messageContent);
1164   - MessageRequest request = getMessageRequest(messageContent,model.getMphone(),ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(),
  1164 + MessageRequest request = getMessageRequest(messageContent,model.getMphone(),ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(),
1165 1165 model.getHospitalId(),template.getId(),model.getId());
1166 1166 messages.add(request);
1167 1167  
... ... @@ -1325,7 +1325,7 @@
1325 1325 String messagePrefix = getSmsPrefix(config, model.getBuildDoctor());
1326 1326 String messageContent = "【"+messagePrefix+"】"+template.getContent();
1327 1327 messageContent = replaceName(model.getName(), messageContent);
1328   - MessageRequest request = getMessageRequest(messageContent,model.getMphone(),ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(),
  1328 + MessageRequest request = getMessageRequest(messageContent,model.getMphone(),ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(),
1329 1329 model.getHospitalId(),template.getId(),model.getId());
1330 1330 messages.add(request);
1331 1331  
... ... @@ -1413,7 +1413,7 @@
1413 1413 query.setId(orderModel.getId()); //id就是parentId
1414 1414  
1415 1415 //查询符合条件的产妇
1416   - List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
  1416 + List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(query);
1417 1417 if (CollectionUtils.isNotEmpty(patients))
1418 1418 {
1419 1419 for (Patients pat : patients)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 4e56efe
... ... @@ -787,6 +787,7 @@
787 787 //1转入
788 788 if ("1".equals(applyOrderQueryRequest.getAction()))
789 789 {
  790 +
790 791 cnames.put("name", "姓名");
791 792 cnames.put("age","年龄");
792 793 cnames.put("dueWeek","转入孕周");
793 794  
... ... @@ -796,10 +797,10 @@
796 797 cnames.put("rRisk", "高危风险因素");
797 798 cnames.put("score","高危评分");
798 799 cnames.put("transferredDisease","转院必要性");
799   - cnames.put("zhuanRname","转入医院");
  800 + cnames.put("zhuanCName","转出医院");
800 801 cnames.put("created","转出日期");
801 802 cnames.put("received","接收日期");
802   - cnames.put("applyDoctor","申请医生");
  803 + cnames.put("recDoctor","接收医生");
803 804 cnames.put("phone","联系方式");
804 805 cnames.put("status","状态");
805 806 }
806 807  
807 808  
... ... @@ -816,12 +817,13 @@
816 817 cnames.put("rRisk", "高危风险因素");
817 818 cnames.put("score","高危评分");
818 819 cnames.put("transferredDisease","转院必要性");
819   - cnames.put("zhuanCName","转出医院");
  820 + cnames.put("zhuanRname","转入医院");
820 821 cnames.put("created","转出日期");
821 822 cnames.put("received","接收日期");
822   - cnames.put("recDoctor","接收医生");
  823 + cnames.put("applyDoctor","申请医生");
823 824 cnames.put("phone","联系方式");
824 825 cnames.put("status","状态");
  826 +
825 827 }
826 828  
827 829 response.setContentType("application/octet-stream");