From fbc2aa615ce35a2994821d5cbecf2350ac24a86b Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 12 Dec 2017 17:12:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=90=8E=E9=9A=8F=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/MatDeliverFacade.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 0174789..6c51e44 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 @@ -1348,16 +1348,19 @@ public class MatDeliverFacade { //预约联系结果 if (deliverModel.getContactResult() != null) { matdeliverFollowListResult.setContactResultStr(PostpartumFollowMakeEnums.ResultEnum.getTitle(deliverModel.getContactResult())); + if(deliverModel.getContactResult() == 1){//预约成功,返回访视类型 + //访视类型 + if (deliverModel.getMakeType() != null) { + matdeliverFollowListResult.setMakeType(PostpartumFollowMakeEnums.TypeEnum.getTitle(deliverModel.getMakeType())); + } + } } //产妇确认结果 if (deliverModel.getVisitAffirm() != null) { matdeliverFollowListResult.setVisitAffirm(PostpartumFollowMakeEnums.VisitAffirmEnum.getTitle(deliverModel.getVisitAffirm())); } - //访视类型 - if (deliverModel.getMakeType() != null) { - matdeliverFollowListResult.setMakeType(PostpartumFollowMakeEnums.TypeEnum.getTitle(deliverModel.getMakeType())); - } + //下次访视时间 if (deliverModel.getNextVisitDate() != null) { -- 1.8.3.1