From 6319f2c8d1890b89d48321ca1d87c950400a28e1 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Mon, 4 Dec 2017 15:07:29 +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/pojo/MatdeliverFollowModel.java  |  42 +---
 .../operate/web/facade/MatdeliverFollowFacade.java |  32 ++-
 .../platform/operate/web/facade/ViewFacade.java    |  76 +++----
 .../web/request/MatDeliverFollowAddRequest.java    | 208 +++++++----------
 .../operate/web/result/MatdeliverFollowResult.java | 252 ++++++++++++++++++---
 5 files changed, 372 insertions(+), 238 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowModel.java
index c74e064..82e83c4 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowModel.java
@@ -111,10 +111,6 @@ public class MatdeliverFollowModel extends BaseModel {
      */
     private String postFollowId;
     /**
-     * 分娩日期
-     */
-    private Date fmDate;
-    /**
      * 出院日期
      */
     private Date leaveDate;
@@ -131,13 +127,9 @@ public class MatdeliverFollowModel extends BaseModel {
      */
     private String mentalityDesc;
     /**
-     * 血压低
-     */
-    private Integer bpv;
-    /**
-     * 血压高
+     * 血压
      */
-    private Integer bpk;
+    private String bp;
     /**
      * 乳房
      */
@@ -458,16 +450,6 @@ public class MatdeliverFollowModel extends BaseModel {
 
     }
 
-    public Date getFmDate() {
-        return fmDate;
-    }
-
-
-    public void setFmDate(Date fmDate) {
-        this.fmDate = fmDate;
-
-    }
-
     public Date getLeaveDate() {
         return leaveDate;
     }
@@ -508,24 +490,12 @@ public class MatdeliverFollowModel extends BaseModel {
 
     }
 
-    public Integer getBpv() {
-        return bpv;
-    }
-
-
-    public void setBpv(Integer bpv) {
-        this.bpv = bpv;
-
+    public String getBp() {
+        return bp;
     }
 
-    public Integer getBpk() {
-        return bpk;
-    }
-
-
-    public void setBpk(Integer bpk) {
-        this.bpk = bpk;
-
+    public void setBp(String bp) {
+        this.bp = bp;
     }
 
     public Integer getBreast() {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java
index 32fe43a..0ca70f7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java
@@ -2,7 +2,6 @@ package com.lyms.platform.operate.web.facade;
 
 import com.lyms.platform.biz.service.MatDeliverFollowService;
 import com.lyms.platform.biz.service.MatDeliverService;
-import com.lyms.platform.biz.service.PatientsService;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.PostpartumFollowMakeEnums;
 import com.lyms.platform.common.result.BaseListResponse;
@@ -13,7 +12,9 @@ import com.lyms.platform.operate.web.request.MatDeliverFollowAddRequest;
 import com.lyms.platform.operate.web.request.MatdeliverFollowRequest;
 import com.lyms.platform.operate.web.result.MatdeliverFollowResult;
 import com.lyms.platform.operate.web.utils.CollectionUtils;
+import com.lyms.platform.permission.model.Organization;
 import com.lyms.platform.permission.model.Users;
+import com.lyms.platform.permission.service.OrganizationService;
 import com.lyms.platform.permission.service.UsersService;
 import com.lyms.platform.pojo.MatdeliverFollowModel;
 import com.lyms.platform.pojo.MaternalDeliverModel;
@@ -36,15 +37,13 @@ public class MatdeliverFollowFacade {
     @Autowired
     private MatDeliverFollowService matDeliverFollowService;
     @Autowired
-    private PatientsService patientsService;
-    @Autowired
-    private AutoMatchFacade autoMatchFacade;
-    @Autowired
     private MatDeliverFacade matDeliverFacade;
     @Autowired
     private MatDeliverService matDeliverService;
     @Autowired
     private UsersService usersService;
+    @Autowired
+    private OrganizationService organizationService;
 
     public BaseResponse matdeliverFollowMakeInit(Integer id) {
         Map map = new HashMap();
@@ -130,10 +129,11 @@ public class MatdeliverFollowFacade {
      */
     public BaseResponse addOrUpdateMatDeliverFollow(MatDeliverFollowAddRequest matDeliverFollowAddRequest, Integer userId) {
         BaseResponse baseResponse = new BaseResponse();
-        matDeliverFollowAddRequest.setUpdateDate(new Date());
+        matDeliverFollowAddRequest.setUpdateDateStr(new Date());
         matDeliverFollowAddRequest.setUpdateUser(String.valueOf(userId));
 
         if (StringUtils.isNotEmpty(matDeliverFollowAddRequest.getId())) {//修改
+            //修改随访信息
             matDeliverFollowService.updateOne(matDeliverFollowAddRequest.convertToDataModel(), matDeliverFollowAddRequest.getId());
 
             //获取分娩记录
@@ -141,7 +141,6 @@ public class MatdeliverFollowFacade {
 
             //如果修改的是最后一次随访记录，则进行同步修改分娩记录里的随访信息
             if (matDeliverFollowAddRequest.getId().equals(maternalDeliverModel.getMatFollowId())) {
-
                 //在分娩记录上记录随访部分信息
                 maternalDeliverModel.setContactResult(matDeliverFollowAddRequest.getContactResult());
                 maternalDeliverModel.setContactReason(matDeliverFollowAddRequest.getContactReason());
@@ -149,17 +148,17 @@ public class MatdeliverFollowFacade {
                 maternalDeliverModel.setVisitStatus(matDeliverFollowAddRequest.getVisitStatus());
                 maternalDeliverModel.setMakeType(matDeliverFollowAddRequest.getMakeType());
                 maternalDeliverModel.setVisitResult(matDeliverFollowAddRequest.getVisitResult());
-                maternalDeliverModel.setNextVisitDate(matDeliverFollowAddRequest.getNextVisitDate());
+                maternalDeliverModel.setNextVisitDate(matDeliverFollowAddRequest.getNextVisitDateStr());
                 maternalDeliverModel.setIsClose(matDeliverFollowAddRequest.getIsClose());
                 //修改分娩记录
                 matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId());
                 baseResponse.setObject(matDeliverFollowAddRequest.getId());
             }
-            //获取随访详情
-            MatdeliverFollowModel matdeliverFollowModel = matDeliverFollowService.getOneMatDeliverFollow(matDeliverFollowAddRequest.getId());
-
         } else {//新增随访记录，并同步更新分娩记录里的随访信息
+            //预约操作信息
             matDeliverFollowAddRequest.setId(null);
+            matDeliverFollowAddRequest.setMakeCreateUser(String.valueOf(userId));
+            matDeliverFollowAddRequest.setMakeCreateDate(new Date());
             //新增随访记录
             MatdeliverFollowModel matdeliverFollowModel = matDeliverFollowService.addMatDeliverFollow(matDeliverFollowAddRequest.convertToDataModel());
 
@@ -233,6 +232,17 @@ public class MatdeliverFollowFacade {
             }
         }
 
+        if(StringUtils.isNotEmpty(matdeliverFollowResult.getReferHospital())){
+            try{
+                Organization og = organizationService.getOrganization(Integer.valueOf(matdeliverFollowResult.getReferHospital()));
+                if (null != og) {
+                    matdeliverFollowResult.setReferHospitalStr(og.getName());
+                }
+            }catch (Exception e){
+
+            }
+        }
+
         //访视医生
         if (StringUtils.isNotEmpty(matdeliverFollowResult.getVisitCreateUser())) {
             try {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index 07dcd0f..955b401 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -101,6 +101,7 @@ public class ViewFacade {
 
     @Autowired
     private PatientServiceFacade patientServiceFacade;
+
     /**
      * 建档查询
      *
@@ -123,16 +124,16 @@ public class ViewFacade {
             return br;
         }
 
-        Map<String, Object> map =  getPatientViewData(data,id);
+        Map<String, Object> map = getPatientViewData(data, id);
         /** 末次月经和纠正末次月经反起来返回 */
-        if(data.getFuckLastMens() != null) {
+        if (data.getFuckLastMens() != null) {
             map.put("fuckLastMens", DateUtil.getyyyy_MM_dd(data.getLastMenses()));
             map.put("lastMenses", DateUtil.getyyyy_MM_dd(data.getFuckLastMens()));
         }
         map.put("lastMenstrualPeriodBasisDoctorId", couponMapper.findUserName(data.getLastMenstrualPeriodBasisDoctorId()));
-        BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id,0);
+        BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id, 0);
         List<PatientSerResult> patientSerResults = (List<PatientSerResult>) baseResponse.getObject();
-        map.put("patientSerResults",patientSerResults);
+        map.put("patientSerResults", patientSerResults);
         //显示服务信息
         br.setData(map);
         br.setErrorcode(ErrorCodeConstants.SUCCESS);
@@ -140,15 +141,14 @@ public class ViewFacade {
         return br;
     }
 
-    public Map<String, Object> getPatientViewData( Patients data ,String id)
-    {
+    public Map<String, Object> getPatientViewData(Patients data, String id) {
         Map<String, Object> map = new HashMap<>();
         map.put("lastMenstrualPeriodBasis", BasisEnums.getName(data.getLastMenstrualPeriodBasis()));
         map.put("lastMenstrualPeriodBasisDoctorId", couponMapper.findUserName(data.getLastMenstrualPeriodBasis()));
         map.put("lastMenstrualPeriodBasisDate", data.getLastMenstrualPeriodBasisDate());
 
         map.put("lastMenstrualPeriodBasis", BasisEnums.getName(data.getLastMenstrualPeriodBasis()));
-        if(BasisEnums.E.getId().equals(data.getLastMenstrualPeriodBasis())) {
+        if (BasisEnums.E.getId().equals(data.getLastMenstrualPeriodBasis())) {
             map.put("lastMenstrualPeriodBasis", BasisEnums.getName(data.getLastMenstrualPeriodBasis()) + "：" + data.getLastMenstrualPeriodBasisOther());
         }
 
@@ -1176,7 +1176,7 @@ public class ViewFacade {
 //        map.put("treatmentOpinion2", mongoUtil.findPlatList2(data.getTreatmentOpinion2()));
         map.put("treatmentOpinion3", getTreatmentOpinion3(data.getTreatmentOpinion2()));
 //        map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2()));
-        map.put("quickenRemark",data.getQuickenRemark());
+        map.put("quickenRemark", data.getQuickenRemark());
 
         /*  基本信息  */
         //孕妇基本信息
@@ -1792,13 +1792,13 @@ public class ViewFacade {
     }
 
     private String getTreatmentOpinion3(Map<String, List<String>> ids) {
-        if(MapUtils.isNotEmpty(ids)) {
+        if (MapUtils.isNotEmpty(ids)) {
             StringBuilder sb = new StringBuilder();
             Integer count = 0;
             Iterator<Map.Entry<String, List<String>>> iterator = ids.entrySet().iterator();
             while (iterator.hasNext()) {
                 List<String> list = iterator.next().getValue();
-                if(com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(list)) {
+                if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(list)) {
                     for (int i = 0; i < list.size(); i++) {
                         sb.append(++count).append(".").append(list.get(i).split("\\[fuck\\]")[0]).append(",");
                     }
@@ -2296,16 +2296,18 @@ public class ViewFacade {
         // 产后血压 收缩压，舒张压
         String ssy = "";
         String szy = "";
-        Map<String, String> chBpMap = JsonUtil.getMap(data.getChBp());
-        if (MapUtils.isNotEmpty(chBpMap)) {
-            ssy = chBpMap.get("ssy");
-            szy = chBpMap.get("szy");
-            if (StringUtils.isNotEmpty(ssy)) {
-                map.put("ssy", UnitUtils.unitSplice(ssy, UnitConstants.MMHG));
-            }
+        if (StringUtils.isNotEmpty(data.getChBp())) {
+            Map<String, String> chBpMap = JsonUtil.getMap(data.getChBp());
+            if (MapUtils.isNotEmpty(chBpMap)) {
+                ssy = chBpMap.get("ssy");
+                szy = chBpMap.get("szy");
+                if (StringUtils.isNotEmpty(ssy)) {
+                    map.put("ssy", UnitUtils.unitSplice(ssy, UnitConstants.MMHG));
+                }
 
-            if (StringUtils.isNotEmpty(szy)) {
-                map.put("szy", UnitUtils.unitSplice(szy, UnitConstants.MMHG));
+                if (StringUtils.isNotEmpty(szy)) {
+                    map.put("szy", UnitUtils.unitSplice(szy, UnitConstants.MMHG));
+                }
             }
         }
 //        map.put("ssy", UnitUtils.unitSplice(ssy,UnitConstants.MMHG));
@@ -2314,8 +2316,7 @@ public class ViewFacade {
         String ssy2h = "";
         String szy2h = "";
         Map<String, String> ch2BpMap = null;
-        if (StringUtils.isNotEmpty(data.getCh2Bp()))
-        {
+        if (StringUtils.isNotEmpty(data.getCh2Bp())) {
             ch2BpMap = JsonUtil.getMap(data.getCh2Bp());
             if (MapUtils.isNotEmpty(ch2BpMap)) {
                 ssy2h = ch2BpMap.get("ssy");
@@ -2686,23 +2687,23 @@ public class ViewFacade {
             }
             map.put("bp", com.lyms.platform.common.utils.StringUtils.isEmpty(UnitUtils.unitSplice(ssy + "/" + szy, UnitConstants.MMHG), ""));
             //乳房
-            map.put("breast",postReviewModel.getBreast()==null?"":"未见异常".equals(postReviewModel.getBreast())?"1":"2");
-            map.put("breastText",postReviewModel.getBreast()==null?"":"未见异常".equals(postReviewModel.getBreast())?"":postReviewModel.getBreast());
+            map.put("breast", postReviewModel.getBreast() == null ? "" : "未见异常".equals(postReviewModel.getBreast()) ? "1" : "2");
+            map.put("breastText", postReviewModel.getBreast() == null ? "" : "未见异常".equals(postReviewModel.getBreast()) ? "" : postReviewModel.getBreast());
             //恶露
-            map.put("lochia", postReviewModel.getLochia()==null?"":"未见异常".equals(postReviewModel.getLochia())?"1":"2");
-            map.put("lochiaText", postReviewModel.getLochia()==null?"":"未见异常".equals(postReviewModel.getLochia())?"":postReviewModel.getLochia());
+            map.put("lochia", postReviewModel.getLochia() == null ? "" : "未见异常".equals(postReviewModel.getLochia()) ? "1" : "2");
+            map.put("lochiaText", postReviewModel.getLochia() == null ? "" : "未见异常".equals(postReviewModel.getLochia()) ? "" : postReviewModel.getLochia());
             map.put("vulva", com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getVulva(), ""));
-            map.put("vagina",com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getVagina(), ""));
+            map.put("vagina", com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getVagina(), ""));
             map.put("cervixUteri", com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getCervixUteri(), ""));
             //子宫
-            map.put("matrix", postReviewModel.getMatrix()==null?"":"未见异常".equals(postReviewModel.getMatrix())?"1":"2");
-            map.put("matrixText", postReviewModel.getMatrix()==null?"":"未见异常".equals(postReviewModel.getMatrix())?"":postReviewModel.getMatrix());
+            map.put("matrix", postReviewModel.getMatrix() == null ? "" : "未见异常".equals(postReviewModel.getMatrix()) ? "1" : "2");
+            map.put("matrixText", postReviewModel.getMatrix() == null ? "" : "未见异常".equals(postReviewModel.getMatrix()) ? "" : postReviewModel.getMatrix());
             map.put("fujian", com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getFujian(), ""));
             //伤口
-            map.put("wound", postReviewModel.getWound()==null?"":"未见异常".equals(postReviewModel.getWound())?"1":"2");
-            map.put("woundText", postReviewModel.getWound()==null?"":"未见异常".equals(postReviewModel.getWound())?"":postReviewModel.getWound());
+            map.put("wound", postReviewModel.getWound() == null ? "" : "未见异常".equals(postReviewModel.getWound()) ? "1" : "2");
+            map.put("woundText", postReviewModel.getWound() == null ? "" : "未见异常".equals(postReviewModel.getWound()) ? "" : postReviewModel.getWound());
             map.put("other", com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getOther(), ""));
-            map.put("suifangtime",com.lyms.platform.common.utils.StringUtils.isEmpty(DateUtil.getyyyy_MM_dd1(postReviewModel.getCheckTime()), ""));
+            map.put("suifangtime", com.lyms.platform.common.utils.StringUtils.isEmpty(DateUtil.getyyyy_MM_dd1(postReviewModel.getCheckTime()), ""));
             map.put("fmtime", com.lyms.platform.common.utils.StringUtils.isEmpty(DateUtil.getyyyy_MM_dd1(patients.getFmDate()), ""));
             map.put("healthStatus", com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getHealthStatus(), ""));
             map.put("psychology", com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getPsychology(), ""));
@@ -2712,7 +2713,7 @@ public class ViewFacade {
             map.put("boneDensity", com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getBoneDensity(), ""));
             map.put("ultrasonicExamination", com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getUltrasonicExamination(), ""));
 
-            map.put("operator",usersService.getUsers(NumberUtils.toInt(postReviewModel.getProdDoctor())).getName() );
+            map.put("operator", usersService.getUsers(NumberUtils.toInt(postReviewModel.getProdDoctor())).getName());
             map.put("treatOpinion", com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getTreatOpinion(), ""));
             map.put("dirOpinion", com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getDirOpinion(), ""));
         }
@@ -3663,7 +3664,7 @@ public class ViewFacade {
         return result;
     }
 
-    public BaseObjectResponse findSievePatientData(String cardNo, String vcCardNo,Integer userId) {
+    public BaseObjectResponse findSievePatientData(String cardNo, String vcCardNo, Integer userId) {
 
         List<Patients> patients = new ArrayList<>();
         PatientsQuery patientsQuery = new PatientsQuery();
@@ -3687,9 +3688,7 @@ public class ViewFacade {
             patientsQuery.setHospitalId(null);
             if (CollectionUtils.isNotEmpty(localPatients)) {
                 patients = localPatients;
-            }
-            else
-            {
+            } else {
                 //区域模式
                 patientsQuery.setHospitalList(groupsFacade.findGroupHospital(userId, false));
 
@@ -3706,8 +3705,7 @@ public class ViewFacade {
                 }
             }
         }
-        if (CollectionUtils.isNotEmpty(patients) && patients.get(0) != null)
-        {
+        if (CollectionUtils.isNotEmpty(patients) && patients.get(0) != null) {
             return findPatientData(patients.get(0).getId());
         }
         return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("未查询到数据");
@@ -3718,7 +3716,7 @@ public class ViewFacade {
     }
 
     public BaseObjectResponse prient(String id) {
-        if(mongoTemplate.exists(Query.query(Criteria.where("value").is(id).and("type").is(SequenceConstant.PRIENT_TYPE)), PlantformConfigModel.class)) {
+        if (mongoTemplate.exists(Query.query(Criteria.where("value").is(id).and("type").is(SequenceConstant.PRIENT_TYPE)), PlantformConfigModel.class)) {
             return RespBuilder.buildSuccess("已经打印过了");
         }
         PlantformConfigModel plantformConfigModel = new PlantformConfigModel();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java
index a012229..ad433be 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java
@@ -1,6 +1,7 @@
 package com.lyms.platform.operate.web.request;
 
 import com.lyms.platform.common.base.IBasicRequestConvert;
+import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.pojo.MatdeliverFollowModel;
 import org.springframework.beans.BeanUtils;
 
@@ -23,7 +24,7 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
     /**
      * 分娩日期
      */
-    private Date deliveryDate;
+    private Date deliveryDateStr;
     /**
      * 分娩记录id
      */
@@ -63,7 +64,7 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
     /**
      * 预约访视日期
      */
-    private Date makeVisitDate;
+    private Date makeVisitDateStr;
     /**
      * 访视结果（1-成功、2-失败）
      */
@@ -79,7 +80,7 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
     /**
      * 访视日期
      */
-    private Date visitDate;
+    private Date visitDateStr;
     /**
      * 访视医生
      */
@@ -91,7 +92,7 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
     /**
      * 访视备注
      */
-        private String visitRemark;
+    private String visitRemark;
     /**
      * 访视操作员
      */
@@ -99,11 +100,11 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
     /**
      * 访视操作日期
      */
-    private Date visitCreateDate;
+    private Date visitCreateDateStr;
     /**
      * 下次访视日期
      */
-    private Date nextVisitDate;
+    private Date nextVisitDateStr;
     /**
      * 是否结案 1-未结案、2-已结案
      */
@@ -113,13 +114,9 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
      */
     private String postFollowId;
     /**
-     * 分娩日期
-     */
-    private Date fmDate;
-    /**
      * 出院日期
      */
-    private Date leaveDate;
+    private Date leaveDateStr;
     /**
      * 体温
      */
@@ -133,13 +130,14 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
      */
     private String mentalityDesc;
     /**
-     * 血压低
+     * 血压
      */
-    private Integer bpv;
+    private String bp;
     /**
-     * 血压高
+     * 血压MAP信息
      */
-    private Integer bpk;
+    private String bpMap;
+
     /**
      * 乳房
      */
@@ -168,6 +166,10 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
      * 指导意见
      */
     private String guideSuggest;
+    /**
+     * 指导意见Map
+     */
+    private String guideSuggestMap;
 
     /**
      * 是否转诊转诊（1-无、2-有）
@@ -185,11 +187,12 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
     /**
      * 修改时间
      */
-    private Date updateDate;
+    private Date updateDateStr;
     /**
      * 修改人
      */
     private String updateUser;
+
     /**
      * 具体转换实现
      *
@@ -198,11 +201,32 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
     @Override
     public MatdeliverFollowModel convertToDataModel() {
         MatdeliverFollowModel matdeliverFollowModel = new MatdeliverFollowModel();
-
-        BeanUtils.copyProperties(this,matdeliverFollowModel);
+        BeanUtils.copyProperties(this, matdeliverFollowModel);
+        matdeliverFollowModel.setMakeCreateDate(makeCreateDate);
+        matdeliverFollowModel.setMakeVisitDate(makeVisitDateStr);
+        matdeliverFollowModel.setVisitDate(visitDateStr);
+        matdeliverFollowModel.setVisitCreateDate(visitCreateDateStr);
+        matdeliverFollowModel.setNextVisitDate(nextVisitDateStr);
+        matdeliverFollowModel.setLeaveDate(leaveDateStr);
+        matdeliverFollowModel.setUpdateDate(updateDateStr);
+        matdeliverFollowModel.setDeliveryDate(deliveryDateStr);
+        if (StringUtils.isNotEmpty(guideSuggestMap)) {
+            matdeliverFollowModel.setGuideSuggest(guideSuggestMap);
+        }
+        if (StringUtils.isNotEmpty(bpMap)) {
+            matdeliverFollowModel.setBp(bpMap);
+        }
         return matdeliverFollowModel;
     }
 
+    public String getGuideSuggestMap() {
+        return guideSuggestMap;
+    }
+
+    public void setGuideSuggestMap(String guideSuggestMap) {
+        this.guideSuggestMap = guideSuggestMap;
+    }
+
     public Integer getBreast() {
         return breast;
     }
@@ -227,13 +251,6 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
         this.wound = wound;
     }
 
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
 
     public String getUpdateUser() {
         return updateUser;
@@ -259,13 +276,6 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
         this.hospitalId = hospitalId;
     }
 
-    public Date getDeliveryDate() {
-        return deliveryDate;
-    }
-
-    public void setDeliveryDate(Date deliveryDate) {
-        this.deliveryDate = deliveryDate;
-    }
 
     public String getDeliverId() {
         return deliverId;
@@ -323,6 +333,14 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
         this.makeCreateUser = makeCreateUser;
     }
 
+    public Date getDeliveryDateStr() {
+        return deliveryDateStr;
+    }
+
+    public void setDeliveryDateStr(Date deliveryDateStr) {
+        this.deliveryDateStr = deliveryDateStr;
+    }
+
     public Date getMakeCreateDate() {
         return makeCreateDate;
     }
@@ -339,12 +357,20 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
         this.contactReason = contactReason;
     }
 
-    public Date getMakeVisitDate() {
-        return makeVisitDate;
+    public String getBpMap() {
+        return bpMap;
+    }
+
+    public void setBpMap(String bpMap) {
+        this.bpMap = bpMap;
     }
 
-    public void setMakeVisitDate(Date makeVisitDate) {
-        this.makeVisitDate = makeVisitDate;
+    public Date getMakeVisitDateStr() {
+        return makeVisitDateStr;
+    }
+
+    public void setMakeVisitDateStr(Date makeVisitDateStr) {
+        this.makeVisitDateStr = makeVisitDateStr;
     }
 
     public Integer getVisitResult() {
@@ -371,12 +397,12 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
         this.visitAffirm = visitAffirm;
     }
 
-    public Date getVisitDate() {
-        return visitDate;
+    public Date getVisitDateStr() {
+        return visitDateStr;
     }
 
-    public void setVisitDate(Date visitDate) {
-        this.visitDate = visitDate;
+    public void setVisitDateStr(Date visitDateStr) {
+        this.visitDateStr = visitDateStr;
     }
 
     public String getVisitDoctor() {
@@ -411,20 +437,20 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
         this.visitCreateUser = visitCreateUser;
     }
 
-    public Date getVisitCreateDate() {
-        return visitCreateDate;
+    public Date getVisitCreateDateStr() {
+        return visitCreateDateStr;
     }
 
-    public void setVisitCreateDate(Date visitCreateDate) {
-        this.visitCreateDate = visitCreateDate;
+    public void setVisitCreateDateStr(Date visitCreateDateStr) {
+        this.visitCreateDateStr = visitCreateDateStr;
     }
 
-    public Date getNextVisitDate() {
-        return nextVisitDate;
+    public Date getNextVisitDateStr() {
+        return nextVisitDateStr;
     }
 
-    public void setNextVisitDate(Date nextVisitDate) {
-        this.nextVisitDate = nextVisitDate;
+    public void setNextVisitDateStr(Date nextVisitDateStr) {
+        this.nextVisitDateStr = nextVisitDateStr;
     }
 
     public Integer getIsClose() {
@@ -443,20 +469,12 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
         this.postFollowId = postFollowId;
     }
 
-    public Date getFmDate() {
-        return fmDate;
-    }
-
-    public void setFmDate(Date fmDate) {
-        this.fmDate = fmDate;
+    public Date getLeaveDateStr() {
+        return leaveDateStr;
     }
 
-    public Date getLeaveDate() {
-        return leaveDate;
-    }
-
-    public void setLeaveDate(Date leaveDate) {
-        this.leaveDate = leaveDate;
+    public void setLeaveDateStr(Date leaveDateStr) {
+        this.leaveDateStr = leaveDateStr;
     }
 
     public String getTemperature() {
@@ -483,20 +501,12 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
         this.mentalityDesc = mentalityDesc;
     }
 
-    public Integer getBpv() {
-        return bpv;
+    public String getBp() {
+        return bp;
     }
 
-    public void setBpv(Integer bpv) {
-        this.bpv = bpv;
-    }
-
-    public Integer getBpk() {
-        return bpk;
-    }
-
-    public void setBpk(Integer bpk) {
-        this.bpk = bpk;
+    public void setBp(String bp) {
+        this.bp = bp;
     }
 
     public String getMatrix() {
@@ -555,53 +565,11 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
         this.referHospital = referHospital;
     }
 
-    @Override
-    public String toString() {
-        return "MatDeliverFollowAddRequest{" +
-                "id='" + id + '\'' +
-                ", hospitalId='" + hospitalId + '\'' +
-                ", deliveryDate=" + deliveryDate +
-                ", deliverId='" + deliverId + '\'' +
-                ", parentid='" + parentid + '\'' +
-                ", pid='" + pid + '\'' +
-                ", contactResult=" + contactResult +
-                ", makeType=" + makeType +
-                ", makeRemark='" + makeRemark + '\'' +
-                ", makeCreateUser='" + makeCreateUser + '\'' +
-                ", makeCreateDate=" + makeCreateDate +
-                ", contactReason=" + contactReason +
-                ", makeVisitDate=" + makeVisitDate +
-                ", visitResult=" + visitResult +
-                ", visitReason=" + visitReason +
-                ", visitAffirm=" + visitAffirm +
-                ", visitDate=" + visitDate +
-                ", visitDoctor='" + visitDoctor + '\'' +
-                ", visitStatus=" + visitStatus +
-                ", visitRemark='" + visitRemark + '\'' +
-                ", visitCreateUser='" + visitCreateUser + '\'' +
-                ", visitCreateDate=" + visitCreateDate +
-                ", nextVisitDate=" + nextVisitDate +
-                ", isClose=" + isClose +
-                ", postFollowId='" + postFollowId + '\'' +
-                ", fmDate=" + fmDate +
-                ", leaveDate=" + leaveDate +
-                ", temperature='" + temperature + '\'' +
-                ", fitnessDesc='" + fitnessDesc + '\'' +
-                ", mentalityDesc='" + mentalityDesc + '\'' +
-                ", bpv=" + bpv +
-                ", bpk=" + bpk +
-                ", breast='" + breast + '\'' +
-                ", lochia='" + lochia + '\'' +
-                ", matrix='" + matrix + '\'' +
-                ", wound='" + wound + '\'' +
-                ", otherDesc='" + otherDesc + '\'' +
-                ", healthType=" + healthType +
-                ", guideSuggest='" + guideSuggest + '\'' +
-                ", isRefer=" + isRefer +
-                ", referReason='" + referReason + '\'' +
-                ", referHospital='" + referHospital + '\'' +
-                ", updateDate=" + updateDate +
-                ", updateUser='" + updateUser + '\'' +
-                '}';
+    public Date getUpdateDateStr() {
+        return updateDateStr;
+    }
+
+    public void setUpdateDateStr(Date updateDateStr) {
+        this.updateDateStr = updateDateStr;
     }
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowResult.java
index c4f9973..7591dc9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowResult.java
@@ -3,14 +3,21 @@ package com.lyms.platform.operate.web.result;
 import com.lyms.platform.common.enums.PostpartumFollowMakeEnums;
 import com.lyms.platform.common.utils.BeanUtils;
 import com.lyms.platform.common.utils.DateUtil;
+import com.lyms.platform.common.utils.JsonUtil;
+import com.lyms.platform.common.utils.StringUtils;
+import com.lyms.platform.operate.web.utils.UnitConstants;
+import com.lyms.platform.operate.web.utils.UnitUtils;
 import com.lyms.platform.pojo.MatdeliverFollowModel;
+import org.apache.commons.collections.MapUtils;
+
+import java.util.Map;
 
 /**
  * @auther yangfei
  * @createTime 2017年11月27日 10时57分
  * @discription
  */
-public class MatdeliverFollowResult extends MatdeliverFollowModel{
+public class MatdeliverFollowResult extends MatdeliverFollowModel {
 
     /**
      * 预约联系结果（1-成功、2-失败）
@@ -75,7 +82,7 @@ public class MatdeliverFollowResult extends MatdeliverFollowModel{
     /**
      * 分娩日期
      */
-    private String fmDateStr;
+    private String deliveryDateStr;
     /**
      * 出院日期
      */
@@ -93,6 +100,14 @@ public class MatdeliverFollowResult extends MatdeliverFollowModel{
      */
     private String woundStr;
     /**
+     * 血压信息
+     */
+    private String bpStr;
+    /**
+     * 血压MAP信息
+     */
+    private Map bpMap;
+    /**
      * 分类(1-未见异常、2-异常)
      */
     private String healthTypeStr;
@@ -101,10 +116,18 @@ public class MatdeliverFollowResult extends MatdeliverFollowModel{
      */
     private String guideSuggestStr;
     /**
+     * 指导意见Map
+     */
+    private Map guideSuggestMap;
+    /**
      * 是否转诊转诊（1-无、2-有）
      */
     private String isReferStr;
     /**
+     * 转诊机构名称
+     */
+    private String referHospitalStr;
+    /**
      * 修改时间
      */
     private String updateDateStr;
@@ -114,62 +137,236 @@ public class MatdeliverFollowResult extends MatdeliverFollowModel{
     private String updateUserStr;
 
     public MatdeliverFollowResult convertToResult(MatdeliverFollowModel matdeliverFollowModel) {
-        BeanUtils.copy(matdeliverFollowModel,this);
-        if(matdeliverFollowModel.getContactResult()!=null){
+        BeanUtils.copy(matdeliverFollowModel, this);
+        if (matdeliverFollowModel.getMakeCreateDate() != null) {
+            makeCreateDateStr = DateUtil.getyyyy_MM_dd(matdeliverFollowModel.getMakeCreateDate());
+        }
+
+        if (matdeliverFollowModel.getContactResult() != null) {
             contactResultStr = PostpartumFollowMakeEnums.ResultEnum.getTitle(matdeliverFollowModel.getContactResult());
         }
-        if(matdeliverFollowModel.getMakeType()!=null){
-            makeTypeStr  = PostpartumFollowMakeEnums.TypeEnum.getTitle(matdeliverFollowModel.getMakeType());
+        if (matdeliverFollowModel.getMakeType() != null) {
+            makeTypeStr = PostpartumFollowMakeEnums.TypeEnum.getTitle(matdeliverFollowModel.getMakeType());
+        }
+        if (matdeliverFollowModel.getMakeVisitDate() != null) {
+            makeVisitDateStr = DateUtil.getyyyy_MM_dd(matdeliverFollowModel.getMakeVisitDate());
         }
-        if(matdeliverFollowModel.getContactReason()!=null){
+        if (matdeliverFollowModel.getContactReason() != null) {
             contactReasonStr = PostpartumFollowMakeEnums.ReasonEnum.getTitle(matdeliverFollowModel.getContactReason());
         }
-        if(matdeliverFollowModel.getVisitResult()!=null){
+        if (matdeliverFollowModel.getVisitResult() != null) {
             visitResultStr = PostpartumFollowMakeEnums.ResultEnum.getTitle(matdeliverFollowModel.getVisitResult());
         }
-        if(matdeliverFollowModel.getVisitReason()!=null){
+        if (matdeliverFollowModel.getVisitReason() != null) {
             visitReasonStr = PostpartumFollowMakeEnums.ReasonEnum.getTitle(matdeliverFollowModel.getVisitReason());
         }
-        if(matdeliverFollowModel.getVisitStatus()!=null){
+        if (matdeliverFollowModel.getVisitStatus() != null) {
             visitStatusStr = PostpartumFollowMakeEnums.StatusEnum.getTitle(matdeliverFollowModel.getVisitStatus());
         }
-        if(matdeliverFollowModel.getVisitCreateDate()!=null){
+        if (matdeliverFollowModel.getVisitCreateDate() != null) {
             visitCreateDateStr = DateUtil.getyyyy_MM_dd(matdeliverFollowModel.getVisitCreateDate());
         }
-        if(matdeliverFollowModel.getNextVisitDate()!=null){
+        if (matdeliverFollowModel.getNextVisitDate() != null) {
             nextVisitDateStr = DateUtil.getyyyy_MM_dd(matdeliverFollowModel.getNextVisitDate());
         }
-        if(matdeliverFollowModel.getIsClose()!=null){
+        if (matdeliverFollowModel.getVisitDate() != null) {
+            visitDateStr = DateUtil.getyyyy_MM_dd(matdeliverFollowModel.getVisitDate());
+        }
+        if (matdeliverFollowModel.getIsClose() != null) {
             isCloseStr = PostpartumFollowMakeEnums.IsCloseEnum.getTitle(matdeliverFollowModel.getIsClose());
         }
-        if(matdeliverFollowModel.getFmDate()!=null){
-            fmDateStr = DateUtil.getyyyy_MM_dd(matdeliverFollowModel.getFmDate());
+        if (matdeliverFollowModel.getDeliveryDate() != null) {
+            deliveryDateStr = DateUtil.getyyyy_MM_dd(matdeliverFollowModel.getDeliveryDate());
         }
-        if(matdeliverFollowModel.getLeaveDate()!=null){
+        if (matdeliverFollowModel.getLeaveDate() != null) {
             leaveDateStr = DateUtil.getyyyy_MM_dd(matdeliverFollowModel.getLeaveDate());
         }
-        if(matdeliverFollowModel.getHealthType()!=null){
+        if (matdeliverFollowModel.getHealthType() != null) {
             healthTypeStr = PostpartumFollowMakeEnums.ErrorTypeEnum.getTitle(matdeliverFollowModel.getHealthType());
         }
-        if(matdeliverFollowModel.getBreast()!=null){
+        if (matdeliverFollowModel.getBreast() != null) {
             breastStr = PostpartumFollowMakeEnums.ErrorTypeEnum.getTitle(matdeliverFollowModel.getBreast());
         }
-        if(matdeliverFollowModel.getLochia()!=null){
+        if (matdeliverFollowModel.getLochia() != null) {
             lochiaStr = PostpartumFollowMakeEnums.ErrorTypeEnum.getTitle(matdeliverFollowModel.getLochia());
         }
-        if(matdeliverFollowModel.getWound()!=null){
+        if (matdeliverFollowModel.getWound() != null) {
             woundStr = PostpartumFollowMakeEnums.ErrorTypeEnum.getTitle(matdeliverFollowModel.getWound());
         }
-        if(matdeliverFollowModel.getIsRefer()!=null){//（1-无、2-有）
-            isReferStr = matdeliverFollowModel.getIsRefer() == 1?"无":"有";
+        if (matdeliverFollowModel.getIsRefer() != null) {//（1-无、2-有）
+            isReferStr = matdeliverFollowModel.getIsRefer() == 1 ? "无" : "有";
         }
-        if(matdeliverFollowModel.getUpdateDate()!=null){
+        if (matdeliverFollowModel.getUpdateDate() != null) {
             updateDateStr = DateUtil.getyyyy_MM_dd(matdeliverFollowModel.getUpdateDate());
         }
 
+        // 血压
+        String ssy = "";
+        String szy = "";
+        if (StringUtils.isNotEmpty(getBp())) {
+            bpMap = JsonUtil.getMap(getBp());
+            if (MapUtils.isNotEmpty(bpMap)) {
+                ssy = bpMap.get("ssy") + "";
+                szy = bpMap.get("szy") + "";
+            }
+            bpStr = UnitUtils.unitSplice(ssy + "/" + szy, UnitConstants.MMHG);
+        }
+        if (StringUtils.isNotEmpty(getGuideSuggest())) {
+            guideSuggestMap = JsonUtil.jkstr2Obj(getGuideSuggest(), Map.class);
+            if (MapUtils.isNotEmpty(guideSuggestMap)) {
+
+                StringBuffer guideSuggestSb = new StringBuffer();
+                //"{"grws":true,"xl":true,"yy":true,"mrwy":true}"
+                if (guideSuggestMap.containsKey("grws") && guideSuggestMap.get("grws") != null) {
+                    if ("true".equals(guideSuggestMap.get("grws").toString())) {
+                        guideSuggestSb.append("个人卫生，");
+                    }
+                }
+
+                if (guideSuggestMap.containsKey("xl") && guideSuggestMap.get("xl") != null) {
+                    if ("true".equals(guideSuggestMap.get("xl").toString())) {
+                        guideSuggestSb.append("心理，");
+                    }
+                }
+                if (guideSuggestMap.containsKey("yy") && guideSuggestMap.get("yy") != null) {
+                    if ("true".equals(guideSuggestMap.get("yy").toString())) {
+                        guideSuggestSb.append("营养，");
+                    }
+                }
+                if (guideSuggestMap.containsKey("mrwy") && guideSuggestMap.get("mrwy") != null) {
+                    if ("true".equals(guideSuggestMap.get("mrwy").toString())) {
+                        guideSuggestSb.append("母乳喂养，");
+                    }
+                }
+                if (guideSuggestMap.containsKey("ssehl") && guideSuggestMap.get("ssehl") != null) {
+                    if ("true".equals(guideSuggestMap.get("ssehl").toString())) {
+                        guideSuggestSb.append("新生儿护理及喂养，");
+                    }
+                }
+                if (guideSuggestMap.containsKey("qt") && guideSuggestMap.get("qt") != null) {
+                    if ("true".equals(guideSuggestMap.get("qt").toString())) {
+                        guideSuggestSb.append("其他：");
+                    }
+                    if (guideSuggestMap.get("qtText") != null) {
+                        guideSuggestSb.append(guideSuggestMap.get("qtText"));
+                    }
+                }
+
+                if (guideSuggestSb.toString().endsWith("，")) {
+                    guideSuggestStr = guideSuggestSb.substring(0, guideSuggestSb.length() - 1);
+                } else {
+                    guideSuggestStr = guideSuggestSb.toString();
+                }
+            }
+        }
         return this;
     }
 
+    public String getReferHospitalStr() {
+        return referHospitalStr;
+    }
+
+    public void setReferHospitalStr(String referHospitalStr) {
+        this.referHospitalStr = referHospitalStr;
+    }
+
+    public Map getGuideSuggestMap() {
+        return guideSuggestMap;
+    }
+
+    public void setGuideSuggestMap(Map guideSuggestMap) {
+        this.guideSuggestMap = guideSuggestMap;
+    }
+
+    public String getBpStr() {
+        return bpStr;
+    }
+
+    public void setBpStr(String bpStr) {
+        this.bpStr = bpStr;
+    }
+
+    public String getDeliveryDateStr() {
+        return deliveryDateStr;
+    }
+
+    public void setDeliveryDateStr(String deliveryDateStr) {
+        this.deliveryDateStr = deliveryDateStr;
+    }
+
+    public String getMakeVisitDateStr() {
+        return makeVisitDateStr;
+    }
+
+    public Map getBpMap() {
+        return bpMap;
+    }
+
+    public void setBpMap(Map bpMap) {
+        this.bpMap = bpMap;
+    }
+
+    public void setMakeVisitDateStr(String makeVisitDateStr) {
+        this.makeVisitDateStr = makeVisitDateStr;
+    }
+
+    public String getMakeCreateUserStr() {
+        return makeCreateUserStr;
+    }
+
+    public void setMakeCreateUserStr(String makeCreateUserStr) {
+        this.makeCreateUserStr = makeCreateUserStr;
+    }
+
+    public String getMakeCreateDateStr() {
+        return makeCreateDateStr;
+    }
+
+    public void setMakeCreateDateStr(String makeCreateDateStr) {
+        this.makeCreateDateStr = makeCreateDateStr;
+    }
+
+    public String getVisitDateStr() {
+        return visitDateStr;
+    }
+
+    public void setVisitDateStr(String visitDateStr) {
+        this.visitDateStr = visitDateStr;
+    }
+
+
+    public String getBreastStr() {
+        return breastStr;
+    }
+
+    public void setBreastStr(String breastStr) {
+        this.breastStr = breastStr;
+    }
+
+    public String getLochiaStr() {
+        return lochiaStr;
+    }
+
+    public void setLochiaStr(String lochiaStr) {
+        this.lochiaStr = lochiaStr;
+    }
+
+    public String getWoundStr() {
+        return woundStr;
+    }
+
+    public void setWoundStr(String woundStr) {
+        this.woundStr = woundStr;
+    }
+
+    public String getGuideSuggestStr() {
+        return guideSuggestStr;
+    }
+
+    public void setGuideSuggestStr(String guideSuggestStr) {
+        this.guideSuggestStr = guideSuggestStr;
+    }
+
     public String getVisitCreateUserStr() {
         return visitCreateUserStr;
     }
@@ -258,14 +455,6 @@ public class MatdeliverFollowResult extends MatdeliverFollowModel{
         this.isCloseStr = isCloseStr;
     }
 
-    public String getFmDateStr() {
-        return fmDateStr;
-    }
-
-    public void setFmDateStr(String fmDateStr) {
-        this.fmDateStr = fmDateStr;
-    }
-
     public String getLeaveDateStr() {
         return leaveDateStr;
     }
@@ -318,7 +507,6 @@ public class MatdeliverFollowResult extends MatdeliverFollowModel{
                 ", visitCreateDateStr='" + visitCreateDateStr + '\'' +
                 ", nextVisitDateStr='" + nextVisitDateStr + '\'' +
                 ", isCloseStr='" + isCloseStr + '\'' +
-                ", fmDateStr='" + fmDateStr + '\'' +
                 ", leaveDateStr='" + leaveDateStr + '\'' +
                 ", healthTypeStr='" + healthTypeStr + '\'' +
                 ", isReferStr='" + isReferStr + '\'' +
-- 
1.8.3.1