diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java index 7bfcc6f..0e6e883 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java @@ -82,6 +82,24 @@ public class BabyCheckModelQuery extends BaseQuery implements IConvertToNativeQu private Integer checkMonth; + private Date createdTimeStart; + private Date createdTimeEnd; + + public Date getCreatedTimeStart() { + return createdTimeStart; + } + + public void setCreatedTimeStart(Date createdTimeStart) { + this.createdTimeStart = createdTimeStart; + } + + public Date getCreatedTimeEnd() { + return createdTimeEnd; + } + + public void setCreatedTimeEnd(Date createdTimeEnd) { + this.createdTimeEnd = createdTimeEnd; + } @Override public MongoQuery convertToQuery() { @@ -175,6 +193,14 @@ public class BabyCheckModelQuery extends BaseQuery implements IConvertToNativeQu } } + if(null != createdTimeStart && createdTimeEnd != null){ + if(null != c){ + 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 f8f9c4b..b196744 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 @@ -79,6 +79,8 @@ public class CdGwInterface { private CouponMapper mapper; @Autowired private MongoTemplate mongoTemplate; + @Autowired + private BabyCheckService babyCheckService; //基本信息以及地址信息 public BaseObjectResponse saveBaseInfo(Patients patient) { @@ -4160,7 +4162,7 @@ public class CdGwInterface { */ public Map findGxHospital(String fyName){ - Connection conn = ConnTools.makeCsConnection(); + Connection conn = ConnTools.makeGwConnection(); PreparedStatement ps = null; ResultSet rs = null; Map map = new HashMap(); @@ -4392,7 +4394,7 @@ public class CdGwInterface { BaseObjectResponse br = null; Criteria c = null; c = Criteria.where("created").lt(DateUtil.parseYMDHMS(startDate)).lte(DateUtil.parseYMDHMS(endDate)); - List visit = mongoTemplate.find(Query.query(c),NewbornVisit.class); + List visit = mongoTemplate.find(Query.query(c), NewbornVisit.class); if(visit != null && visit.size() > 0){ for(NewbornVisit newbornVisit : visit){ br = saveChild_HomeVisit_Memo(newbornVisit); @@ -4402,11 +4404,38 @@ public class CdGwInterface { } + /** + * 承德智业儿保调用方法 + * @param startDate + * @param endDate + * @return + */ + public BaseObjectResponse saveEb(String startDate,String endDate){ + BaseObjectResponse br = null; + BabyCheckModelQuery babyQuery = new BabyCheckModelQuery(); + babyQuery.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate)); + babyQuery.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate)); + List list = babyCheckService.queryBabyCheckRecord(babyQuery); + if(list != null && list.size() > 0){ + for(BabyCheckModel babyCheckModel : list){ + br = saveChild_HealthExam(babyCheckModel); + } + } + return br; + } + + public void handleWork() { java.util.Date end = new java.util.Date(); - java.util.Date start = new java.util.Date(end.getTime()-1000*60*60); + + Calendar ca = Calendar.getInstance(); + ca.setTime(end); + ca.add(Calendar.DATE,-1); + java.util.Date start = ca.getTime(); + //java.util.Date start = new java.util.Date(end.getTime()-1000*60*60); + String startDate = DateUtil.getyyyy_MM_dd_hms(start); String endDate = DateUtil.getyyyy_MM_dd_hms(end); System.out.println("start=" + startDate + "end=" + endDate); @@ -4418,7 +4447,7 @@ public class CdGwInterface { saveChFc(startDate, endDate); saveEtDa(startDate, endDate); saveXsrFs(startDate, endDate); - + saveEb(startDate, endDate); } }