diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index e9042cc..dc7b8c2 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -173,6 +173,25 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { //身长别体重 private String heightWeight; + private Date createdTimeStart; + private Date createdTimeEnd; + + public Date getCreatedTimeEnd() { + return createdTimeEnd; + } + + public void setCreatedTimeEnd(Date createdTimeEnd) { + this.createdTimeEnd = createdTimeEnd; + } + + public Date getCreatedTimeStart() { + return createdTimeStart; + } + + public void setCreatedTimeStart(Date createdTimeStart) { + this.createdTimeStart = createdTimeStart; + } + public List getHighRiskInfos() { return highRiskInfos; } @@ -894,6 +913,13 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { } } + if(null != createdTimeStart && createdTimeEnd != null){ + if(c != null){ + c = c.where("created").gte(createdTimeStart).lte(createdTimeEnd); + }else{ + c = Criteria.where("created").gte(createdTimeStart).lte(createdTimeEnd); + } + } if (c != null) { return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java index 7398c5b..673bd61 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java @@ -4354,6 +4354,29 @@ public class CdGwInterface { } + /** + * 承德智业儿童建档基本信息调用方法 + * @param startDate + * @param endDate + * @return + */ + public BaseObjectResponse saveEtDa(String startDate,String endDate){ + BaseObjectResponse br = null; + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate)); + babyQuery.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate)); + babyQuery.setYn(YnEnums.YES.getId()); + List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + if(models != null && models.size() > 0){ + for(BabyModel babyModel : models){ + br = saveChild_Info(babyModel); + } + } + return br; + } + + + public void handleWork() { @@ -4368,6 +4391,7 @@ public class CdGwInterface { saveFm(startDate, endDate); saveChFs(startDate, endDate); saveChFc(startDate, endDate); + saveEtDa(startDate, endDate); }