jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit da7a5004a144eefe2b2ec4c25d1a357184f3bd26

Authored by jiangjiazhi
2 parents 30b4de5b58 a56acd4131
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 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ da7a500
... ... @@ -245,8 +245,18 @@
245 245 if (CollectionUtils.isNotEmpty(list))
246 246 {
247 247 BabyModel babyModel = list.get(0);
248   - if (babyModel.getServiceStatus() != ServiceStatusEnums.STANDARD_OPEN.getId() || babyModel.getServiceStatus() != ServiceStatusEnums.ADD_OPEN.getId())
  248 + if (!(babyModel.getServiceStatus() == ServiceStatusEnums.STANDARD_OPEN.getId() || babyModel.getServiceStatus() == ServiceStatusEnums.ADD_OPEN.getId()))
249 249 {
  250 +
  251 + if (babyModel.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId())
  252 + {
  253 + babyModel.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId());
  254 + }
  255 + else if (babyModel.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId())
  256 + {
  257 + babyModel.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());
  258 + }
  259 +
250 260 createBuildSms(babyModel);
251 261 }
252 262 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ da7a500
... ... @@ -479,8 +479,18 @@
479 479 if (CollectionUtils.isNotEmpty(list))
480 480 {
481 481 Patients pat = list.get(0);
482   - if (pat.getServiceStatus() != ServiceStatusEnums.STANDARD_OPEN.getId() && pat.getServiceStatus() != ServiceStatusEnums.ADD_OPEN.getId())
  482 + if (!(pat.getServiceStatus() == ServiceStatusEnums.STANDARD_OPEN.getId() || pat.getServiceStatus() == ServiceStatusEnums.ADD_OPEN.getId()))
483 483 {
  484 +
  485 + if (pat.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId())
  486 + {
  487 + pat.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId());
  488 + }
  489 + else if (pat.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId())
  490 + {
  491 + pat.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());
  492 + }
  493 +
484 494 createBuildSms(pat);
485 495 }
486 496 }