jiangjiazhi / regional-platform

Commit 11dab3226f98190a12927da07830400638d61ba5

Authored by wangbo over 6 years ago

Exists in master and in 6 other branches

新生儿管理年龄字段添加

Showing 3 changed files with 73 additions and 2 deletions

platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java

...	...	@@ -154,7 +154,26 @@
154	154
155	155	private String deathCause;
156	156
	157	+ private Integer startAge;
157	158
	159	+ private Integer endAge;
	160	+
	161	+ public Integer getStartAge() {
	162	+ return startAge;
	163	+ }
	164	+
	165	+ public void setStartAge(Integer startAge) {
	166	+ this.startAge = startAge;
	167	+ }
	168	+
	169	+ public Integer getEndAge() {
	170	+ return endAge;
	171	+ }
	172	+
	173	+ public void setEndAge(Integer endAge) {
	174	+ this.endAge = endAge;
	175	+ }
	176	+
158	177	public List<String> getHospitalIdList() {
159	178	return hospitalIdList;
160	179	}
...	...	@@ -225,6 +244,7 @@
225	244	condition = condition.and("fmAge", fmAge, MongoOper.IS);
226	245	}
227	246
	247	+
228	248	if (null != pregnancyOut) {
229	249	condition = condition.and("baby.pregnancyOut", pregnancyOut, MongoOper.IS);
230	250	}
...	...	@@ -359,6 +379,8 @@
359	379	}
360	380	isAddStart = Boolean.TRUE;
361	381	}
	382	+
	383	+
362	384	if (null != createdTimeStart && null != createdTimeEnd) {
363	385	if (null != c) {
364	386	c = c.where("created").gte(createdTimeStart).lte(createdTimeEnd);
...	...	@@ -367,6 +389,16 @@
367	389	}
368	390	isAddStart = Boolean.TRUE;
369	391	}
	392	+
	393	+ if (null != startAge && null != endAge) {
	394	+ if (null != c) {
	395	+ c = c.where("fmAge").gte(startAge).lte(endAge);
	396	+ } else {
	397	+ c = Criteria.where("fmAge").gte(startAge).lte(endAge);
	398	+ }
	399	+ isAddStart = Boolean.TRUE;
	400	+ }
	401	+
370	402	if (null != modifiedStart && null != modifiedEnd) {
371	403	if (null != c) {
372	404	c = c.where("modified").gte(modifiedStart).lte(modifiedEnd);

...	...	@@ -2214,6 +2214,14 @@
2214	2214	}
2215	2215	babyModelQuery.setBuildType(2);
2216	2216	babyModelQuery.setOrder("birth");
	2217	+ //添加儿童性别筛选添加
	2218	+ if (null != newBabyManagerRequest.getBabySex()) {
	2219	+ //只统计活产
	2220	+ babyModelQuery.setPregnancyOut("0");
	2221	+ }
	2222	+ babyModelQuery.setSex(newBabyManagerRequest.getBabySex());
	2223	+
	2224	+
2217	2225	babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(newBabyManagerRequest.getOperatorId()));
2218	2226	if (null != newBabyManagerRequest.getHuge() && 1 == newBabyManagerRequest.getHuge()) {
2219	2227	babyModelQuery.setBabyWeightStart("4");
...	...	@@ -2241,6 +2249,8 @@
2241	2249	MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
2242	2250	matDeliverQuery.setYn(YnEnums.YES.getId());
2243	2251	matDeliverQuery.setParentIdList(parentIdList);
	2252	+ matDeliverQuery.setStartAge(newBabyManagerRequest.getStartAge());
	2253	+ matDeliverQuery.setEndAge(newBabyManagerRequest.getEndAge());
2244	2254	List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
2245	2255	List<NewBabyManagerQueryModel> newBabyManagerQueryModelList = new ArrayList<>();
2246	2256	for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModelList) {
...	...	@@ -2276,8 +2286,6 @@
2276	2286	newBabyManagerQueryModel.setBirthYMD(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
2277	2287	}
2278	2288	BeanUtils.copy(babyModel, newBabyManagerQueryModel);
2279		-
2280		-
2281	2289	String apgarScorePf1 = "";
2282	2290	String apgarScorePf5 = "";
2283	2291	String apgarScorePf10 = "";

...	...	@@ -42,6 +42,37 @@
42	42
43	43	private String asphyxiaMEnd;
44	44
	45	+ //产妇年龄
	46	+ private Integer startAge;
	47	+
	48	+ private Integer endAge;
	49	+
	50	+ private Integer babySex;
	51	+
	52	+ public Integer getStartAge() {
	53	+ return startAge;
	54	+ }
	55	+
	56	+ public void setStartAge(Integer startAge) {
	57	+ this.startAge = startAge;
	58	+ }
	59	+
	60	+ public Integer getEndAge() {
	61	+ return endAge;
	62	+ }
	63	+
	64	+ public void setEndAge(Integer endAge) {
	65	+ this.endAge = endAge;
	66	+ }
	67	+
	68	+ public Integer getBabySex() {
	69	+ return babySex;
	70	+ }
	71	+
	72	+ public void setBabySex(Integer babySex) {
	73	+ this.babySex = babySex;
	74	+ }
	75	+
45	76	public String getAsphyxiaMStart() {
46	77	return asphyxiaMStart;
47	78	}