diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntenatalExaminationDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntenatalExaminationDaoImpl.java index e6acf2c..cedd601 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntenatalExaminationDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntenatalExaminationDaoImpl.java @@ -78,7 +78,7 @@ public class AntenatalExaminationDaoImpl extends BaseMongoDAOImpl result = this.mongoTemplate.aggregate(aggregation, "lyms_antex", AntenatalExaminationModel.class); @@ -109,7 +109,7 @@ public class AntenatalExaminationDaoImpl extends BaseMongoDAOImpl queryYuyueAntenatalExamination(Date startDate,String hospitalId,String parentId) { - AggregationOperation match = Aggregation.match(Criteria.where("nextCheckTime").gte(startDate).and("parentId").is(parentId).and("hospitalId").is(hospitalId)); + AggregationOperation match = Aggregation.match(Criteria.where("nextCheckTime").gte(startDate).and("parentId").is(parentId).and("hospitalId").is(hospitalId).and("yn").is(1)); AggregationOperation group = Aggregation.group("parentId").max("created").as("created"); Aggregation aggregation = Aggregation.newAggregation(match, group); AggregationResults result = this.mongoTemplate.aggregate(aggregation, "lyms_antex", AntenatalExaminationModel.class); diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyBookbuildingDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyBookbuildingDaoImpl.java index c6127b1..669fa70 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyBookbuildingDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyBookbuildingDaoImpl.java @@ -60,7 +60,7 @@ public class BabyBookbuildingDaoImpl extends BaseMongoDAOImpl impleme // AggregationResults result = this.mongoTemplate.aggregate(aggregation, "lyms_babycheck", BabyCheckModel.class); // return result.getMappedResults(); - AggregationOperation match = Aggregation.match(Criteria.where("nextDate").gte(yuYueDate).lte(yuYueDate).and("hospitalId").is(hospitalId)); + AggregationOperation match = Aggregation.match(Criteria.where("nextDate").gte(yuYueDate).lte(yuYueDate).and("hospitalId").is(hospitalId).and("yn").is(1)); AggregationOperation group = Aggregation.group("buildId").max("created").as("created"); Aggregation aggregation = Aggregation.newAggregation(match, group); AggregationResults result = this.mongoTemplate.aggregate(aggregation, "lyms_babycheck", BabyCheckModel.class); @@ -69,7 +69,7 @@ public class BabyBookbuildingDaoImpl extends BaseMongoDAOImpl impleme @Override public List queryBabyOrder(Date startDate, String hospitalId, String buildId) { - AggregationOperation match = Aggregation.match(Criteria.where("nextDate").gte(startDate).lte(startDate).and("buildId").is(buildId)); + AggregationOperation match = Aggregation.match(Criteria.where("nextDate").gte(startDate).lte(startDate).and("buildId").is(buildId).and("yn").is(1)); AggregationOperation group = Aggregation.group("buildId").max("created").as("created"); Aggregation aggregation = Aggregation.newAggregation(match, group); AggregationResults result = this.mongoTemplate.aggregate(aggregation, "lyms_babycheck", BabyCheckModel.class); diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java index 6df90e7..0e976c2 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java @@ -354,7 +354,7 @@ public class SmsServiceImpl implements SmsService{ for (MessageRequest msg :allMsgs) { - System.out.println("孕妇ams短信=======" + msg.getContent()); + System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"孕妇ams短信=======" + msg.getContent()); } } @@ -529,7 +529,7 @@ public class SmsServiceImpl implements SmsService{ for (MessageRequest msg :allMsgs) { - System.out.println("儿童ams短信=======" + msg.getContent()); + System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"儿童ams短信=======" + msg.getContent()); } @@ -654,7 +654,7 @@ public class SmsServiceImpl implements SmsService{ for (MessageRequest msg :allMsgs) { - System.out.println("产妇ams短信=======" + msg.getContent()); + System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"产妇ams短信=======" + msg.getContent()); } @@ -1851,7 +1851,7 @@ public class SmsServiceImpl implements SmsService{ } for (MessageRequest msg :allMsgs) { - System.out.println("模板短信=======" + msg.getContent()); + System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"模板短信=======" + msg.getContent()); } }