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 62a64af..f618d79 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 @@ -6,8 +6,16 @@ import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.dao.operator.Page; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.pojo.AntenatalExaminationModel; import com.lyms.platform.pojo.Patients; +import com.mongodb.DBCollection; +import com.mongodb.DBObject; +import com.mongodb.MapReduceCommand; +import com.mongodb.MapReduceOutput; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.aggregation.Aggregation; import org.springframework.data.mongodb.core.aggregation.AggregationOperation; import org.springframework.data.mongodb.core.aggregation.AggregationResults; @@ -16,6 +24,7 @@ import org.springframework.stereotype.Repository; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -64,9 +73,28 @@ public class AntenatalExaminationDaoImpl extends BaseMongoDAOImpl queryYuyueAntenatalExamination(Date yuYueDate,String hospitalId) { AggregationOperation match = Aggregation.match(Criteria.where("nextCheckTime").gte(yuYueDate).lte(yuYueDate).and("hospitalId").is(hospitalId)); AggregationOperation group = Aggregation.group("parentId").max("created").as("created"); - Aggregation aggregation = Aggregation.newAggregation(match, group); + Aggregation aggregation = Aggregation.newAggregation(group,match); AggregationResults result = this.mongoTemplate.aggregate(aggregation, "lyms_antex", AntenatalExaminationModel.class); return result.getMappedResults(); +// AggregationOperation match = Aggregation.match(Criteria.where("hospitalId").is(hospitalId)); +// 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); +// +// +// List fuzs = result.getMappedResults(); +// +// for (AntenatalExaminationModel f : fuzs) { +// String parentId = f.getId(); //这里的id就是parentid +// MongoCondition condition = MongoCondition.newInstance("parentId", parentId, MongoOper.IS).and("yn", YnEnums.YES.getId(), MongoOper.IS).and("nextCheckTime", yuYueDate, MongoOper.IS); +// MongoQuery query = condition.toMongoQuery().addOrder(Sort.Direction.DESC, "created"); +// List results = find(query.convertToMongoQuery()); +// if (CollectionUtils.isNotEmpty(results)) +// { +// +// } +// } +// return ; } @Override public List queryYuyueAntenatalExamination(Date startDate,String hospitalId,String parentId) { 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 fd972d9..db532aa 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 @@ -411,10 +411,10 @@ public class SmsServiceImpl implements SmsService{ babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setHospitalId(hospitalId); -// List buildType = new ArrayList(); -// buildType.add(1); -// buildType.add(2); -// babyQuery.setBuildTypeList(buildType); + List buildType = new ArrayList(); + buildType.add(1); + buildType.add(2); + babyQuery.setBuildTypeList(buildType); //儿童年龄满三岁就不在提供短信服务 Date birthdayMax = DateUtil.addYear(new Date(), -3); @@ -689,7 +689,7 @@ public class SmsServiceImpl implements SmsService{ SmsConfigQuery configQuery = new SmsConfigQuery(); configQuery.setYn(YnEnums.YES.getId()); configQuery.setPrefixTypes(new Integer[]{0, 1}); - // configQuery.setHospitalId(221 + ""); + configQuery.setHospitalId(221 + ""); //查询出对应医院配置 List configs = smsConfigService.querySmsConfig(configQuery); @@ -732,13 +732,11 @@ public class SmsServiceImpl implements SmsService{ //循环每一个模板，根据模板条件查询到用户 发送短信 for (SmsTemplateModel template : templates) { - // if (!("57d605380cf2e638ab9a7036".equals(template.getId())) ) // { // continue; // } - //模板属于的医院id String tempHid = template.getHospitalId(); @@ -751,7 +749,6 @@ public class SmsServiceImpl implements SmsService{ //消息类型 Integer smsType = template.getSmsType(); - //发送时间 SendTimeEnums DT(0,"当天"),QYT(1,"前一天"),QLT(2,"前两天"),QST(3,"前三天"); Integer sendTimeType = template.getSendTimeType(); @@ -759,7 +756,6 @@ public class SmsServiceImpl implements SmsService{ continue; } - //false 表示该服务没有启动 smsType为消息类型 boolean isStart = isStartTemplate(config, smsType); if (!isStart) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 1dae0c2..9212efd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -493,13 +493,14 @@ public class MatDeliverFacade { personModel.setCreated(new Date()); babyModel.setPid(personService.addPerson(personModel).getId()); + ExceptionUtils.catchException("分娩---------->" + babyModel.getMphone() + ";name=" + babyModel.getName()); - ExceptionUtils.catchException("分娩---------->"+babyModel.getMphone()+";name="+babyModel.getName()); + } + babyIds.add(babyService.addOneBaby(babyModel).getId()); + if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { //儿童建档 babyBookbuildingFacade.createBuildSms(babyModel); - } - babyIds.add(babyService.addOneBaby(babyModel).getId()); i++; }