From f95ac1461c0e3ac56b2726a3b8ff2f246dc184a8 Mon Sep 17 00:00:00 2001
From: shiyang <shiyang@lymsh.com>
Date: Mon, 25 Oct 2021 10:57:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=86=E5=8C=96-=E5=A6=8A=E5=A8=A0=E7=BB=93?=
 =?UTF-8?q?=E5=B1=80=E8=AE=B0=E5=BD=95=E8=A1=A8-=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LhBabyGravidityEndingTabController.java        |  10 +-
 .../web/facade/LhBabyBirthDefectTabFacade.java     |   6 +-
 .../web/facade/LhBabyGravidityEndingTabFacade.java |  24 +-
 .../web/result/LhBabyGravidityEndingTabResult.java | 271 ++++-----------------
 4 files changed, 87 insertions(+), 224 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyGravidityEndingTabController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyGravidityEndingTabController.java
index 52835eb..4a0a9b9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyGravidityEndingTabController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyGravidityEndingTabController.java
@@ -27,7 +27,15 @@ public class LhBabyGravidityEndingTabController extends BaseController {
     @Autowired
     private LhBabyGravidityEndingTabFacade lhBabyGravidityEndingTabFacade;
 
-    //查询-隆化-妊娠结局记录表
+    //查询-隆化-妊娠结局记录表-编辑页面读取数据
+    @RequestMapping(method = RequestMethod.GET, value = "/queryLhBabyGravidityEndingTab")
+    @ResponseBody
+    @TokenRequired
+    public BaseResponse queryUpdateLhBabyGravidityEndingTab(LhBabyGravidityEndingTabQuery lhBabyGravidityEndingTabQuery, HttpServletRequest request) {
+
+        return lhBabyGravidityEndingTabFacade.queryUpdateLhBabyGravidityEndingTab(lhBabyGravidityEndingTabQuery);
+    }
+    //查询-隆化-妊娠结局记录表-查看页面解析
     @RequestMapping(method = RequestMethod.GET, value = "/queryLhBabyGravidityEndingTab")
     @ResponseBody
     @TokenRequired
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyBirthDefectTabFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyBirthDefectTabFacade.java
index 8340df3..197af08 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyBirthDefectTabFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyBirthDefectTabFacade.java
@@ -50,12 +50,12 @@ public class LhBabyBirthDefectTabFacade extends BaseMongoDAOImpl<LhBabyBirthDefe
     public BaseObjectResponse queryLhBabyBirthDefectTab(LhBabyBirthDefectTabQuery lhBabyBirthDefectTabQuery) {
         lhBabyBirthDefectTabQuery.setYn(YnEnums.YES.getId());//查询有效数据（删除状态）
         MongoQuery query = lhBabyBirthDefectTabQuery.convertToQuery();
-        LhBabyBirthDefectTabModel babyBirthDefectTab=findOne(query.convertToMongoQuery());
+        LhBabyBirthDefectTabModel babyBirthDefectTabModel=findOne(query.convertToMongoQuery());
         //整理返回数据
         LhBabyBirthDefectTabResult lhBabyBirthDefectTabResult=new LhBabyBirthDefectTabResult();
-        lhBabyBirthDefectTabResult.convertToResult(babyBirthDefectTab);
+        lhBabyBirthDefectTabResult.convertToResult(babyBirthDefectTabModel);
         BaseObjectResponse br = new BaseObjectResponse();
-        br.setData(babyBirthDefectTab);
+        br.setData(lhBabyBirthDefectTabResult);
         br.setErrorcode(ErrorCodeConstants.SUCCESS);
         br.setErrormsg("成功");
         return br;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyGravidityEndingTabFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyGravidityEndingTabFacade.java
index 4048c68..c673047 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyGravidityEndingTabFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyGravidityEndingTabFacade.java
@@ -9,6 +9,8 @@ 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.StringUtils;
+import com.lyms.platform.operate.web.result.LhBabyBirthDefectTabResult;
+import com.lyms.platform.operate.web.result.LhBabyGravidityEndingTabResult;
 import com.lyms.platform.pojo.LhBabyBirthDefectTabModel;
 import com.lyms.platform.pojo.LhBabyGravidityEndingTabModel;
 import com.lyms.platform.query.LhBabyBirthDefectTabQuery;
@@ -25,11 +27,11 @@ public class LhBabyGravidityEndingTabFacade extends BaseMongoDAOImpl<LhBabyGravi
     private AutoMatchFacade autoMatchFacade;
 
     /**
-     * 查询-隆化-妊娠结局记录表
+     * 查询-隆化-妊娠结局记录表-编辑页面读取数据
      * @param lhBabyGravidityEndingTabQuery
      * @return
      */
-    public BaseObjectResponse queryLhBabyGravidityEndingTab(LhBabyGravidityEndingTabQuery lhBabyGravidityEndingTabQuery) {
+    public BaseObjectResponse queryUpdateLhBabyGravidityEndingTab(LhBabyGravidityEndingTabQuery lhBabyGravidityEndingTabQuery) {
         lhBabyGravidityEndingTabQuery.setYn(YnEnums.YES.getId());//查询有效数据（删除状态）
         MongoQuery query = lhBabyGravidityEndingTabQuery.convertToQuery();
         LhBabyGravidityEndingTabModel lhBabyGravidityEndingTabModel=findOne(query.convertToMongoQuery());
@@ -39,6 +41,24 @@ public class LhBabyGravidityEndingTabFacade extends BaseMongoDAOImpl<LhBabyGravi
         br.setErrormsg("成功");
         return br;
     }
+    /**
+     * 查询-隆化-妊娠结局记录表-查看页面解析
+     * @param lhBabyGravidityEndingTabQuery
+     * @return
+     */
+    public BaseObjectResponse queryLhBabyGravidityEndingTab(LhBabyGravidityEndingTabQuery lhBabyGravidityEndingTabQuery) {
+        lhBabyGravidityEndingTabQuery.setYn(YnEnums.YES.getId());//查询有效数据（删除状态）
+        MongoQuery query = lhBabyGravidityEndingTabQuery.convertToQuery();
+        LhBabyGravidityEndingTabModel lhBabyGravidityEndingTabModel=findOne(query.convertToMongoQuery());
+        //整理返回数据
+        LhBabyGravidityEndingTabResult lhBabyBirthDefectTabResult=new LhBabyGravidityEndingTabResult();
+        lhBabyBirthDefectTabResult.convertToResult(lhBabyGravidityEndingTabModel);
+        BaseObjectResponse br = new BaseObjectResponse();
+        br.setData(lhBabyBirthDefectTabResult);
+        br.setErrorcode(ErrorCodeConstants.SUCCESS);
+        br.setErrormsg("成功");
+        return br;
+    }
 
     /**
      * 增加/修改-隆化-妊娠结局记录表
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/LhBabyGravidityEndingTabResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/LhBabyGravidityEndingTabResult.java
index d041c2a..fc9b992 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/LhBabyGravidityEndingTabResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/LhBabyGravidityEndingTabResult.java
@@ -450,225 +450,60 @@ public class LhBabyGravidityEndingTabResult implements IBasicResultConvert<LhBab
             /**
              * 家庭住址
              */
-            //省
-//            getName1(model.getProvinceId(),basicConfigService);
-//            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;
-//
-//
-//
-//            /**
-//             * 本次妊娠结局
-//             */
-//            //妊娠结局选项(LhgravidityEndingEnum)
-//            private String gravidityEnding;
-//            //其他
-//            private String gravidityEndingOther;
-//
-//            //性别（LhSexEnum）
-//            private String babySex;
-//            //出生体重
-//            private String babyweight;
-//
-//            //是否为多胞胎（LhMultipletsYnEnum）
-//            private String multiplets;
-//            //分娩日期
-//            private Date childbirthDate;
-//            //分娩孕周
-//            private String dueWeek;
-//            /**
-//             * 分娩地点
-//             */
-//            //省
-//            private String fProvinceId;
-//            //市
-//            private String fCityId;
-//            //区、县
-//            private String fAreaId;
-//            //街道
-//            private String fStreetId;
-//            //详细地址
-//            private String fAddress;
-//
-//            //分娩机构（LhLaborAgenciesEnum）
-//            private String laborAgencies;
-//            //分娩机构-其他
-//            private String laborAgenciesOther;
-//
-//            //分娩方式(LhChildbirthWayEnum)
-//            private String childbirthWay;
-//            //分娩方式-其他
-//            private String childbirthWayOther;
-//            //婴儿42天存活情况(LhSurvivalCaseEnum)
-//            private String survivalCase;
-//
-//            //随访者签名
-//            private String visitSign;
-//
-//            //填表日期
-//            private Date writeDate;
-//            /**
-//             * 1患儿家庭情况
-//             */
-//            //父亲姓名
-//            setfName(model.getfName());
-//            //父亲年龄
-//            setfAge(model.getfAge());
-//            //父亲民族
-//            setfNationId(model.getfNationId());
-//            //父亲身份证号
-//            setfCardNo(model.getfCardNo());
-//
-//            //母亲姓名
-//            setmName(model.getmName());
-//            //母亲年龄
-//            setmAge(model.getmAge());
-//            //母亲民族
-//            setmNationId(model.getmNationId());
-//            //母亲身份证号
-//            setmCardNo(model.getmCardNo());
-//            //孕次
-//            setGravidity(model.getGravidity());
-//            //产次
-//            setParity(model.getParity());
-//            //常住地（LhDomicileEnum）
-//            StringBuilder domicile=new StringBuilder();
-//            for (Object o : StringUtils.covertToList(model.getDomicile(), null)) {
-//                 domicile.append(LhDomicileEnum.getName(o.toString())+",");
-//            }
-//            setDomicile(StringUtils.isNotEmpty(domicile.toString())?domicile.toString():null);
-//
-//            /**
-//             * 现住址
-//             */
-//            //现住址 通过id编译
-//            setAddress(CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(),
-//                    model.getAreaId(), model.getStreetId(),model.getAddress(), basicConfigService));
-//
-//            //邮编
-//            setZipCode(model.getZipCode());
-//            //联系电话
-//            setPhone(model.getPhone());
-//
-//            /**
-//             * 2患儿基本情况
-//             */
-//            //出生日期
-//            setBabyBirthDate(model.getBabyBirthDate());
-//            //性别（LhSexEnum）
-//            setBabySex(LhSexEnum.getName(model.getBabySex()));
-//            //出生孕周
-//            setBabyBirthWeek(model.getBabyBirthWeek());
-//            //出生体重
-//            setBabyweight(model.getBabyweight());
-//            //胎儿数（LhFetusCountEnum）
-//            setFetusCount(LhFetusCountEnum.getName(model.getFetusCount()));
-//            //同卵，异卵(LhFetusCountEnum)
-//            setIdenticalYn(LhFetusCountEnum.getName(model.getIdenticalYn()));
-//            //转归（LhOutcomeEnum）
-//            setOutcome(LhOutcomeEnum.getName(model.getOutcome()));
-//            //诊断依据（LhDiagnosisBasisEnum）
-//            StringBuilder diagnosisBasis=new StringBuilder();
-//            for (Object o : StringUtils.covertToList(model.getDiagnosisBasis(), null)) {
-//                diagnosisBasis.append(LhDiagnosisBasisEnum.getName(o.toString())+",");
-//            }
-//            setDiagnosisBasis(StringUtils.isNotEmpty(diagnosisBasis.toString())?diagnosisBasis.toString():null);
-//            //诊断依据-其他
-//            setDiagnosisBasisOther(model.getDiagnosisBasisOther());
-//            //畸形确诊时间（LhDeformityTimeEnum）
-//            setDeformityTime(LhDeformityTimeEnum.getName(model.getDeformityTime()));
-//
-//            /**
-//             * 3出生缺陷诊断
-//             */
-//            //出生缺陷诊断（LhBirthDefectEnum）
-//            StringBuilder birthDefect=new StringBuilder();
-//            for (Object o : StringUtils.covertToList(model.getBirthDefect(), null)) {
-//                birthDefect.append(LhBirthDefectEnum.getName(o.toString())+",");
-//            }
-//            setBirthDefect(StringUtils.isNotEmpty(birthDefect.toString())?birthDefect.toString():null);
-//            //其他
-//            setBirthDefectOther(model.getBirthDefectOther());
-//
-//            /**
-//             * 4孕早期情况
-//             */
-//            //患病情况（LhIllnessCaseEnum）
-//            StringBuilder illnessCase=new StringBuilder();
-//            for (Object o : StringUtils.covertToList(model.getIllnessCase(), null)) {
-//                illnessCase.append(LhIllnessCaseEnum.getName(o.toString())+",");
-//            }
-//            setIllnessCase(StringUtils.isNotEmpty(illnessCase.toString())?illnessCase.toString():null);
-//            //肝炎类型（暂定手填）
-//            setHepatitisType(model.getHepatitisType());
-//            //患病情况-其他
-//            setIllnessCaseOther(model.getIllnessCaseOther());
-//
-//            //服药情况
-//            //磺胺类-名称
-//            setSulfanilamide(model.getSulfanilamide());
-//            //抗生素-名称
-//            setAntibiotics(model.getAntibiotics());
-//            //避孕药-名称
-//            setAcyeterion(model.getAcyeterion());
-//            //镇静药-名称
-//            setSedative(model.getSedative());
-//            //服药情况-其他
-//            setTakeCaseOther(model.getTakeCaseOther());
-//
-//            //接触农药及其他有害因素
-//            //农药-名称
-//            setPesticide(model.getPesticide());
-//            //射线类型（暂定手填）
-//            setRayType(model.getRayType());
-//            //酗酒-两/日
-//            setBibulosity(model.getBibulosity());
-//            //化学制剂-名称
-//            setChemical(model.getChemical());
-//            //接触农药及其他有害因素-其他
-//            setRestsFactorOther(model.getRestsFactorOther());
-//
-//            /**
-//             *5诊断级别
-//             */
-//            //诊断级别（LhDiagnoseLvEnum）
-//            setDiagnoseLv(LhDiagnoseLvEnum.getName(model.getDiagnoseLv()));
-//            //诊断级别-其他
-//            setDiagnoseLvOther(model.getDiagnoseLvOther());
-//
-//            //填表人(当前登录医生姓名)
-//            if(StringUtils.isNotEmpty(model.getPreparer())){
-//                Users users = usersService.getUsers(Integer.parseInt(model.getPreparer()));
-//                setPreparer(model.getPreparer());
-//                setPreparerName(null!=users?users.getName():null);
-//            }
+            //详细地址
+            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));
 //
-//            //填表单位（医院名称）
-//            if(StringUtils.isNotEmpty(model.getHospitalId())){
-//                Organization org = organizationService.getOrganization(Integer.valueOf(model.getHospitalId()));
-//                setHospitalId(model.getHospitalId());
-//                setHospitalName(null!=org?org.getName():null);
-//            }
+            /**
+             * 本次妊娠结局
+             */
+            //妊娠结局选项(LhgravidityEndingEnum)
+            StringBuilder gravidityEnding=new StringBuilder();
+            for (Object o : StringUtils.covertToList(model.getGravidityEnding(), null)) {
+                gravidityEnding.append(LhgravidityEndingEnum.getName(o.toString())+",");
+            }
+            setGravidityEnding(StringUtils.isNotEmpty(gravidityEnding.toString())?gravidityEnding.toString():null);
+            //其他
+            setGravidityEndingOther(model.getGravidityEndingOther());
+
+            //性别（LhSexEnum）
+            setBabySex(LhSexEnum.getName(model.getBabySex()));
+            //出生体重
+            setBabyweight(model.getBabyweight());
+
+            //是否为多胞胎（LhMultipletsYnEnum）
+            setMultiplets(LhMultipletsYnEnum.getName(model.getMultiplets()));
+            //分娩日期
+            setChildbirthDate(model.getChildbirthDate());
+            //分娩孕周
+            setDueWeek(model.getDueWeek());
+            /**
+             * 分娩地点
+             */
+            //详细地址
+            setfAddress(CommonsHelper.getResidence(model.getfProvinceId(), model.getfCityId(),
+                    model.getfAreaId(), model.getfStreetId(),model.getfAddress(), basicConfigService));
+
+            //分娩机构（LhLaborAgenciesEnum）
+            setLaborAgencies(LhLaborAgenciesEnum.getName(model.getLaborAgencies()));
+            //分娩机构-其他
+            setLaborAgenciesOther(model.getLaborAgenciesOther());
+
+            //分娩方式(LhChildbirthWayEnum)
+            setChildbirthWay(LhChildbirthWayEnum.getName(model.getChildbirthWay()));
+            //分娩方式-其他
+            setChildbirthWayOther(model.getChildbirthWayOther());
+            //婴儿42天存活情况(LhSurvivalCaseEnum)
+            setSurvivalCase(LhSurvivalCaseEnum.getName(model.getSurvivalCase()));
+
+            //随访者签名
+            setVisitSign(model.getVisitSign());
 
             //填表日期
             setWriteDate(model.getWriteDate());
-- 
1.8.3.1