Commit bd9dfdc6e084c963cf74334f29b056221526dbf6

Authored by liquanyu
1 parent ec53b2cc01

update

Showing 6 changed files with 78 additions and 69 deletions

platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java View file @ bd9dfdc
... ... @@ -250,8 +250,12 @@
250 250 if ("4".equals(map.get("select").toString()) || "6".equals(map.get("select").toString())) {
251 251 babyPaedia.setUmbilical(map.get("qtText"));
252 252 } else {
253   - String value = QbTypeEnums.getNameById(Integer.parseInt(map.get("select").toString()));
254   - babyPaedia.setUmbilical(value);
  253 + if (map.get("select") != null && map.get("select").toString() != "" && StringUtils.isNum(map.get("select").toString()))
  254 + {
  255 + String value = QbTypeEnums.getNameById(Integer.parseInt(map.get("select").toString()));
  256 + babyPaedia.setUmbilical(value);
  257 + }
  258 +
255 259 }
256 260 }
257 261  
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java View file @ bd9dfdc
... ... @@ -414,37 +414,21 @@
414 414  
415 415 Date yuYueDate = DateUtils.addDay(new Date(), sendTimeType);
416 416 yuYueDate = DateUtils.formatDate(yuYueDate, DateUtils.Y_M_D);
417   - List<BabyCheckModel> checkModels = babyBookbuildingService.queryBabyYuYueRecord(yuYueDate, tempHid);
418   - if (CollectionUtils.isNotEmpty(checkModels)) {
419   - for (BabyCheckModel checkModel : checkModels) {
420 417  
421   - BabyModelQuery query = new BabyModelQuery();
422   - query.setYn(YnEnums.YES.getId());
423   - query.setId(checkModel.getId()); //这里返回的id就是buildId
  418 + // 全部服务
  419 + babyModelQuery.setNextDateStart(yuYueDate);
  420 + babyModelQuery.setNextDateEnd(yuYueDate);
  421 + List<BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
424 422  
425   - boolean existMsg = HelperUtils.isExistMsg(checkModel.getId(), template.getId());
426   - if (existMsg){
  423 + if (CollectionUtils.isNotEmpty(babyModels)) {
  424 + for (BabyModel checkModel : babyModels) {
  425 + try {
  426 + //查询符合条件儿童
  427 + addBabyReservMessages(template, config, service, messages, yuYueDate, checkModel);
  428 + }catch (Exception e)
  429 + {
427 430 continue;
428 431 }
429   -
430   - if (serviceType == com.lyms.platform.common.enums.ServiceTypeEnums.ALL_SERVICE.getId()
431   - && serviceStatus == ServiceStatusEnums.ADD_ALL.getId()){
432   - // 全部,特殊处理
433   - babyModelQuery.setYn(YnEnums.YES.getId());
434   - babyModelQuery.setId(checkModel.getId());
435   - addBabyReservMessages(template, config, service, messages, yuYueDate, babyModelQuery);
436   - } else {
437   - HashMap<String, Object> param = getMapByParam(template, query.getId(), true);
438   - // 兼容多服务推送,查询mysql
439   - List<Map> patientServices = patientServiceService.getPatientServices(param);
440   - if (CollectionUtils.isNotEmpty(patientServices)){
441   - BabyModelQuery babyQuery = new BabyModelQuery();
442   - babyQuery.setYn(YnEnums.YES.getId());
443   - babyQuery.setId(checkModel.getId());
444   - //查询符合条件儿童
445   - addBabyReservMessages(template, config, service, messages, yuYueDate, query);
446   - }
447   - }
448 432 }
449 433 }
450 434  
451 435  
452 436  
453 437  
454 438  
455 439  
... ... @@ -1081,32 +1065,26 @@
1081 1065 * @param service
1082 1066 * @param messages
1083 1067 * @param yuYueDate
1084   - * @param query
  1068 + * @param model
1085 1069 */
1086   - private void addBabyReservMessages(SmsTemplateModel template, SmsConfigModel config, Integer service, List<MsgRequest> messages, Date yuYueDate, BabyModelQuery query) {
1087   - List<BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(query);
1088   - if (CollectionUtils.isNotEmpty(babyModels)) {
1089   - for (BabyModel model : babyModels) {
  1070 + private void addBabyReservMessages(SmsTemplateModel template, SmsConfigModel config, Integer service, List<MsgRequest> messages, Date yuYueDate, BabyModel model) {
  1071 + String serDoc = baseService.getBabyServiceDoctorId(model.getId(), false);
1090 1072  
1091   - String serDoc = baseService.getBabyServiceDoctorId(model.getId(), false);
  1073 + //短信前缀
  1074 + String messagePrefix = baseService.getSmsPrefix(config, model.getBuildDoctor(), ServiceObjEnums.BABYOBJ.getId());
  1075 + messagePrefix = baseService.getBabySmsPrefix(config,model.getId(),messagePrefix,template);
  1076 + String messageContent = "【" + messagePrefix + "】" + template.getContent();
  1077 + messageContent = HelperUtils.replaceEL(model.getName(), yuYueDate, messageContent);
1092 1078  
1093   - //短信前缀
1094   - String messagePrefix = baseService.getSmsPrefix(config, model.getBuildDoctor(), ServiceObjEnums.BABYOBJ.getId());
1095   - messagePrefix = baseService.getBabySmsPrefix(config,model.getId(),messagePrefix,template);
1096   - String messageContent = "【" + messagePrefix + "】" + template.getContent();
1097   - messageContent = HelperUtils.replaceEL(model.getName(), yuYueDate, messageContent);
  1079 + String itemName = "儿童保健";
  1080 + String nextCheckTime = DateUtils.getDateStr(yuYueDate, DateUtils.Y_M_D);
1098 1081  
1099   - String itemName = "儿童保健";
1100   - String nextCheckTime = DateUtils.getDateStr(yuYueDate, DateUtils.Y_M_D);
  1082 + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, model.getMphone(),
  1083 + ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(),
  1084 + model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, serDoc,
  1085 + WxTempleteIdEnums.ER_TONG_TI_XING.getId(), service);
1101 1086  
1102   - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, model.getMphone(),
1103   - ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(),
1104   - model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, serDoc,
1105   - WxTempleteIdEnums.ER_TONG_TI_XING.getId(), service);
1106   -
1107   - messages.add(request);
1108   - }
1109   - }
  1087 + messages.add(request);
1110 1088 }
1111 1089  
1112 1090  
... ... @@ -1313,10 +1291,10 @@
1313 1291 List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
1314 1292 if (CollectionUtils.isNotEmpty(patients)){
1315 1293 for (Patients patient: patients){
1316   - boolean existMsg = HelperUtils.isExistMsg(patient.getId(), template.getId());
1317   - if (existMsg){
1318   - continue;
1319   - }
  1294 +// boolean existMsg = HelperUtils.isExistMsg(patient.getId(), template.getId());
  1295 +// if (existMsg){
  1296 +// continue;
  1297 +// }
1320 1298 addYunOverdueMessages(template, config, service, messages, yuYueDate, patient);
1321 1299 }
1322 1300 list.setMessages(messages);
... ... @@ -1332,10 +1310,10 @@
1332 1310 List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
1333 1311 if (CollectionUtils.isNotEmpty(patients)){
1334 1312 for (Patients patient: patients){
1335   - boolean existMsg = HelperUtils.isExistMsg(patient.getId(), template.getId());
1336   - if (existMsg){
1337   - continue;
1338   - }
  1313 +// boolean existMsg = HelperUtils.isExistMsg(patient.getId(), template.getId());
  1314 +// if (existMsg){
  1315 +// continue;
  1316 +// }
1339 1317 addYunOverdueMessages(template, config, service, messages, yuYueDate, patient);
1340 1318 }
1341 1319 list.setMessages(messages);
... ... @@ -1348,10 +1326,10 @@
1348 1326 List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(query);
1349 1327 if (CollectionUtils.isNotEmpty(patients)){
1350 1328 for (Patients patient: patients){
1351   - boolean existMsg = HelperUtils.isExistMsg(patient.getId(), template.getId());
1352   - if (existMsg){
1353   - continue;
1354   - }
  1329 +// boolean existMsg = HelperUtils.isExistMsg(patient.getId(), template.getId());
  1330 +// if (existMsg){
  1331 +// continue;
  1332 +// }
1355 1333 addYunOverdueMessages(template, config, service, messages, yuYueDate, patient);
1356 1334 // HashMap<String, Object> hashMap = getMapByParam(template, patient.getId(), false);
1357 1335 // List<Map> patientServices = patientServiceService.getPatientServices(hashMap);
... ... @@ -1809,10 +1787,10 @@
1809 1787  
1810 1788 if (CollectionUtils.isNotEmpty(patients)) {
1811 1789 for (Patients pat : patients) {
1812   - boolean existMsg = HelperUtils.isExistMsg(pat.getId(), template.getId());
1813   - if (existMsg){
1814   - continue;
1815   - }
  1790 +// boolean existMsg = HelperUtils.isExistMsg(pat.getId(), template.getId());
  1791 +// if (existMsg){
  1792 +// continue;
  1793 +// }
1816 1794 String serDoct = baseService.getServiceDoctorId(pat.getId(),false);
1817 1795  
1818 1796 //短信前缀
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ bd9dfdc
... ... @@ -3623,6 +3623,13 @@
3623 3623 //获取当前用户在的医院
3624 3624 List <String> currentGroupHospital = groupsFacade.findGroupHospital(userId, false);
3625 3625  
  3626 +
  3627 + //衡水区域并且不是冀州妇幼登陆
  3628 + if("12".equals(og.getCityId()) && !"2100002109".equals(hospitalId))
  3629 + {
  3630 + currentGroupHospital.remove("2100002109");//排查冀州妇幼
  3631 + }
  3632 +
3626 3633 if (!StringUtils.isEmpty(queryRequest.getPatientId())) {
3627 3634 PatientsQuery patientsQuery = new PatientsQuery();
3628 3635 patientsQuery.setId(queryRequest.getPatientId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ bd9dfdc
... ... @@ -2258,7 +2258,7 @@
2258 2258  
2259 2259 result.setPid(model.getPid());
2260 2260 result.setCardNo(model.getMcertNo());//母亲的身份证号码
2261   - result.setName(model.getName());
  2261 + result.setName(babyHis.get("name") == null ? "" : babyHis.get("name").toString());
2262 2262 if (model.getBirth() != null) {
2263 2263 result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
2264 2264 } else {
... ... @@ -2280,6 +2280,7 @@
2280 2280 if (build.getHospitalId().equals(param.getHospitalId())) {
2281 2281 isCurrentHosp = true;
2282 2282 buildInfo = build;
  2283 + buildInfo.setName(babyHis.get("name") == null ? "" : babyHis.get("name").toString());
2283 2284 }
2284 2285  
2285 2286 if (build != null && build.getYn() == YnEnums.YES.getId()) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ bd9dfdc
... ... @@ -1484,9 +1484,18 @@
1484 1484 hids.add(String.valueOf(organization.getId()));
1485 1485 }
1486 1486 }
  1487 +
  1488 +
  1489 + //衡水区域并且不是冀州妇幼登陆
  1490 + if("12".equals(org.getCityId()) && !"2100002109".equals(hospitalId))
  1491 + {
  1492 + hids.remove("2100002109");//排查冀州妇幼
  1493 + }
  1494 +
1487 1495 if (CollectionUtils.isNotEmpty(hids)) {
1488 1496 patientsQuery.setHospitalList(hids);
1489 1497 }
  1498 +
1490 1499 }
1491 1500  
1492 1501 patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery, "bookbuildingDate", Sort.Direction.DESC);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ bd9dfdc
... ... @@ -1349,11 +1349,21 @@
1349 1349 //外院的产妇
1350 1350 // Patients patients2 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 3);
1351 1351  
  1352 + List<String> hids = organizationGroupsFacade.findGroupHospital(userId, false);
  1353 +
  1354 +
  1355 + //衡水区域并且不是冀州妇幼登陆
  1356 + if("12".equals(og.getCityId()) && !"2100002109".equals(hospital))
  1357 + {
  1358 + hids.remove("2100002109");//排查冀州妇幼
  1359 + }
  1360 +
  1361 +
1352 1362 //http://jira.healthbaby.com.cn/browse/WEB-204 修改bug
1353 1363 //本院的孕妇
1354   - Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId, false), 1, false, deliverQueryRequest.getPid(), isEnable);
  1364 + Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null,hids, 1, false, deliverQueryRequest.getPid(), isEnable);
1355 1365 //本院产妇
1356   - Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId, false), 3, false, deliverQueryRequest.getPid(), isEnable);
  1366 + Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hids, 3, false, deliverQueryRequest.getPid(), isEnable);
1357 1367 PersonModelQuery personModelQuery = new PersonModelQuery();
1358 1368 String pid = "";
1359 1369 if (null != patients1) {