jiangjiazhi / regional-platform

Commit da0d73970696c4b07bee70dffb4d0a3d446fa208

Authored by liquanyu over 8 years ago

Exists in master and in 8 other branches

code update

Showing 3 changed files with 8 additions and 8 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntenatalExaminationDaoImpl.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyBookbuildingDaoImpl.java
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java

...	...	@@ -78,7 +78,7 @@
78	78	Criteria criteria1= Criteria.where("nextCheckTime").exists(false);
79	79	criteria.orOperator(criteria2,criteria1);
80	80
81		- AggregationOperation match = Aggregation.match(Criteria.where("hospitalId").is(hospitalId).andOperator(criteria));
	81	+ AggregationOperation match = Aggregation.match(Criteria.where("hospitalId").is(hospitalId).and("yn").is(1).andOperator(criteria));
82	82	AggregationOperation group = Aggregation.group("parentId").max("created").as("created");
83	83	Aggregation aggregation = Aggregation.newAggregation(match, group);
84	84	AggregationResults<AntenatalExaminationModel> result = this.mongoTemplate.aggregate(aggregation, "lyms_antex", AntenatalExaminationModel.class);
...	...	@@ -109,7 +109,7 @@
109	109
110	110	@Override
111	111	public List<AntenatalExaminationModel> queryYuyueAntenatalExamination(Date startDate,String hospitalId,String parentId) {
112		- AggregationOperation match = Aggregation.match(Criteria.where("nextCheckTime").gte(startDate).and("parentId").is(parentId).and("hospitalId").is(hospitalId));
	112	+ AggregationOperation match = Aggregation.match(Criteria.where("nextCheckTime").gte(startDate).and("parentId").is(parentId).and("hospitalId").is(hospitalId).and("yn").is(1));
113	113	AggregationOperation group = Aggregation.group("parentId").max("created").as("created");
114	114	Aggregation aggregation = Aggregation.newAggregation(match, group);
115	115	AggregationResults<AntenatalExaminationModel> result = this.mongoTemplate.aggregate(aggregation, "lyms_antex", AntenatalExaminationModel.class);

...	...	@@ -60,7 +60,7 @@
60	60	// AggregationResults<BabyCheckModel> result = this.mongoTemplate.aggregate(aggregation, "lyms_babycheck", BabyCheckModel.class);
61	61	// return result.getMappedResults();
62	62
63		- AggregationOperation match = Aggregation.match(Criteria.where("nextDate").gte(yuYueDate).lte(yuYueDate).and("hospitalId").is(hospitalId));
	63	+ AggregationOperation match = Aggregation.match(Criteria.where("nextDate").gte(yuYueDate).lte(yuYueDate).and("hospitalId").is(hospitalId).and("yn").is(1));
64	64	AggregationOperation group = Aggregation.group("buildId").max("created").as("created");
65	65	Aggregation aggregation = Aggregation.newAggregation(match, group);
66	66	AggregationResults<BabyCheckModel> result = this.mongoTemplate.aggregate(aggregation, "lyms_babycheck", BabyCheckModel.class);
...	...	@@ -69,7 +69,7 @@
69	69
70	70	@Override
71	71	public List<BabyCheckModel> queryBabyOrder(Date startDate, String hospitalId, String buildId) {
72		- AggregationOperation match = Aggregation.match(Criteria.where("nextDate").gte(startDate).lte(startDate).and("buildId").is(buildId));
	72	+ AggregationOperation match = Aggregation.match(Criteria.where("nextDate").gte(startDate).lte(startDate).and("buildId").is(buildId).and("yn").is(1));
73	73	AggregationOperation group = Aggregation.group("buildId").max("created").as("created");
74	74	Aggregation aggregation = Aggregation.newAggregation(match, group);
75	75	AggregationResults<BabyCheckModel> result = this.mongoTemplate.aggregate(aggregation, "lyms_babycheck", BabyCheckModel.class);

...	...	@@ -354,7 +354,7 @@
354	354
355	355	for (MessageRequest msg :allMsgs)
356	356	{
357		- System.out.println("孕妇ams短信=======" + msg.getContent());
	357	+ System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"孕妇ams短信=======" + msg.getContent());
358	358	}
359	359
360	360	}
...	...	@@ -529,7 +529,7 @@
529	529
530	530	for (MessageRequest msg :allMsgs)
531	531	{
532		- System.out.println("儿童ams短信=======" + msg.getContent());
	532	+ System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"儿童ams短信=======" + msg.getContent());
533	533	}
534	534
535	535
...	...	@@ -654,7 +654,7 @@
654	654
655	655	for (MessageRequest msg :allMsgs)
656	656	{
657		- System.out.println("产妇ams短信=======" + msg.getContent());
	657	+ System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"产妇ams短信=======" + msg.getContent());
658	658	}
659	659
660	660
...	...	@@ -1851,7 +1851,7 @@
1851	1851	}
1852	1852	for (MessageRequest msg :allMsgs)
1853	1853	{
1854		- System.out.println("模板短信=======" + msg.getContent());
	1854	+ System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"模板短信=======" + msg.getContent());
1855	1855	}
1856	1856	}
1857	1857