From 632c0ea9b59c759f6fddad0a39fe11fec4341742 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 29 Jul 2020 10:40:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E8=A7=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/MatDeliverFacade.java | 10 +++++++++- .../operate/web/result/MatdeliverFollowListResult.java | 11 +++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index f1fcd73..fc94596 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -2094,7 +2094,13 @@ public class MatDeliverFacade { else { //产后休养地 - matdeliverFollowListResult.setPostpartumAddress(CommonsHelper.getResidence(patients.getProvincePostRestId(), patients.getCityPostRestId(), patients.getAreaPostRestId(), patients.getStreetPostRestId(), patients.getAddressPostRest(), basicConfigService)); + matdeliverFollowListResult.setPostpartumAddress(CommonsHelper.getResidence( + patients.getProvincePostRestId() != null ? patients.getProvincePostRestId() : patients.getProvinceRegisterId(), + patients.getCityPostRestId() != null ? patients.getCityPostRestId() : patients.getCityRegisterId(), + patients.getAreaPostRestId() != null ? patients.getAreaPostRestId() : patients.getAreaRegisterId(), + patients.getStreetPostRestId() != null ? patients.getStreetPostRestId() : patients.getStreetRegisterId(), + patients.getAddressPostRest() != null ? patients.getAddressPostRest() : patients.getAddressRegister(), + basicConfigService)); } @@ -2133,6 +2139,8 @@ public class MatDeliverFacade { matdeliverFollowListResult.setMatFollowId(deliverModel.getMatFollowId()); matdeliverFollowListResult.setDueDate(deliverModel.getDueDate()); matdeliverFollowListResult.setId(deliverModel.getId()); + matdeliverFollowListResult.setVisitStatus(PostpartumFollowMakeEnums.StatusEnum.getTitle(deliverModel.getVisitStatus())); + //机构信息 try { Organization organization = organizationService.getOrganization(Integer.valueOf(deliverModel.getFmHospital())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowListResult.java index 3e93ff5..4f59fc9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowListResult.java @@ -165,6 +165,17 @@ public class MatdeliverFollowListResult { */ private String addressZJ; + //访视状态 DFS(1, "待访视"), YFS(2, "已访视"); + private String visitStatus; + + public String getVisitStatus() { + return visitStatus; + } + + public void setVisitStatus(String visitStatus) { + this.visitStatus = visitStatus; + } + public String getAddressZJ() { return addressZJ; } -- 1.8.3.1