From 3fa9c8190c153313e6ee375831bc240fe7b92daf Mon Sep 17 00:00:00 2001 From: dongqin <123456> Date: Sat, 23 Nov 2019 10:45:53 +0800 Subject: [PATCH] update --- .../lyms/platform/pojo/MaternalDeliverModel.java | 10 ++ .../platform/operate/web/facade/ViewFacade.java | 161 +++++++++++++++++---- .../operate/web/request/MatDeliverAddRequest.java | 12 ++ 3 files changed, 152 insertions(+), 31 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java index 281de33..587ae71 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java @@ -190,6 +190,16 @@ public class MaternalDeliverModel extends BaseModel { private String streetZJId; private String addressZJ; + private String inHospitalNo; + + public String getInHospitalNo() { + return inHospitalNo; + } + + public void setInHospitalNo(String inHospitalNo) { + this.inHospitalNo = inHospitalNo; + } + public String getAddressZJ() { return addressZJ; } 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 d3d3ff3..ca4a668 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 @@ -1,20 +1,111 @@ package com.lyms.platform.operate.web.facade; +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.math.RoundingMode; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.MapUtils; +import org.apache.commons.collections.map.HashedMap; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.math.NumberUtils; +import org.dom4j.Document; +import org.dom4j.DocumentHelper; +import org.dom4j.Element; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; +import org.springframework.stereotype.Component; +import org.springframework.web.multipart.MultipartFile; + import com.alibaba.fastjson.JSONObject; import com.lyms.platform.biz.SequenceConstant; -import com.lyms.platform.biz.service.*; +import com.lyms.platform.biz.service.AntExRecordService; +import com.lyms.platform.biz.service.AntenatalExaminationService; +import com.lyms.platform.biz.service.ApplyOrderService; +import com.lyms.platform.biz.service.BabyBookbuildingService; +import com.lyms.platform.biz.service.BabyCheckService; +import com.lyms.platform.biz.service.BabyService; +import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.biz.service.CommonService; +import com.lyms.platform.biz.service.DischargeAbstractBabyService; +import com.lyms.platform.biz.service.DischargeAbstractMotherService; +import com.lyms.platform.biz.service.HosptialHighRiskService; +import com.lyms.platform.biz.service.MatDeliverService; +import com.lyms.platform.biz.service.PatientsService; +import com.lyms.platform.biz.service.PostReviewService; +import com.lyms.platform.biz.service.ResidentsArchiveService; +import com.lyms.platform.biz.service.StopPregnancyService; +import com.lyms.platform.biz.service.YunBookbuildingService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.dao.operator.MongoQuery; -import com.lyms.platform.common.enums.*; +import com.lyms.platform.common.enums.BasisEnums; +import com.lyms.platform.common.enums.CZFmTypeEnums; +import com.lyms.platform.common.enums.CfEnums; +import com.lyms.platform.common.enums.DeathCauseEnums; +import com.lyms.platform.common.enums.EyeExaminationEnums; +import com.lyms.platform.common.enums.FetalEnums; +import com.lyms.platform.common.enums.FetalPositionEnums; +import com.lyms.platform.common.enums.FitnessEnums; +import com.lyms.platform.common.enums.FmTypeEnums; +import com.lyms.platform.common.enums.FuZhongEnums; +import com.lyms.platform.common.enums.FyTypeEnums; +import com.lyms.platform.common.enums.GestaMonthEnums; +import com.lyms.platform.common.enums.GongJingEnums; +import com.lyms.platform.common.enums.JoinEnums; +import com.lyms.platform.common.enums.PregnancyExceptionEnums; +import com.lyms.platform.common.enums.PregnancyMethodEnums; +import com.lyms.platform.common.enums.QiDaiEnums; +import com.lyms.platform.common.enums.QuickenEnums; +import com.lyms.platform.common.enums.RenShenJieJuEnums; +import com.lyms.platform.common.enums.SXCauseEnums; +import com.lyms.platform.common.enums.SYJGEums; +import com.lyms.platform.common.enums.ServiceStatusEnums; +import com.lyms.platform.common.enums.ServiceTypeEnums; +import com.lyms.platform.common.enums.SexEnum; +import com.lyms.platform.common.enums.TaiShuEnums; +import com.lyms.platform.common.enums.TpmcTypeEnums; +import com.lyms.platform.common.enums.WyTypeEnums; +import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.RespBuilder; -import com.lyms.platform.common.utils.*; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.ExceptionUtils; +import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.AntExcAddOther; import com.lyms.platform.operate.web.request.MatDeliverAddRequest; -import com.lyms.platform.operate.web.result.*; +import com.lyms.platform.operate.web.result.AmnioResultResult; +import com.lyms.platform.operate.web.result.AmniocentesisInfoView; +import com.lyms.platform.operate.web.result.BabyCheckListResult; +import com.lyms.platform.operate.web.result.BabyCheckPageResult; +import com.lyms.platform.operate.web.result.BabyPageResult; +import com.lyms.platform.operate.web.result.HighScoreResult; +import com.lyms.platform.operate.web.result.PatientSerResult; +import com.lyms.platform.operate.web.result.ResidentsPageResult; import com.lyms.platform.operate.web.service.BabyEvaluationCriterionService; -import com.lyms.platform.operate.web.utils.*; +import com.lyms.platform.operate.web.utils.CommonsHelper; +import com.lyms.platform.operate.web.utils.FunvCommonUtil; +import com.lyms.platform.operate.web.utils.MongoUtil; +import com.lyms.platform.operate.web.utils.ResolveUtils; +import com.lyms.platform.operate.web.utils.UnitConstants; +import com.lyms.platform.operate.web.utils.UnitUtils; import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; @@ -22,32 +113,38 @@ import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; -import com.lyms.platform.pojo.*; -import com.lyms.platform.query.*; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.MapUtils; -import org.apache.commons.collections.map.HashedMap; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; -import org.dom4j.Document; -import org.dom4j.DocumentHelper; -import org.dom4j.Element; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Sort; -import org.springframework.data.mongodb.core.MongoTemplate; -import org.springframework.data.mongodb.core.query.Criteria; -import org.springframework.data.mongodb.core.query.Query; -import org.springframework.stereotype.Component; -import org.springframework.web.multipart.MultipartFile; -import sun.util.resources.cldr.id.CurrencyNames_id; - -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.math.RoundingMode; -import java.text.SimpleDateFormat; -import java.util.*; +import com.lyms.platform.pojo.AmniocentesisInfoModel; +import com.lyms.platform.pojo.AmniocentesisResultModel; +import com.lyms.platform.pojo.AntExChuModel; +import com.lyms.platform.pojo.AntenatalExaminationModel; +import com.lyms.platform.pojo.BabyCheckModel; +import com.lyms.platform.pojo.BabyModel; +import com.lyms.platform.pojo.BabyNerveMovementModel; +import com.lyms.platform.pojo.BabyNeuroPsychologicalModel; +import com.lyms.platform.pojo.BasicConfig; +import com.lyms.platform.pojo.DischargeAbstractBabyModel; +import com.lyms.platform.pojo.DischargeAbstractMotherModel; +import com.lyms.platform.pojo.ExerciseAppraisalModel; +import com.lyms.platform.pojo.FilePathModel; +import com.lyms.platform.pojo.MaternalDeliverModel; +import com.lyms.platform.pojo.Patients; +import com.lyms.platform.pojo.PlantformConfigModel; +import com.lyms.platform.pojo.PostReviewModel; +import com.lyms.platform.pojo.ReferralApplyOrderModel; +import com.lyms.platform.pojo.ResidentsArchiveModel; +import com.lyms.platform.pojo.StopPregModel; +import com.lyms.platform.query.AntExChuQuery; +import com.lyms.platform.query.AntExQuery; +import com.lyms.platform.query.AntExRecordQuery; +import com.lyms.platform.query.BabyCheckModelQuery; +import com.lyms.platform.query.BabyModelQuery; +import com.lyms.platform.query.BasicConfigQuery; +import com.lyms.platform.query.DischargeAbstractBabyQuery; +import com.lyms.platform.query.MatDeliverQuery; +import com.lyms.platform.query.PatientsQuery; +import com.lyms.platform.query.ReferralApplyOrderQuery; +import com.lyms.platform.query.ResidentsArchiveQuery; +import com.lyms.platform.query.StopPregQuery; /** * Created by Administrator on 2017/1/16 0016. @@ -2827,6 +2924,8 @@ public class ViewFacade { map.put("fcardnum", StringUtils.isNotEmpty(patients.getHcertificateNum()) ? patients.getHcertificateNum() : ""); + map.put("fage", patients.getFmAge()); + map.put("inHospitalNo", data.getInHospitalNo()); String haddressRegister = CommonsHelper.getResidence(patients.getHprovinceRegisterId(), patients.getHcityRegisterId(), patients.getHareaRegisterId(), patients.getHstreetRegisterId(), patients.getHaddressRegister(), basicConfigService); map.put("haddressRegister", haddressRegister); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java index b72f463..82ba7a9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java @@ -117,6 +117,16 @@ public class MatDeliverAddRequest implements IBasicRequestConvert