jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 3fa9c8190c153313e6ee375831bc240fe7b92daf

Authored by dongqin
1 parent a475b79c74
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 3 changed files with 152 additions and 31 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java View file @ 3fa9c81
... ... @@ -190,6 +190,16 @@
190 190 private String streetZJId;
191 191 private String addressZJ;
192 192  
  193 + private String inHospitalNo;
  194 +
  195 + public String getInHospitalNo() {
  196 + return inHospitalNo;
  197 + }
  198 +
  199 + public void setInHospitalNo(String inHospitalNo) {
  200 + this.inHospitalNo = inHospitalNo;
  201 + }
  202 +
193 203 public String getAddressZJ() {
194 204 return addressZJ;
195 205 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 3fa9c81
1 1 package com.lyms.platform.operate.web.facade;
2 2  
  3 +import java.io.BufferedReader;
  4 +import java.io.File;
  5 +import java.io.IOException;
  6 +import java.io.InputStreamReader;
  7 +import java.math.RoundingMode;
  8 +import java.text.SimpleDateFormat;
  9 +import java.util.ArrayList;
  10 +import java.util.Calendar;
  11 +import java.util.Date;
  12 +import java.util.HashMap;
  13 +import java.util.HashSet;
  14 +import java.util.Iterator;
  15 +import java.util.LinkedHashMap;
  16 +import java.util.List;
  17 +import java.util.Map;
  18 +import java.util.Set;
  19 +
  20 +import org.apache.commons.collections.CollectionUtils;
  21 +import org.apache.commons.collections.MapUtils;
  22 +import org.apache.commons.collections.map.HashedMap;
  23 +import org.apache.commons.lang.StringUtils;
  24 +import org.apache.commons.lang.math.NumberUtils;
  25 +import org.dom4j.Document;
  26 +import org.dom4j.DocumentHelper;
  27 +import org.dom4j.Element;
  28 +import org.springframework.beans.factory.annotation.Autowired;
  29 +import org.springframework.data.domain.Sort;
  30 +import org.springframework.data.mongodb.core.MongoTemplate;
  31 +import org.springframework.data.mongodb.core.query.Criteria;
  32 +import org.springframework.data.mongodb.core.query.Query;
  33 +import org.springframework.stereotype.Component;
  34 +import org.springframework.web.multipart.MultipartFile;
  35 +
3 36 import com.alibaba.fastjson.JSONObject;
4 37 import com.lyms.platform.biz.SequenceConstant;
5   -import com.lyms.platform.biz.service.*;
  38 +import com.lyms.platform.biz.service.AntExRecordService;
  39 +import com.lyms.platform.biz.service.AntenatalExaminationService;
  40 +import com.lyms.platform.biz.service.ApplyOrderService;
  41 +import com.lyms.platform.biz.service.BabyBookbuildingService;
  42 +import com.lyms.platform.biz.service.BabyCheckService;
  43 +import com.lyms.platform.biz.service.BabyService;
  44 +import com.lyms.platform.biz.service.BasicConfigService;
  45 +import com.lyms.platform.biz.service.CommonService;
  46 +import com.lyms.platform.biz.service.DischargeAbstractBabyService;
  47 +import com.lyms.platform.biz.service.DischargeAbstractMotherService;
  48 +import com.lyms.platform.biz.service.HosptialHighRiskService;
  49 +import com.lyms.platform.biz.service.MatDeliverService;
  50 +import com.lyms.platform.biz.service.PatientsService;
  51 +import com.lyms.platform.biz.service.PostReviewService;
  52 +import com.lyms.platform.biz.service.ResidentsArchiveService;
  53 +import com.lyms.platform.biz.service.StopPregnancyService;
  54 +import com.lyms.platform.biz.service.YunBookbuildingService;
6 55 import com.lyms.platform.common.constants.ErrorCodeConstants;
7 56 import com.lyms.platform.common.dao.operator.MongoQuery;
8   -import com.lyms.platform.common.enums.*;
  57 +import com.lyms.platform.common.enums.BasisEnums;
  58 +import com.lyms.platform.common.enums.CZFmTypeEnums;
  59 +import com.lyms.platform.common.enums.CfEnums;
  60 +import com.lyms.platform.common.enums.DeathCauseEnums;
  61 +import com.lyms.platform.common.enums.EyeExaminationEnums;
  62 +import com.lyms.platform.common.enums.FetalEnums;
  63 +import com.lyms.platform.common.enums.FetalPositionEnums;
  64 +import com.lyms.platform.common.enums.FitnessEnums;
  65 +import com.lyms.platform.common.enums.FmTypeEnums;
  66 +import com.lyms.platform.common.enums.FuZhongEnums;
  67 +import com.lyms.platform.common.enums.FyTypeEnums;
  68 +import com.lyms.platform.common.enums.GestaMonthEnums;
  69 +import com.lyms.platform.common.enums.GongJingEnums;
  70 +import com.lyms.platform.common.enums.JoinEnums;
  71 +import com.lyms.platform.common.enums.PregnancyExceptionEnums;
  72 +import com.lyms.platform.common.enums.PregnancyMethodEnums;
  73 +import com.lyms.platform.common.enums.QiDaiEnums;
  74 +import com.lyms.platform.common.enums.QuickenEnums;
  75 +import com.lyms.platform.common.enums.RenShenJieJuEnums;
  76 +import com.lyms.platform.common.enums.SXCauseEnums;
  77 +import com.lyms.platform.common.enums.SYJGEums;
  78 +import com.lyms.platform.common.enums.ServiceStatusEnums;
  79 +import com.lyms.platform.common.enums.ServiceTypeEnums;
  80 +import com.lyms.platform.common.enums.SexEnum;
  81 +import com.lyms.platform.common.enums.TaiShuEnums;
  82 +import com.lyms.platform.common.enums.TpmcTypeEnums;
  83 +import com.lyms.platform.common.enums.WyTypeEnums;
  84 +import com.lyms.platform.common.enums.YnEnums;
9 85 import com.lyms.platform.common.result.BaseObjectResponse;
10 86 import com.lyms.platform.common.result.BaseResponse;
11 87 import com.lyms.platform.common.result.RespBuilder;
12   -import com.lyms.platform.common.utils.*;
  88 +import com.lyms.platform.common.utils.DateUtil;
  89 +import com.lyms.platform.common.utils.ExceptionUtils;
  90 +import com.lyms.platform.common.utils.JsonUtil;
  91 +import com.lyms.platform.common.utils.SystemConfig;
13 92 import com.lyms.platform.operate.web.request.AntExcAddOther;
14 93 import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
15   -import com.lyms.platform.operate.web.result.*;
  94 +import com.lyms.platform.operate.web.result.AmnioResultResult;
  95 +import com.lyms.platform.operate.web.result.AmniocentesisInfoView;
  96 +import com.lyms.platform.operate.web.result.BabyCheckListResult;
  97 +import com.lyms.platform.operate.web.result.BabyCheckPageResult;
  98 +import com.lyms.platform.operate.web.result.BabyPageResult;
  99 +import com.lyms.platform.operate.web.result.HighScoreResult;
  100 +import com.lyms.platform.operate.web.result.PatientSerResult;
  101 +import com.lyms.platform.operate.web.result.ResidentsPageResult;
16 102 import com.lyms.platform.operate.web.service.BabyEvaluationCriterionService;
17   -import com.lyms.platform.operate.web.utils.*;
  103 +import com.lyms.platform.operate.web.utils.CommonsHelper;
  104 +import com.lyms.platform.operate.web.utils.FunvCommonUtil;
  105 +import com.lyms.platform.operate.web.utils.MongoUtil;
  106 +import com.lyms.platform.operate.web.utils.ResolveUtils;
  107 +import com.lyms.platform.operate.web.utils.UnitConstants;
  108 +import com.lyms.platform.operate.web.utils.UnitUtils;
18 109 import com.lyms.platform.permission.dao.master.CouponMapper;
19 110 import com.lyms.platform.permission.model.Organization;
20 111 import com.lyms.platform.permission.model.OrganizationQuery;
21 112  
... ... @@ -22,33 +113,39 @@
22 113 import com.lyms.platform.permission.service.CouponService;
23 114 import com.lyms.platform.permission.service.OrganizationService;
24 115 import com.lyms.platform.permission.service.UsersService;
25   -import com.lyms.platform.pojo.*;
26   -import com.lyms.platform.query.*;
27   -import org.apache.commons.collections.CollectionUtils;
28   -import org.apache.commons.collections.MapUtils;
29   -import org.apache.commons.collections.map.HashedMap;
30   -import org.apache.commons.lang.StringUtils;
31   -import org.apache.commons.lang.math.NumberUtils;
32   -import org.dom4j.Document;
33   -import org.dom4j.DocumentHelper;
34   -import org.dom4j.Element;
35   -import org.springframework.beans.factory.annotation.Autowired;
36   -import org.springframework.data.domain.Sort;
37   -import org.springframework.data.mongodb.core.MongoTemplate;
38   -import org.springframework.data.mongodb.core.query.Criteria;
39   -import org.springframework.data.mongodb.core.query.Query;
40   -import org.springframework.stereotype.Component;
41   -import org.springframework.web.multipart.MultipartFile;
42   -import sun.util.resources.cldr.id.CurrencyNames_id;
  116 +import com.lyms.platform.pojo.AmniocentesisInfoModel;
  117 +import com.lyms.platform.pojo.AmniocentesisResultModel;
  118 +import com.lyms.platform.pojo.AntExChuModel;
  119 +import com.lyms.platform.pojo.AntenatalExaminationModel;
  120 +import com.lyms.platform.pojo.BabyCheckModel;
  121 +import com.lyms.platform.pojo.BabyModel;
  122 +import com.lyms.platform.pojo.BabyNerveMovementModel;
  123 +import com.lyms.platform.pojo.BabyNeuroPsychologicalModel;
  124 +import com.lyms.platform.pojo.BasicConfig;
  125 +import com.lyms.platform.pojo.DischargeAbstractBabyModel;
  126 +import com.lyms.platform.pojo.DischargeAbstractMotherModel;
  127 +import com.lyms.platform.pojo.ExerciseAppraisalModel;
  128 +import com.lyms.platform.pojo.FilePathModel;
  129 +import com.lyms.platform.pojo.MaternalDeliverModel;
  130 +import com.lyms.platform.pojo.Patients;
  131 +import com.lyms.platform.pojo.PlantformConfigModel;
  132 +import com.lyms.platform.pojo.PostReviewModel;
  133 +import com.lyms.platform.pojo.ReferralApplyOrderModel;
  134 +import com.lyms.platform.pojo.ResidentsArchiveModel;
  135 +import com.lyms.platform.pojo.StopPregModel;
  136 +import com.lyms.platform.query.AntExChuQuery;
  137 +import com.lyms.platform.query.AntExQuery;
  138 +import com.lyms.platform.query.AntExRecordQuery;
  139 +import com.lyms.platform.query.BabyCheckModelQuery;
  140 +import com.lyms.platform.query.BabyModelQuery;
  141 +import com.lyms.platform.query.BasicConfigQuery;
  142 +import com.lyms.platform.query.DischargeAbstractBabyQuery;
  143 +import com.lyms.platform.query.MatDeliverQuery;
  144 +import com.lyms.platform.query.PatientsQuery;
  145 +import com.lyms.platform.query.ReferralApplyOrderQuery;
  146 +import com.lyms.platform.query.ResidentsArchiveQuery;
  147 +import com.lyms.platform.query.StopPregQuery;
43 148  
44   -import java.io.BufferedReader;
45   -import java.io.File;
46   -import java.io.IOException;
47   -import java.io.InputStreamReader;
48   -import java.math.RoundingMode;
49   -import java.text.SimpleDateFormat;
50   -import java.util.*;
51   -
52 149 /**
53 150 * Created by Administrator on 2017/1/16 0016.
54 151 */
... ... @@ -2827,6 +2924,8 @@
2827 2924 map.put("fcardnum", StringUtils.isNotEmpty(patients.getHcertificateNum()) ? patients.getHcertificateNum() : "");
2828 2925  
2829 2926  
  2927 + map.put("fage", patients.getFmAge());
  2928 + map.put("inHospitalNo", data.getInHospitalNo());
2830 2929 String haddressRegister = CommonsHelper.getResidence(patients.getHprovinceRegisterId(), patients.getHcityRegisterId(),
2831 2930 patients.getHareaRegisterId(), patients.getHstreetRegisterId(), patients.getHaddressRegister(), basicConfigService);
2832 2931 map.put("haddressRegister", haddressRegister);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java View file @ 3fa9c81
... ... @@ -117,6 +117,16 @@
117 117 */
118 118 private String xzType;
119 119  
  120 + private String inHospitalNo;
  121 +
  122 + public String getInHospitalNo() {
  123 + return inHospitalNo;
  124 + }
  125 +
  126 + public void setInHospitalNo(String inHospitalNo) {
  127 + this.inHospitalNo = inHospitalNo;
  128 + }
  129 +
120 130 private YunBookbuildingAddRequest patient;
121 131  
122 132 public String getXzType() {
... ... @@ -501,6 +511,8 @@
501 511 if (null != xzType && !"".equals(xzType)) {
502 512 maternalDeliverModel.setXzType(xzType);
503 513 }
  514 +
  515 + maternalDeliverModel.setInHospitalNo(inHospitalNo);
504 516  
505 517 return maternalDeliverModel;
506 518 }