jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 05915d507e8d4d0dc67ac26cf407b30ac042b0ae

Authored by jiangjiazhi
2 parents a907dbd0a7 5be48467a5
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 05915d5
... ... @@ -273,6 +273,7 @@
273 273  
274 274 SmsTemplateQuery query = new SmsTemplateQuery();
275 275 query.setYn(YnEnums.YES.getId());
  276 + query.setStatus(1);
276 277 query.setHospitalId(patient.getHospitalId());
277 278 query.setServiceObj(ServiceObjEnums.YUNOBJ.getId());
278 279 query.setSpecialDateType(SpecialDateEnums.JD.getId());
279 280  
280 281  
281 282  
282 283  
283 284  
284 285  
285 286  
286 287  
287 288  
288 289  
289 290  
290 291  
291 292  
292 293  
293 294  
294 295  
295 296  
296 297  
297 298  
298 299  
299 300  
300 301  
301 302  
302 303  
303 304  
304 305  
... ... @@ -285,124 +286,221 @@
285 286 // query.setServiceStatus(serviceStatus);
286 287 // }
287 288  
  289 + List<SmsTemplateModel> sendList = new ArrayList<>();
  290 +
288 291 List<SmsTemplateModel> temps = smsTemplateService.querySmsTemplates(query);
289 292 if (CollectionUtils.isNotEmpty(temps))
290 293 {
291   - SmsTemplateModel templateModel = null;
292 294 for (SmsTemplateModel temp : temps)
293 295 {
294 296 if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus)
295 297 {
296   - templateModel = temp;
  298 + sendList.add(temp);
297 299 break;
298 300 }
299 301 }
300 302  
301   - if (templateModel == null)
  303 + for (SmsTemplateModel temp : temps)
302 304 {
303   - for (SmsTemplateModel temp : temps)
  305 + if (temp.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId())
304 306 {
305   - if (temp.getServiceStatus() == serviceStatus)
  307 + if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() )
306 308 {
307   - templateModel = temp;
  309 + sendList.add(temp);
308 310 break;
309 311 }
310 312 }
311 313 }
312 314  
313   - if (templateModel == null)
  315 + for (SmsTemplateModel temp : temps)
314 316 {
315   - for (SmsTemplateModel temp : temps)
  317 + if (temp.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId())
316 318 {
317   - if (temp.getServiceType() == serviceType)
  319 + if (serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId()
  320 + || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId()|| serviceStatus == ServiceStatusEnums.SUSPEND.getId())
318 321 {
319   - templateModel = temp;
  322 + sendList.add(temp);
320 323 break;
321 324 }
322 325 }
323 326 }
324 327  
325   - if (templateModel == null)
326   - {
  328 +
327 329 for (SmsTemplateModel temp : temps)
328 330 {
329 331 if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId())
330 332 {
331 333 if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() )
332 334 {
333   - templateModel = temp;
  335 + sendList.add(temp);
334 336 break;
335 337 }
336 338 }
337 339 }
338   - }
339 340  
340   - if (templateModel == null)
341   - {
  341 +
  342 +
342 343 for (SmsTemplateModel temp : temps)
343 344 {
344 345 if (temp.getServiceStatus() == ServiceStatusEnums.ALL_NO_OPEN.getId())
345 346 {
346 347 if (serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() )
347 348 {
348   - templateModel = temp;
  349 + sendList.add(temp);
349 350 break;
350 351 }
351 352 }
352 353 }
353   - }
354 354  
355   - if (templateModel == null)
356   - {
  355 +
  356 +
357 357 for (SmsTemplateModel temp : temps)
358 358 {
359 359 if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId())
360 360 {
361 361 if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() )
362 362 {
363   - templateModel = temp;
  363 + sendList.add(temp);
364 364 break;
365 365 }
366 366 }
367 367 }
368   - }
369 368  
370   - if (templateModel == null)
371   - {
  369 +
  370 +
372 371 for (SmsTemplateModel temp : temps)
373 372 {
374   - if (temp.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId())
  373 + if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId())
375 374 {
376   - templateModel = temp;
  375 + sendList.add(temp);
377 376 break;
378 377 }
379 378 }
380   - }
381 379  
382   - if (templateModel != null && templateModel.getStatus() == 1)
  380 +
  381 +// if (CollectionUtils.isNotEmpty(temps))
  382 +// {
  383 +// SmsTemplateModel templateModel = null;
  384 +// for (SmsTemplateModel temp : temps)
  385 +// {
  386 +// if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus)
  387 +// {
  388 +// templateModel = temp;
  389 +// break;
  390 +// }
  391 +// }
  392 +//
  393 +// if (templateModel == null)
  394 +// {
  395 +// for (SmsTemplateModel temp : temps)
  396 +// {
  397 +// if (temp.getServiceStatus() == serviceStatus)
  398 +// {
  399 +// templateModel = temp;
  400 +// break;
  401 +// }
  402 +// }
  403 +// }
  404 +//
  405 +// if (templateModel == null)
  406 +// {
  407 +// for (SmsTemplateModel temp : temps)
  408 +// {
  409 +// if (temp.getServiceType() == serviceType)
  410 +// {
  411 +// templateModel = temp;
  412 +// break;
  413 +// }
  414 +// }
  415 +// }
  416 +//
  417 +// if (templateModel == null)
  418 +// {
  419 +// for (SmsTemplateModel temp : temps)
  420 +// {
  421 +// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId())
  422 +// {
  423 +// if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() )
  424 +// {
  425 +// templateModel = temp;
  426 +// break;
  427 +// }
  428 +// }
  429 +// }
  430 +// }
  431 +//
  432 +// if (templateModel == null)
  433 +// {
  434 +// for (SmsTemplateModel temp : temps)
  435 +// {
  436 +// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_NO_OPEN.getId())
  437 +// {
  438 +// if (serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() )
  439 +// {
  440 +// templateModel = temp;
  441 +// break;
  442 +// }
  443 +// }
  444 +// }
  445 +// }
  446 +//
  447 +// if (templateModel == null)
  448 +// {
  449 +// for (SmsTemplateModel temp : temps)
  450 +// {
  451 +// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId())
  452 +// {
  453 +// if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() )
  454 +// {
  455 +// templateModel = temp;
  456 +// break;
  457 +// }
  458 +// }
  459 +// }
  460 +// }
  461 +//
  462 +// if (templateModel == null)
  463 +// {
  464 +// for (SmsTemplateModel temp : temps)
  465 +// {
  466 +// if (temp.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId())
  467 +// {
  468 +// templateModel = temp;
  469 +// break;
  470 +// }
  471 +// }
  472 +// }
  473 +
  474 + if (CollectionUtils.isNotEmpty(sendList))
383 475 {
384   - MessageListRequest smsList = new MessageListRequest();
385   - List<MessageRequest> messages = new ArrayList<>();
386   - MessageRequest mr = new MessageRequest();
387   - mr.setContent(templateModel.getContent());
388   - mr.setObjType(ServiceObjEnums.YUNOBJ.getId());
389   - mr.setPhone(patient.getPhone());
390   - //短信商
391   - mr.setServiceType(SmsProviderEnums.ALDY.getId());
392   - mr.setTypeId(ProjectTypeEnums.YNXT.getId());
393   - mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
394   - mr.setSubTypeId(SmsServiceEnums.FWKT.getId());
395   - mr.setStatus(SmsStatusEnums.WFS.getId());
396   - mr.setExt1(patient.getHospitalId());
397   - mr.setExt2(templateModel.getId());
398   - mr.setExt3(patient.getId());
399   - messages.add(mr);
  476 + for (SmsTemplateModel templateModel : sendList)
  477 + {
  478 + if (templateModel != null && templateModel.getStatus() == 1)
  479 + {
  480 + MessageListRequest smsList = new MessageListRequest();
  481 + List<MessageRequest> messages = new ArrayList<>();
  482 + MessageRequest mr = new MessageRequest();
  483 + mr.setContent(templateModel.getContent());
  484 + mr.setObjType(ServiceObjEnums.YUNOBJ.getId());
  485 + mr.setPhone(patient.getPhone());
  486 + //短信商
  487 + mr.setServiceType(SmsProviderEnums.ALDY.getId());
  488 + mr.setTypeId(ProjectTypeEnums.YNXT.getId());
  489 + mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
  490 + mr.setSubTypeId(SmsServiceEnums.FWKT.getId());
  491 + mr.setStatus(SmsStatusEnums.WFS.getId());
  492 + mr.setExt1(patient.getHospitalId());
  493 + mr.setExt2(templateModel.getId());
  494 + mr.setExt3(patient.getId());
  495 + messages.add(mr);
400 496  
401   - if (CollectionUtils.isNotEmpty(messages)) {
402   - smsList.setTypeId(ProjectTypeEnums.YNXT.getId());
403   - smsList.setMessages(messages);
404   - //调用发送接口
405   - MessageCenterService.saveSmsCenter(smsList);
  497 + if (CollectionUtils.isNotEmpty(messages)) {
  498 + smsList.setTypeId(ProjectTypeEnums.YNXT.getId());
  499 + smsList.setMessages(messages);
  500 + //调用发送接口
  501 + MessageCenterService.saveSmsCenter(smsList);
  502 + }
  503 + }
406 504 }
407 505 }
408 506 }