From 55109c306fb7d368f8b754daca72c02178eaade5 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Thu, 28 Oct 2021 16:19:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2-=E9=9A=86=E5=8C=96-=E6=97=A9?=
 =?UTF-8?q?=E5=AD=95=E9=9A=8F=E8=AE=BF=E8=AE=B0=E5=BD=95=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LhBabyPregnancyFollowTabController.java        |  18 +-
 .../web/facade/LhBabyPregnancyFollowTabFacade.java |  95 +++-
 .../web/result/LhBabyPregnancyFollowTabResult.java | 588 +++++++++++++++++++++
 3 files changed, 689 insertions(+), 12 deletions(-)
 create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/LhBabyPregnancyFollowTabResult.java

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyPregnancyFollowTabController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyPregnancyFollowTabController.java
index ca01f04..8292f2a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyPregnancyFollowTabController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyPregnancyFollowTabController.java
@@ -27,7 +27,15 @@ public class LhBabyPregnancyFollowTabController extends BaseController {
     @Autowired
     private LhBabyPregnancyFollowTabFacade lhBabyPregnancyFollowTabFacade;
 
-    //查询-隆化-早孕随访记录表
+    //查询-隆化-早孕随访记录表-编辑页面读取数据
+    @RequestMapping(method = RequestMethod.GET, value = "/queryUpdateLhBabyPregnancyFollowTab")
+    @ResponseBody
+    @TokenRequired
+    public BaseResponse queryUpdateLhBabyPregnancyFollowTab(LhBabyPregnancyFollowTabQuery lhBabyPregnancyFollowTabQuery, HttpServletRequest request) {
+
+        return lhBabyPregnancyFollowTabFacade.queryUpdateLhBabyPregnancyFollowTab(lhBabyPregnancyFollowTabQuery);
+    }
+    //查询-隆化-早孕随访记录表-查看页面解析
     @RequestMapping(method = RequestMethod.GET, value = "/queryLhBabyPregnancyFollowTab")
     @ResponseBody
     @TokenRequired
@@ -35,6 +43,14 @@ public class LhBabyPregnancyFollowTabController extends BaseController {
 
         return lhBabyPregnancyFollowTabFacade.queryLhBabyPregnancyFollowTab(lhBabyPregnancyFollowTabQuery);
     }
+    //查询-隆化-早孕随访记录表-多胎列表
+    @RequestMapping(method = RequestMethod.GET, value = "/queryLhBabyPregnancyFollowTabList")
+    @ResponseBody
+    @TokenRequired
+    public BaseResponse queryLhBabyPregnancyFollowTabList(LhBabyPregnancyFollowTabQuery lhBabyPregnancyFollowTabQuery, HttpServletRequest request) {
+
+        return lhBabyPregnancyFollowTabFacade.queryLhBabyPregnancyFollowTabList(lhBabyPregnancyFollowTabQuery);
+    }
 
     //增加/修改-隆化-早孕随访记录表
     @RequestMapping(method = RequestMethod.POST, value = "/addOrUpdateLhBabyPregnancyFollowTab")
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyPregnancyFollowTabFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyPregnancyFollowTabFacade.java
index 554d503..d8ef08e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyPregnancyFollowTabFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyPregnancyFollowTabFacade.java
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.facade;
 
+import com.lyms.platform.biz.service.BasicConfigService;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.dao.BaseMongoDAOImpl;
 import com.lyms.platform.common.dao.operator.MongoCondition;
@@ -8,14 +9,28 @@ import com.lyms.platform.common.dao.operator.MongoQuery;
 import com.lyms.platform.common.enums.OptActionEnums;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.result.BaseObjectResponse;
+import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.StringUtils;
+import com.lyms.platform.operate.web.result.LhBabyGravidityEndingTabResult;
+import com.lyms.platform.operate.web.result.LhBabyPregnancyFollowTabResult;
+import com.lyms.platform.operate.web.utils.CollectionUtils;
 import com.lyms.platform.pojo.LhBabyGravidityEndingTabModel;
 import com.lyms.platform.pojo.LhBabyPregnancyFollowTabModel;
+import com.lyms.platform.pojo.PreEugenicsBaseModel;
 import com.lyms.platform.query.LhBabyGravidityEndingTabQuery;
 import com.lyms.platform.query.LhBabyPregnancyFollowTabQuery;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @Component
 public class LhBabyPregnancyFollowTabFacade extends BaseMongoDAOImpl<LhBabyPregnancyFollowTabModel> {
 
@@ -23,18 +38,66 @@ public class LhBabyPregnancyFollowTabFacade extends BaseMongoDAOImpl<LhBabyPregn
     private OperateLogFacade operateLogFacade;
     @Autowired
     private AutoMatchFacade autoMatchFacade;
+    @Autowired
+    private BasicConfigService basicConfigService;
 
     /**
-     * 查询-隆化-早孕随访记录表
+     * 查询-隆化-早孕随访记录表-编辑页面读取数据
+     * @param lhBabyPregnancyFollowTabQuery
+     * @return
+     */
+    public BaseObjectResponse queryUpdateLhBabyPregnancyFollowTab(LhBabyPregnancyFollowTabQuery lhBabyPregnancyFollowTabQuery) {
+        BaseObjectResponse br = new BaseObjectResponse();
+        lhBabyPregnancyFollowTabQuery.setYn(YnEnums.YES.getId());//查询有效数据（删除状态）
+        MongoQuery query = lhBabyPregnancyFollowTabQuery.convertToQuery();
+        LhBabyPregnancyFollowTabModel model=findOne(query.convertToMongoQuery());
+        br.setData(model);
+        br.setErrorcode(ErrorCodeConstants.SUCCESS);
+        br.setErrormsg("成功");
+        return br;
+    }
+    /**
+     * 查询-隆化-早孕随访记录表-查看页面解析
      * @param lhBabyPregnancyFollowTabQuery
      * @return
      */
     public BaseObjectResponse queryLhBabyPregnancyFollowTab(LhBabyPregnancyFollowTabQuery lhBabyPregnancyFollowTabQuery) {
+        BaseObjectResponse br = new BaseObjectResponse();
         lhBabyPregnancyFollowTabQuery.setYn(YnEnums.YES.getId());//查询有效数据（删除状态）
         MongoQuery query = lhBabyPregnancyFollowTabQuery.convertToQuery();
-        LhBabyPregnancyFollowTabModel lhBabyPregnancyFollowTabModel=findOne(query.convertToMongoQuery());
+        LhBabyPregnancyFollowTabModel model=findOne(query.convertToMongoQuery());
+        //整理返回数据
+        LhBabyPregnancyFollowTabResult result=null;
+        if (null!=model){
+            result=new LhBabyPregnancyFollowTabResult().convertToResult(model,
+                    basicConfigService);
+        }
+        br.setData(result);
+        br.setErrorcode(ErrorCodeConstants.SUCCESS);
+        br.setErrormsg("成功");
+        return br;
+    }
+
+    /**
+     * 查询-隆化-早孕随访记录表-多胎列表
+     * @param lhBabyPregnancyFollowTabQuery
+     * @return
+     */
+    public BaseObjectResponse queryLhBabyPregnancyFollowTabList(LhBabyPregnancyFollowTabQuery lhBabyPregnancyFollowTabQuery) {
         BaseObjectResponse br = new BaseObjectResponse();
-        br.setData(lhBabyPregnancyFollowTabModel);
+        lhBabyPregnancyFollowTabQuery.setYn(YnEnums.YES.getId());//查询有效数据（删除状态）
+        MongoQuery query = lhBabyPregnancyFollowTabQuery.convertToQuery();
+        query.addOrder(Sort.Direction.DESC,"writeDate");
+        List<LhBabyPregnancyFollowTabModel> modelList=find(query.convertToMongoQuery());
+        //整理返回数据
+        List<LhBabyPregnancyFollowTabResult> resultList=new ArrayList<>();
+        if(CollectionUtils.isNotEmpty(modelList)){
+            LhBabyPregnancyFollowTabResult result=new LhBabyPregnancyFollowTabResult();
+            for (LhBabyPregnancyFollowTabModel model : modelList) {
+                resultList.add(result.convertToResult(model,basicConfigService));
+            }
+        }
+        br.setData(resultList);
         br.setErrorcode(ErrorCodeConstants.SUCCESS);
         br.setErrormsg("成功");
         return br;
@@ -46,7 +109,7 @@ public class LhBabyPregnancyFollowTabFacade extends BaseMongoDAOImpl<LhBabyPregn
      * @return
      */
     public BaseObjectResponse addOrUpdateLhBabyPregnancyFollowTab(LhBabyPregnancyFollowTabModel lhBabyPregnancyFollowTabModel) {
-
+        BaseObjectResponse br = new BaseObjectResponse();
         //修改
         if(StringUtils.isNotEmpty(lhBabyPregnancyFollowTabModel.getId())){
             update(new MongoQuery(new MongoCondition("id", lhBabyPregnancyFollowTabModel.getId(), MongoOper.IS)).convertToMongoQuery(),lhBabyPregnancyFollowTabModel);
@@ -55,7 +118,18 @@ public class LhBabyPregnancyFollowTabFacade extends BaseMongoDAOImpl<LhBabyPregn
             lhBabyPregnancyFollowTabModel.setYn(YnEnums.YES.getId());//设置增加数据为有效数据（删除状态）
             save(lhBabyPregnancyFollowTabModel);
         }
-        BaseObjectResponse br = new BaseObjectResponse();
+        //同步到孕前优生信息 实体类（便于检查信息页面获取）
+        if(null==lhBabyPregnancyFollowTabModel.getWriteDate()||StringUtils.isEmpty(lhBabyPregnancyFollowTabModel.getId())||StringUtils.isEmpty(lhBabyPregnancyFollowTabModel.getBuildId())){
+            return br.setErrormsg("同步参数缺失").setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
+        }
+        Map<String, Object> map= new HashMap<>();
+        map.put("id", lhBabyPregnancyFollowTabModel.getId());
+        map.put("writeDate", DateUtil.getyyyy_MM_dd(lhBabyPregnancyFollowTabModel.getWriteDate()));
+        Query query = Query.query(Criteria.where("id").is(lhBabyPregnancyFollowTabModel.getBuildId()));
+        Update update = new Update();
+        update.set("lhBabyPregnancyFollowTab", map);
+        mongoTemplate.updateFirst(query, update, PreEugenicsBaseModel.class);
+
         br.setErrorcode(ErrorCodeConstants.SUCCESS);
         br.setErrormsg("成功");
         return br;
@@ -69,14 +143,13 @@ public class LhBabyPregnancyFollowTabFacade extends BaseMongoDAOImpl<LhBabyPregn
     public void delLhBabyPregnancyFollowTab(String id,Integer userId) {
         String hospitalId = autoMatchFacade.getHospitalId(userId);
         //查询出要删除的数据操作日志用
-        LhBabyPregnancyFollowTabModel lhBabyPregnancyFollowTabModel= findById(id);
+        LhBabyPregnancyFollowTabModel delModel= findById(id);
         //删除
-        LhBabyPregnancyFollowTabModel babyPregnancyFollowTabModel= new LhBabyPregnancyFollowTabModel();
-        babyPregnancyFollowTabModel.setYn(YnEnums.NO.getId());//设置为无效数据（删除状态）
-        update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), babyPregnancyFollowTabModel);
+        LhBabyPregnancyFollowTabModel model= new LhBabyPregnancyFollowTabModel();
+        model.setYn(YnEnums.NO.getId());//设置为无效数据（删除状态）
+        update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), model);
         //存入操作日志
-        operateLogFacade.addDeleteOptLog(userId, Integer.valueOf(hospitalId), lhBabyPregnancyFollowTabModel, OptActionEnums.DELETE.getId(), "删除出生缺陷儿登记表");
+        operateLogFacade.addDeleteOptLog(userId, Integer.valueOf(hospitalId), delModel, OptActionEnums.DELETE.getId(), "删除早孕随访记录表");
     }
 
-
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/LhBabyPregnancyFollowTabResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/LhBabyPregnancyFollowTabResult.java
new file mode 100644
index 0000000..6f3e992
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/LhBabyPregnancyFollowTabResult.java
@@ -0,0 +1,588 @@
+package com.lyms.platform.operate.web.result;
+
+import com.lyms.platform.biz.service.BasicConfigService;
+import com.lyms.platform.common.base.IBasicResultConvert;
+import com.lyms.platform.common.enums.*;
+import com.lyms.platform.common.utils.StringUtils;
+import com.lyms.platform.operate.web.utils.CommonsHelper;
+import com.lyms.platform.permission.service.OrganizationService;
+import com.lyms.platform.permission.service.UsersService;
+import com.lyms.platform.pojo.LhBabyGravidityEndingTabModel;
+import com.lyms.platform.pojo.LhBabyPregnancyFollowTabModel;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Date;
+
+public class LhBabyPregnancyFollowTabResult {
+
+    private String id;
+    //是否删除（YnEnums）
+    private Integer yn;
+    //编号
+    private String code;
+    //建档id
+    private String buildId;
+
+    //姓名
+    private String name;
+    //年龄
+    private String age;
+    //联系电话
+    private String phone;
+    /**
+     * 家庭住址
+     */
+    //省
+    private String provinceId;
+    //市
+    private String cityId;
+    //区、县
+    private String areaId;
+    //街道
+    private String streetId;
+    //详细地址
+    private String address;
+    /**
+     * 随访机构
+     */
+    //省
+    private String sProvinceId;
+    //市
+    private String sCityId;
+    //区、县
+    private String sAreaId;
+    //街道
+    private String sStreetId;
+    //详细地址
+    private String sAddress;
+
+    //末次月经时间
+    private Date lastMenses;
+    //末次月经日期是否准确(YnEnums2)
+    private String lastMensesYn;
+
+    //服用叶酸及开始时间（LhBeginFolicEnum）
+    private String beginFolic;
+    //服用方法（LhFolicWayEnum）
+    private String folicWay;
+
+    //是否进食肉、蛋类（YnEnums2）
+    private String meatEggYn;
+    //是否厌食蔬菜（YnEnums2）
+    private String asitiaVegetableYn;
+    //丈夫有吸烟习惯，是否戒烟（LhQuitSmokingYnEnum）
+    private String hubbyQuitSmoking;
+    //妇女本人有吸烟习惯，是否戒烟（LhQuitSmokingYnEnum）
+    private String selfQuitSmoking;
+    //妇女本人有饮酒习惯，是否戒酒（LhAbstinenceYnEnum）
+    private String selfAbstinence;
+    //停经后是否接触下列有害因素（YnEnums2）
+    private String harmfulFactorYn;
+    //有害因素（LhHarmfulFactorEnum）
+    private String harmfulFactor;
+    //有害因素-其他
+    private String harmfulFactorOther;
+    //停经后是否有下列症状或疾病（YnEnums2）
+    private String diseaseSymptomsYn;
+    //症状或疾病（LhDiseaseSymptomsEnum）
+    private String diseaseSymptoms;
+    //症状或疾病-其他
+    private String diseaseSymptomsOther;
+    //停经后是否用过药物（YnEnums2）
+    private String takingDrugsYn;
+    //停经后是否用过药物-注明药物名称
+    private String DrugsName;
+
+    /**
+     * 确诊早孕机构
+     */
+    //确诊早孕机构（LhDiagnosisGroupEnum）
+    private String diagnosisGroup;
+    //转录其他机构确诊结果（LhDiagnosisGroupTransferEnum）
+    private String diagnosisGroupTransfer;
+    //转录其他机构确诊结果-其他机构
+    private String diagnosisGroupTransferOther;
+    //机构-其他情况
+    private String diagnosisGroupOther;
+
+    //尿妊娠实验结果（LhPissGravidityEnum）
+    private String PissGravidity;
+    //B超检查结果（LhBChaoEnum）
+    private String bChao;
+    //B超检查结果-不确定及其他
+    private String bChaoOther;
+    //对孕前优生健康检查的评价（LhCheckCommentEnum）
+    private String CheckComment;
+
+    //填表日期
+    private Date writeDate;
+    //随访者签名
+    private String visitSign;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getYn() {
+        return yn;
+    }
+
+    public void setYn(Integer yn) {
+        this.yn = yn;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getBuildId() {
+        return buildId;
+    }
+
+    public void setBuildId(String buildId) {
+        this.buildId = buildId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getProvinceId() {
+        return provinceId;
+    }
+
+    public void setProvinceId(String provinceId) {
+        this.provinceId = provinceId;
+    }
+
+    public String getCityId() {
+        return cityId;
+    }
+
+    public void setCityId(String cityId) {
+        this.cityId = cityId;
+    }
+
+    public String getAreaId() {
+        return areaId;
+    }
+
+    public void setAreaId(String areaId) {
+        this.areaId = areaId;
+    }
+
+    public String getStreetId() {
+        return streetId;
+    }
+
+    public void setStreetId(String streetId) {
+        this.streetId = streetId;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getsProvinceId() {
+        return sProvinceId;
+    }
+
+    public void setsProvinceId(String sProvinceId) {
+        this.sProvinceId = sProvinceId;
+    }
+
+    public String getsCityId() {
+        return sCityId;
+    }
+
+    public void setsCityId(String sCityId) {
+        this.sCityId = sCityId;
+    }
+
+    public String getsAreaId() {
+        return sAreaId;
+    }
+
+    public void setsAreaId(String sAreaId) {
+        this.sAreaId = sAreaId;
+    }
+
+    public String getsStreetId() {
+        return sStreetId;
+    }
+
+    public void setsStreetId(String sStreetId) {
+        this.sStreetId = sStreetId;
+    }
+
+    public String getsAddress() {
+        return sAddress;
+    }
+
+    public void setsAddress(String sAddress) {
+        this.sAddress = sAddress;
+    }
+
+    public Date getLastMenses() {
+        return lastMenses;
+    }
+
+    public void setLastMenses(Date lastMenses) {
+        this.lastMenses = lastMenses;
+    }
+
+    public String getLastMensesYn() {
+        return lastMensesYn;
+    }
+
+    public void setLastMensesYn(String lastMensesYn) {
+        this.lastMensesYn = lastMensesYn;
+    }
+
+    public String getBeginFolic() {
+        return beginFolic;
+    }
+
+    public void setBeginFolic(String beginFolic) {
+        this.beginFolic = beginFolic;
+    }
+
+    public String getFolicWay() {
+        return folicWay;
+    }
+
+    public void setFolicWay(String folicWay) {
+        this.folicWay = folicWay;
+    }
+
+    public String getMeatEggYn() {
+        return meatEggYn;
+    }
+
+    public void setMeatEggYn(String meatEggYn) {
+        this.meatEggYn = meatEggYn;
+    }
+
+    public String getAsitiaVegetableYn() {
+        return asitiaVegetableYn;
+    }
+
+    public void setAsitiaVegetableYn(String asitiaVegetableYn) {
+        this.asitiaVegetableYn = asitiaVegetableYn;
+    }
+
+    public String getHubbyQuitSmoking() {
+        return hubbyQuitSmoking;
+    }
+
+    public void setHubbyQuitSmoking(String hubbyQuitSmoking) {
+        this.hubbyQuitSmoking = hubbyQuitSmoking;
+    }
+
+    public String getSelfQuitSmoking() {
+        return selfQuitSmoking;
+    }
+
+    public void setSelfQuitSmoking(String selfQuitSmoking) {
+        this.selfQuitSmoking = selfQuitSmoking;
+    }
+
+    public String getSelfAbstinence() {
+        return selfAbstinence;
+    }
+
+    public void setSelfAbstinence(String selfAbstinence) {
+        this.selfAbstinence = selfAbstinence;
+    }
+
+    public String getHarmfulFactorYn() {
+        return harmfulFactorYn;
+    }
+
+    public void setHarmfulFactorYn(String harmfulFactorYn) {
+        this.harmfulFactorYn = harmfulFactorYn;
+    }
+
+    public String getHarmfulFactor() {
+        return harmfulFactor;
+    }
+
+    public void setHarmfulFactor(String harmfulFactor) {
+        this.harmfulFactor = harmfulFactor;
+    }
+
+    public String getHarmfulFactorOther() {
+        return harmfulFactorOther;
+    }
+
+    public void setHarmfulFactorOther(String harmfulFactorOther) {
+        this.harmfulFactorOther = harmfulFactorOther;
+    }
+
+    public String getDiseaseSymptomsYn() {
+        return diseaseSymptomsYn;
+    }
+
+    public void setDiseaseSymptomsYn(String diseaseSymptomsYn) {
+        this.diseaseSymptomsYn = diseaseSymptomsYn;
+    }
+
+    public String getDiseaseSymptoms() {
+        return diseaseSymptoms;
+    }
+
+    public void setDiseaseSymptoms(String diseaseSymptoms) {
+        this.diseaseSymptoms = diseaseSymptoms;
+    }
+
+    public String getDiseaseSymptomsOther() {
+        return diseaseSymptomsOther;
+    }
+
+    public void setDiseaseSymptomsOther(String diseaseSymptomsOther) {
+        this.diseaseSymptomsOther = diseaseSymptomsOther;
+    }
+
+    public String getTakingDrugsYn() {
+        return takingDrugsYn;
+    }
+
+    public void setTakingDrugsYn(String takingDrugsYn) {
+        this.takingDrugsYn = takingDrugsYn;
+    }
+
+    public String getDrugsName() {
+        return DrugsName;
+    }
+
+    public void setDrugsName(String drugsName) {
+        DrugsName = drugsName;
+    }
+
+    public String getDiagnosisGroup() {
+        return diagnosisGroup;
+    }
+
+    public void setDiagnosisGroup(String diagnosisGroup) {
+        this.diagnosisGroup = diagnosisGroup;
+    }
+
+    public String getDiagnosisGroupTransfer() {
+        return diagnosisGroupTransfer;
+    }
+
+    public void setDiagnosisGroupTransfer(String diagnosisGroupTransfer) {
+        this.diagnosisGroupTransfer = diagnosisGroupTransfer;
+    }
+
+    public String getDiagnosisGroupTransferOther() {
+        return diagnosisGroupTransferOther;
+    }
+
+    public void setDiagnosisGroupTransferOther(String diagnosisGroupTransferOther) {
+        this.diagnosisGroupTransferOther = diagnosisGroupTransferOther;
+    }
+
+    public String getDiagnosisGroupOther() {
+        return diagnosisGroupOther;
+    }
+
+    public void setDiagnosisGroupOther(String diagnosisGroupOther) {
+        this.diagnosisGroupOther = diagnosisGroupOther;
+    }
+
+    public String getPissGravidity() {
+        return PissGravidity;
+    }
+
+    public void setPissGravidity(String pissGravidity) {
+        PissGravidity = pissGravidity;
+    }
+
+    public String getbChao() {
+        return bChao;
+    }
+
+    public void setbChao(String bChao) {
+        this.bChao = bChao;
+    }
+
+    public String getbChaoOther() {
+        return bChaoOther;
+    }
+
+    public void setbChaoOther(String bChaoOther) {
+        this.bChaoOther = bChaoOther;
+    }
+
+    public String getCheckComment() {
+        return CheckComment;
+    }
+
+    public void setCheckComment(String checkComment) {
+        CheckComment = checkComment;
+    }
+
+    public Date getWriteDate() {
+        return writeDate;
+    }
+
+    public void setWriteDate(Date writeDate) {
+        this.writeDate = writeDate;
+    }
+
+    public String getVisitSign() {
+        return visitSign;
+    }
+
+    public void setVisitSign(String visitSign) {
+        this.visitSign = visitSign;
+    }
+
+
+    public LhBabyPregnancyFollowTabResult convertToResult(LhBabyPregnancyFollowTabModel model,
+                                                          BasicConfigService basicConfigService) {
+
+        try {
+            setId(model.getId());
+            //建档id
+            setBuildId(model.getBuildId());
+            //编号
+            setCode(model.getCode());
+            //是否删除
+            setYn(model.getYn());
+
+            //姓名
+            setName(model.getName());
+            //年龄
+            setAge(model.getAge());
+            //联系电话
+            setPhone(model.getPhone());
+            /**
+             * 家庭住址
+             */
+            //详细地址
+            setAddress(CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(),
+                    model.getAreaId(), model.getStreetId(),model.getAddress(), basicConfigService));
+            /**
+             * 随访机构
+             */
+            //随访详细地址
+            setsAddress(CommonsHelper.getResidence(model.getsProvinceId(), model.getsCityId(),
+                    model.getsAreaId(), model.getsStreetId(),model.getsAddress(), basicConfigService));
+
+
+            //末次月经时间
+            setLastMenses(model.getLastMenses());
+            //末次月经日期是否准确(YnEnums2)
+            setLastMensesYn(YnEnums2.getName(model.getLastMensesYn()));
+
+            //服用叶酸及开始时间（LhBeginFolicEnum）
+            setBeginFolic(LhBeginFolicEnum.getName(model.getBeginFolic()));
+            //服用方法（LhFolicWayEnum）
+            setFolicWay(LhFolicWayEnum.getName(model.getFolicWay()));
+
+            //是否进食肉、蛋类（YnEnums2）
+            setMeatEggYn(YnEnums2.getName(model.getMeatEggYn()));
+            //是否厌食蔬菜（YnEnums2）
+            setAsitiaVegetableYn(YnEnums2.getName(model.getAsitiaVegetableYn()));
+            //丈夫有吸烟习惯，是否戒烟（LhQuitSmokingYnEnum）
+            setHubbyQuitSmoking(LhQuitSmokingYnEnum.getName(model.getHubbyQuitSmoking()));
+            //妇女本人有吸烟习惯，是否戒烟（LhQuitSmokingYnEnum）
+            setSelfQuitSmoking(LhQuitSmokingYnEnum.getName(model.getSelfQuitSmoking()));
+            //妇女本人有饮酒习惯，是否戒酒（LhAbstinenceYnEnum）
+            setSelfAbstinence(LhAbstinenceYnEnum.getName(model.getSelfAbstinence()));
+            //停经后是否接触下列有害因素（YnEnums2）
+            setHarmfulFactorYn(YnEnums2.getName(model.getHarmfulFactorYn()));
+            //有害因素（LhHarmfulFactorEnum）
+            StringBuilder harmfulFactor=new StringBuilder();
+            for (Object o : StringUtils.covertToList(model.getHarmfulFactor(), null)) {
+                harmfulFactor.append(LhHarmfulFactorEnum.getName(o.toString())+",");
+            }
+            setHarmfulFactor(StringUtils.isNotEmpty(harmfulFactor.toString())?harmfulFactor.toString():null);
+            //有害因素-其他
+            setHarmfulFactorOther(model.getHarmfulFactorOther());
+            //停经后是否有下列症状或疾病（YnEnums2）
+            setDiseaseSymptomsYn(YnEnums2.getName(model.getDiseaseSymptomsYn()));
+            //症状或疾病（LhDiseaseSymptomsEnum）
+            StringBuilder diseaseSymptoms=new StringBuilder();
+            for (Object o : StringUtils.covertToList(model.getDiseaseSymptoms(), null)) {
+                diseaseSymptoms.append(LhDiseaseSymptomsEnum.getName(o.toString())+",");
+            }
+            setDiseaseSymptoms(StringUtils.isNotEmpty(diseaseSymptoms.toString())?diseaseSymptoms.toString():null);
+            //症状或疾病-其他
+            setDiseaseSymptomsOther(model.getDiseaseSymptomsOther());
+            //停经后是否用过药物（YnEnums2）
+            setTakingDrugsYn(YnEnums2.getName(model.getTakingDrugsYn()));
+            //停经后是否用过药物-注明药物名称
+            setDrugsName(model.getDrugsName());
+
+            /**
+             * 确诊早孕机构
+             */
+            //确诊早孕机构（LhDiagnosisGroupEnum）
+            setDiagnosisGroup(LhDiagnosisGroupEnum.getName(model.getDiagnosisGroup()));
+            //转录其他机构确诊结果（LhDiagnosisGroupTransferEnum）
+            StringBuilder diagnosisGroupTransfer=new StringBuilder();
+            for (Object o : StringUtils.covertToList(model.getDiagnosisGroupTransfer(), null)) {
+                diagnosisGroupTransfer.append(LhDiagnosisGroupTransferEnum.getName(o.toString())+",");
+            }
+            setDiagnosisGroupTransfer(StringUtils.isNotEmpty(diagnosisGroupTransfer.toString())?diagnosisGroupTransfer.toString():null);
+            //转录其他机构确诊结果-其他机构
+            setDiagnosisGroupTransferOther(model.getDiagnosisGroupTransferOther());
+            //机构-其他情况
+            setDiagnosisGroupOther(model.getDiagnosisGroupOther());
+
+            //尿妊娠实验结果（LhPissGravidityEnum）
+            setPissGravidity(LhPissGravidityEnum.getName(model.getPissGravidity()));
+            //B超检查结果（LhBChaoEnum）
+            setbChao(LhBChaoEnum.getName(model.getbChao()));
+            //B超检查结果-不确定及其他
+            setbChaoOther(model.getbChaoOther());
+            //对孕前优生健康检查的评价（LhCheckCommentEnum）
+            setCheckComment(LhCheckCommentEnum.getName(model.getCheckComment()));
+
+            //填表日期
+            setWriteDate(model.getWriteDate());
+            //随访者签名
+            setVisitSign(model.getVisitSign());
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return this;
+    }
+
+}
-- 
1.8.3.1