From 2d896c3da6384b49d779f9f03005ca1d3e726dd3 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Fri, 10 Dec 2021 12:23:33 +0800 Subject: [PATCH] update --- .../com/lyms/hospitalapi/lhxfy/LhxfyService.java | 50 +++++++++++++++++++--- 1 file changed, 44 insertions(+), 6 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 dc371d6..4740daa 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 @@ -3,6 +3,8 @@ package com.lyms.hospitalapi.lhxfy; import com.lyms.hospitalapi.lhxfy.model.UploadResult; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.ResidentsArchiveService; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; @@ -954,8 +956,13 @@ public class LhxfyService { private static final String URL = "http://39.101.222.193:8088";//测试 private static final String KEY = "27d7bc6992724608bbfa0775a31c4b38";//沧州测试key public BaseResponse uploadingProvince(List ids){ - BaseResponse baseResponse=new BaseResponse(); - List baseResponseList=new ArrayList<>(); + BaseResponse baseResponse=new BaseResponse();//返回结果对象 + if(CollectionUtils.isEmpty(ids)){ + LogUtil.error("机构id-NULL", null); + baseResponse.setErrormsg("机构id-NULL"); + return baseResponse; + } + List baseResponseList=new ArrayList<>();//记录错误信息 Query query = new Query(); //批量ID上传。 query.addCriteria(Criteria.where("id").in(ids)); @@ -1160,7 +1167,7 @@ public class LhxfyService { mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); LogUtil.error("服务器返回：上传失败，list5:"+preEugenicsBaseModel.getId()+";code:" + list5.get(0).getCode() + ";msg:" + list5.get(0).getMsg() + ";type:" + list5.get(0).getType(), null); - baseResponseList.add(";code:"+ list5.get(0).getCode() + ";msg:" + list5.get(0).getMsg() + baseResponseList.add("code:"+ list5.get(0).getCode() + ";msg:" + list5.get(0).getMsg() + ";type:" + list5.get(0).getType()+";"+preEugenicsBaseModel.getId()); } } else { @@ -1195,7 +1202,7 @@ public class LhxfyService { mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class); LogUtil.error("服务器返回：上传失败，list6:"+preEugenicsBaseModel.getId()+";code:" + list6.get(0).getCode() + ";msg:" + list6.get(0).getMsg() + ";type:" + list6.get(0).getType(), null); - baseResponseList.add(";code:"+ list6.get(0).getCode() + ";msg:" + list6.get(0).getMsg() + baseResponseList.add("code:"+ list6.get(0).getCode() + ";msg:" + list6.get(0).getMsg() + ";type:" + list6.get(0).getType()+";"+preEugenicsBaseModel.getId()); } } else { @@ -1228,7 +1235,7 @@ public class LhxfyService { mongoTemplate.updateFirst(baseQuery7, update7, PreEugenicsBaseModel.class); LogUtil.error("服务器返回：上传失败，list7:"+preEugenicsBaseModel.getId()+";code:" +list7.get(0).getCode()+";msg:"+list7.get(0).getMsg()+";type:"+list7.get(0).getType(),null); - baseResponseList.add(";code:"+ list7.get(0).getCode() + ";msg:" + list7.get(0).getMsg() + baseResponseList.add("code:"+ list7.get(0).getCode() + ";msg:" + list7.get(0).getMsg() + ";type:" + list7.get(0).getType()+";"+preEugenicsBaseModel.getId()); } }else { @@ -1291,7 +1298,7 @@ public class LhxfyService { mongoTemplate.updateFirst(baseQuery1, update1, PreEugenicsBaseModel.class); LogUtil.error("服务器返回：上传失败，list1:"+preEugenicsBaseModel.getId()+";code:" +list1.get(0).getCode()+";msg:"+list1.get(0).getMsg()+";type:"+list1.get(0).getType(),null); - baseResponseList.add(";code:"+ list1.get(0).getCode() + ";msg:" + list1.get(0).getMsg() + baseResponseList.add("code:"+ list1.get(0).getCode() + ";msg:" + list1.get(0).getMsg() + ";type:" + list1.get(0).getType()+";"+preEugenicsBaseModel.getId()); } }else { @@ -1389,6 +1396,37 @@ public class LhxfyService { return "130825100227"; } + /** + * 孕前优生-上传省平台定时任务 + * @param hospitalId //必传机构id + * @param start //不传默认当前时间30天前 + * @param end //不传默认当前时间 + */ + public void uploadingProvinceTask(String hospitalId,Date start,Date end){ + if(StringUtils.isEmpty(hospitalId)){ + LogUtil.error("需要指定机构id", null); + return; + } + if(start==null){ + start = DateUtil.addDay(new Date(),-30);//当前时间30天前 + } + if(end==null){ + end = new Date(); + } + Query query = new Query(); + //机构 + query.addCriteria(Criteria.where("hospitalId").is(hospitalId)); + //查询上传失败或者没有上传过的 + MongoCondition c = MongoCondition.newInstance(); + MongoCondition con1 = MongoCondition.newInstance("isUploadingProvince", 0, MongoOper.IS); + 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"); + uploadingProvince(ids); + } public static final String LHFY_HIS_URL = PropertiesUtils.getPropertyValue("lhfy_his_url"); -- 1.8.3.1