Commit 4dc9572a326e841f88beda85439f1bb562cd8b9e

Authored by gengxiaokai
1 parent cba12d7ff9
Exists in master and in 1 other branch dev

承德公共卫生定时任务

Showing 2 changed files with 59 additions and 4 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java View file @ 4dc9572
... ... @@ -82,7 +82,25 @@
82 82  
83 83 private Integer checkMonth;
84 84  
  85 + private Date createdTimeStart;
  86 + private Date createdTimeEnd;
85 87  
  88 + public Date getCreatedTimeStart() {
  89 + return createdTimeStart;
  90 + }
  91 +
  92 + public void setCreatedTimeStart(Date createdTimeStart) {
  93 + this.createdTimeStart = createdTimeStart;
  94 + }
  95 +
  96 + public Date getCreatedTimeEnd() {
  97 + return createdTimeEnd;
  98 + }
  99 +
  100 + public void setCreatedTimeEnd(Date createdTimeEnd) {
  101 + this.createdTimeEnd = createdTimeEnd;
  102 + }
  103 +
86 104 @Override
87 105 public MongoQuery convertToQuery() {
88 106 MongoCondition condition = MongoCondition.newInstance();
... ... @@ -172,6 +190,14 @@
172 190 c = c.lte(checkMonthEnd);
173 191 } else {
174 192 c = Criteria.where("checkMonth").lte(checkMonthEnd);
  193 + }
  194 + }
  195 +
  196 + if(null != createdTimeStart && createdTimeEnd != null){
  197 + if(null != c){
  198 + c = c.where("created").gte(createdTimeStart).lte(createdTimeEnd);
  199 + }else{
  200 + c = Criteria.where("created").gte(createdTimeStart).lte(createdTimeEnd);
175 201 }
176 202 }
177 203  
platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java View file @ 4dc9572
... ... @@ -79,6 +79,8 @@
79 79 private CouponMapper mapper;
80 80 @Autowired
81 81 private MongoTemplate mongoTemplate;
  82 + @Autowired
  83 + private BabyCheckService babyCheckService;
82 84  
83 85 //基本信息以及地址信息
84 86 public BaseObjectResponse saveBaseInfo(Patients patient) {
... ... @@ -4160,7 +4162,7 @@
4160 4162 */
4161 4163 public Map<String,String> findGxHospital(String fyName){
4162 4164  
4163   - Connection conn = ConnTools.makeCsConnection();
  4165 + Connection conn = ConnTools.makeGwConnection();
4164 4166 PreparedStatement ps = null;
4165 4167 ResultSet rs = null;
4166 4168 Map<String,String> map = new HashMap<String,String>();
... ... @@ -4392,7 +4394,7 @@
4392 4394 BaseObjectResponse br = null;
4393 4395 Criteria c = null;
4394 4396 c = Criteria.where("created").lt(DateUtil.parseYMDHMS(startDate)).lte(DateUtil.parseYMDHMS(endDate));
4395   - List<NewbornVisit> visit = mongoTemplate.find(Query.query(c),NewbornVisit.class);
  4397 + List<NewbornVisit> visit = mongoTemplate.find(Query.query(c), NewbornVisit.class);
4396 4398 if(visit != null && visit.size() > 0){
4397 4399 for(NewbornVisit newbornVisit : visit){
4398 4400 br = saveChild_HomeVisit_Memo(newbornVisit);
4399 4401  
4400 4402  
... ... @@ -4402,11 +4404,38 @@
4402 4404 }
4403 4405  
4404 4406  
  4407 + /**
  4408 + * 承德智业儿保调用方法
  4409 + * @param startDate
  4410 + * @param endDate
  4411 + * @return
  4412 + */
  4413 + public BaseObjectResponse saveEb(String startDate,String endDate){
  4414 + BaseObjectResponse br = null;
  4415 + BabyCheckModelQuery babyQuery = new BabyCheckModelQuery();
  4416 + babyQuery.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate));
  4417 + babyQuery.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
  4418 + List<BabyCheckModel> list = babyCheckService.queryBabyCheckRecord(babyQuery);
  4419 + if(list != null && list.size() > 0){
  4420 + for(BabyCheckModel babyCheckModel : list){
  4421 + br = saveChild_HealthExam(babyCheckModel);
  4422 + }
  4423 + }
  4424 + return br;
  4425 + }
4405 4426  
4406 4427  
  4428 +
  4429 +
4407 4430 public void handleWork() {
4408 4431 java.util.Date end = new java.util.Date();
4409   - java.util.Date start = new java.util.Date(end.getTime()-1000*60*60);
  4432 +
  4433 + Calendar ca = Calendar.getInstance();
  4434 + ca.setTime(end);
  4435 + ca.add(Calendar.DATE,-1);
  4436 + java.util.Date start = ca.getTime();
  4437 + //java.util.Date start = new java.util.Date(end.getTime()-1000*60*60);
  4438 +
4410 4439 String startDate = DateUtil.getyyyy_MM_dd_hms(start);
4411 4440 String endDate = DateUtil.getyyyy_MM_dd_hms(end);
4412 4441 System.out.println("start=" + startDate + "end=" + endDate);
... ... @@ -4418,7 +4447,7 @@
4418 4447 saveChFc(startDate, endDate);
4419 4448 saveEtDa(startDate, endDate);
4420 4449 saveXsrFs(startDate, endDate);
4421   -
  4450 + saveEb(startDate, endDate);
4422 4451 }
4423 4452  
4424 4453 }