From b1dea863d6cf945d5d4a795928a79831211778e6 Mon Sep 17 00:00:00 2001 From: shiyang Date: Sat, 11 Dec 2021 20:04:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=89=8D=E4=BC=98=E7=94=9F=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E7=9C=81=E5=B9=B3=E5=8F=B0=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/hospitalapi/lhxfy/LhxfyService.java | 16 +++++++++++----- .../platform/operate/web/controller/TestController.java | 5 +++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java index 4740daa..0e3132a 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java @@ -958,8 +958,8 @@ public class LhxfyService { public BaseResponse uploadingProvince(List ids){ BaseResponse baseResponse=new BaseResponse();//返回结果对象 if(CollectionUtils.isEmpty(ids)){ - LogUtil.error("机构id-NULL", null); - baseResponse.setErrormsg("机构id-NULL"); + LogUtil.error("机构id:NULL", null); + baseResponse.setErrormsg("机构id:NULL"); return baseResponse; } List baseResponseList=new ArrayList<>();//记录错误信息 @@ -1422,9 +1422,15 @@ public class LhxfyService { MongoCondition con2 = MongoCondition.newInstance("isUploadingProvince",false, MongoOper.EXISTS); query.addCriteria(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria()); //检查结果时间 - query.addCriteria(Criteria.where("resultadvice.fillDate").gte(DateUtil.getyyyy_MM_dd(start)).lte(DateUtil.getyyyy_MM_dd(end))); - //查询院内孕前优生档案 - List ids = mongoTemplate.find(query,String.class,"id"); + query.addCriteria(Criteria.where("resultAdvice.fillDate").gte(DateUtil.getyyyy_MM_dd(start)).lte(DateUtil.getyyyy_MM_dd(end))); + //只返回id字段 + query.fields().include("_id"); + //查询院内孕前优生档案id集合 + List ids = new ArrayList<>(); + for (PreEugenicsBaseModel model : mongoTemplate.find(query, PreEugenicsBaseModel.class)) { + ids.add(model.getId()); + } + //上传省平台 uploadingProvince(ids); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index f956a64..572fe56 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -4937,4 +4937,9 @@ public class TestController extends BaseController { return ""; } + @RequestMapping(value = "/test/a", method = RequestMethod.GET) + @ResponseBody + public void testa() { + lhxfyService.uploadingProvinceTask("2100001605", DateUtil.parseYMD("2021-12-09"), DateUtil.parseYMD("2021-12-10")); + } } -- 1.8.3.1