jiangjiazhi / regional-platform

Authored by gengxiaokai over 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 50 additions and 2 deletions

...	...	@@ -31,6 +31,29 @@
31	31	private String hospitalId;
32	32	private boolean neStart;
33	33
	34	+
	35	+ private Date createdTimeStart;
	36	+ private Date createdTimeEnd;
	37	+
	38	+ public Date getCreatedTimeStart() {
	39	+ return createdTimeStart;
	40	+ }
	41	+
	42	+ public void setCreatedTimeStart(Date createdTimeStart) {
	43	+ this.createdTimeStart = createdTimeStart;
	44	+ }
	45	+
	46	+ public Date getCreatedTimeEnd() {
	47	+ return createdTimeEnd;
	48	+ }
	49	+
	50	+ public void setCreatedTimeEnd(Date createdTimeEnd) {
	51	+ this.createdTimeEnd = createdTimeEnd;
	52	+ }
	53	+
	54	+
	55	+
	56	+
34	57	private boolean neEnd;
35	58	/**
36	59	* 出血量：
...	...	@@ -359,6 +382,14 @@
359	382	} else {
360	383	c = Criteria.where("dueDate1").lte(endStart);
361	384	}
	385	+ }
	386	+ isAddStart = Boolean.TRUE;
	387	+ }
	388	+ if(null != createdTimeStart && null != createdTimeEnd){
	389	+ if(null != c){
	390	+ c = c.where("created").gte(createdTimeStart).lte(createdTimeEnd);
	391	+ }else{
	392	+ c = Criteria.where("created").gte(createdTimeStart).lte(createdTimeEnd);
362	393	}
363	394	isAddStart = Boolean.TRUE;
364	395	}

...	...	@@ -4285,10 +4285,26 @@
4285	4285	return br;
4286	4286	}
4287	4287
	4288	+
	4289	+ /**
	4290	+ * 承德智业分娩调用方法
	4291	+ * @param startDate
	4292	+ * @param endDate
	4293	+ * @return
	4294	+ */
4288	4295	public BaseObjectResponse saveFm(String startDate,String endDate){
	4296	+ BaseObjectResponse br = null;
	4297	+ MatDeliverQuery deliverQuery = new MatDeliverQuery();
	4298	+ deliverQuery.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate));
	4299	+ deliverQuery.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
	4300	+ List<MaternalDeliverModel> list = matDeliverService.query(deliverQuery);
	4301	+ if(null != list && list.size() > 0){
	4302	+ for(MaternalDeliverModel maternalDeliverModel : list){
	4303	+ br = saveWomen_Delivery(maternalDeliverModel);
	4304	+ }
	4305	+ }
	4306	+ return br;
4289	4307
4290		- return null;
4291		-
4292	4308	}
4293	4309
4294	4310
...	...	@@ -4305,6 +4321,7 @@
4305	4321	saveYf(startDate, endDate);
4306	4322	saveChuZhen(startDate, endDate);
4307	4323	saveFuZhen(startDate, endDate);
	4324	+ saveFm(startDate, endDate);
4308	4325
4309	4326	}
4310	4327