jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 08725dd0b9bd192a5cc1b28afd1ffea2eef1b67e

Authored by yangfei
1 parent 0e539e4c81
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

开通增值服务同步数据数据验证

Showing 1 changed file with 12 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java View file @ 08725dd
... ... @@ -607,6 +607,11 @@
607 607 result.setBackResult(ps.getBackResult());
608 608 if (ps.getBackResult() != null) {
609 609 result.setBackResultStr(ps.getBackResult() == 1 ? "成功" : "失败");
  610 + //提醒结果为失败
  611 + if (ps.getBackResult() == 2&&ps.getBackFailure() != null) {
  612 + result.setBackFailure(ps.getBackFailure());
  613 + result.setBackFailureStr(MakeHospitalEnums.getTitle(ps.getBackFailure()));
  614 + }
610 615 } else {
611 616 result.setBackResultStr("--");
612 617 }
... ... @@ -621,10 +626,7 @@
621 626 result.setBackDate(DateUtil.gety_m_dhm(ps.getBackDate()));
622 627 result.setBackMakeDate(DateUtil.getyyyy_MM_dd(ps.getBackMakeDate()));
623 628 result.setBackRemark(ps.getBackRemark());
624   - if (ps.getBackFailure() != null) {
625   - result.setBackFailure(ps.getBackFailure());
626   - result.setBackFailureStr(MakeHospitalEnums.getTitle(ps.getBackFailure()));
627   - }
  629 +
628 630 if (ps.getInHospitStatus() != null) {
629 631 result.setInHospitStatus(ps.getInHospitStatus());
630 632 result.setInHospitStatusStr(ps.getInHospitStatus() == 1 ? "待提醒" : "已提醒");
... ... @@ -632,6 +634,11 @@
632 634 if (ps.getInHospitResult() != null) {
633 635 result.setInHospitResult(ps.getInHospitResult());
634 636 result.setInHospitResultStr(ps.getInHospitResult() == 1 ? "成功" : "失败");
  637 + // 住院提醒结果2-失败
  638 + if (ps.getInHospitResult() == 2 && ps.getInHospitFailure() != null) {
  639 + result.setInHospitFailure(ps.getInHospitFailure());
  640 + result.setInHospitFailureStr(MakeHospitalEnums.getTitle(ps.getInHospitFailure()));
  641 + }
635 642 } else {
636 643 result.setInHospitResultStr("--");
637 644 }
... ... @@ -647,10 +654,7 @@
647 654 result.setInHospitDate(DateUtil.gety_m_dhm(ps.getInHospitDate()));
648 655 result.setInHospitMakeDate(DateUtil.getyyyy_MM_dd(ps.getInHospitMakeDate()));
649 656 result.setInHospitRemark(ps.getInHospitRemark());
650   - if (ps.getInHospitFailure() != null) {
651   - result.setInHospitFailure(ps.getInHospitFailure());
652   - result.setInHospitFailureStr(MakeHospitalEnums.getTitle(ps.getInHospitFailure()));
653   - }
  657 +
654 658  
655 659 if (ps.getHospitStatus() != null) {
656 660 result.setHospitStatus(ps.getHospitStatus());