From fa5ac74d1d9cbe63bd3a04dbf0db93ba9e1c2af9 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Sun, 9 Sep 2018 23:11:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E5=85=AC=E5=8D=AB=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/hospitalapi/qhdfy/QhdJbgwInterface.java | 115 +++++++++++++-------- 1 file changed, 72 insertions(+), 43 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java index 344853b..6764cbf 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java @@ -194,20 +194,25 @@ public class QhdJbgwInterface { * @return */ public List> getChuZhen(String startDate,String endDate){ + List allList = null; List list = null; + List list1 = null; List> mList = new ArrayList>(); AntExChuQuery antExChuQuery1 = new AntExChuQuery(); antExChuQuery1.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate)); antExChuQuery1.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate)); list = antExService.queryAntExChu(antExChuQuery1); - if(list == null || list.size() == 0){ - AntExChuQuery antExChuQuery = new AntExChuQuery(); - antExChuQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate)); - antExChuQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate)); - list = antExService.queryAntExChu(antExChuQuery); + + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate)); + antExChuQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate)); + list1 = antExService.queryAntExChu(antExChuQuery); + if((list != null && list.size() > 0) || (list1 != null && list1.size() > 0)){ + allList.addAll(list); + allList.addAll(list1); } - if(list != null && list.size() > 0){ - for(AntExChuModel antExChuModel : list){ + if(allList != null && allList.size() > 0){ + for(AntExChuModel antExChuModel : allList){ try{ Patients patients = patientsService.findOnePatientById(antExChuModel.getParentId()); if("2100001705".equals(patients.getHospitalId())){ @@ -498,20 +503,25 @@ public class QhdJbgwInterface { * @return */ public List> getFuZhen(String startDate,String endDate){ + List allList = null; + List list1 = null; List list = null; List> mList = new ArrayList>(); AntExQuery antExQuery1 = new AntExQuery(); antExQuery1.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate)); antExQuery1.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate)); list = antExService.queryAntenatalExamination(antExQuery1.convertToQuery().addOrder(Sort.Direction.DESC, "created")); - if(null == list || list.size() == 0){ - AntExQuery antExQuery = new AntExQuery(); - antExQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate)); - antExQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate)); - list = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); + + AntExQuery antExQuery = new AntExQuery(); + antExQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate)); + antExQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate)); + list1 = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); + if((null != list && list.size() > 0) || (null != list1 && list1.size() > 0)){ + allList.addAll(list); + allList.addAll(list1); } - if(list != null && list.size() > 0){ - for(AntenatalExaminationModel data : list){ + if(allList != null && allList.size() > 0){ + for(AntenatalExaminationModel data : allList){ try{ Patients patients = patientsService.findOnePatientById(data.getParentId()); if("2100001705".equals(patients.getHospitalId())){ @@ -859,21 +869,26 @@ public class QhdJbgwInterface { * @return */ public List> getXse(String startDate,String endDate){ + List allModels = null; + List models1 = null; List models = null; List> mList = new ArrayList>(); BabyModelQuery babyQuery1 = new BabyModelQuery(); babyQuery1.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate)); babyQuery1.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate)); models = babyBookbuildingService.queryBabyBuildByCond(babyQuery1); - if(null == models || models.size() == 0){ - BabyModelQuery babyQuery = new BabyModelQuery(); - babyQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate)); - babyQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate)); - babyQuery.setYn(YnEnums.YES.getId()); - models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate)); + babyQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate)); + babyQuery.setYn(YnEnums.YES.getId()); + models1 = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + if((null != models && models.size() > 0) || (null != models1 && models1.size() > 0)){ + allModels.addAll(models); + allModels.addAll(models1); } - if(models != null && models.size() > 0){ - for(BabyModel babyModel : models){ + if(allModels != null && allModels.size() > 0){ + for(BabyModel babyModel : allModels){ try{ Patients patients = patientsService.findOnePatientById(babyModel.getParentId()); if("2100001705".equals(patients.getHospitalId())){ @@ -939,21 +954,26 @@ public class QhdJbgwInterface { * @return */ public List> getChfs(String startDate,String endDate){ + List allList = null; + List list1 = null; List list = null; List> mList = new ArrayList>(); MatDeliverFollowQuery deliverQuery1 = new MatDeliverFollowQuery(); deliverQuery1.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate)); deliverQuery1.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate)); list = matDeliverFollowService.query(deliverQuery1); - if(null == list || list.size() == 0){ - MatDeliverFollowQuery deliverQuery = new MatDeliverFollowQuery(); - deliverQuery.setUpdateDateStart(DateUtil.parseYMDHMS(startDate)); - deliverQuery.setUpdateDateEnd(DateUtil.parseYMDHMS(endDate)); - list = matDeliverFollowService.query(deliverQuery); + + MatDeliverFollowQuery deliverQuery = new MatDeliverFollowQuery(); + deliverQuery.setUpdateDateStart(DateUtil.parseYMDHMS(startDate)); + deliverQuery.setUpdateDateEnd(DateUtil.parseYMDHMS(endDate)); + list1 = matDeliverFollowService.query(deliverQuery); + if((null != list && list.size() > 0) || (null != list1 && list1.size() > 0)){ + allList.addAll(list); + allList.addAll(list1); } - if(list != null && list.size() > 0){ + if(allList != null && allList.size() > 0){ - for(MatdeliverFollowModel data : list){ + for(MatdeliverFollowModel data : allList){ try{ Map map = new HashMap(); //根据分娩ID查询孕妇基本信息 @@ -1077,20 +1097,24 @@ public class QhdJbgwInterface { * @return */ public List> getCh42fs(String startDate,String endDate){ + List allList = null; + List list1 = null; List list = null; List> mList = new ArrayList>(); PostReviewQuery mongoQuery1 = new PostReviewQuery(); mongoQuery1.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate)); mongoQuery1.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate)); list = postReviewService.findWithList(mongoQuery1); - if(null == list || list.size() == 0){ - PostReviewQuery mongoQuery = new PostReviewQuery(); - mongoQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate)); - mongoQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate)); - list = postReviewService.findWithList(mongoQuery); + + PostReviewQuery mongoQuery = new PostReviewQuery(); + mongoQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate)); + mongoQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate)); + list1 = postReviewService.findWithList(mongoQuery); + if((null != list && list.size() > 0) && (null != list1 && list1.size() > 0)){ + } - if(list != null && list.size() > 0){ - for(PostReviewModel data : list){ + if(allList != null && allList.size() > 0){ + for(PostReviewModel data : allList){ try{ Patients patients = patientsService.findOnePatientById(data.getParentId()); if("2100001705".equals(patients.getHospitalId())){ @@ -1524,20 +1548,25 @@ public class QhdJbgwInterface { * @return */ public List> getEb(String startDate,String endDate){ + List allList = null; + List list1 = null; List list = null; List> mList = new ArrayList>(); BabyCheckModelQuery babyQuery1 = new BabyCheckModelQuery(); babyQuery1.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate)); babyQuery1.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate)); list = babyCheckService.queryBabyCheckRecord(babyQuery1); - if(null == list || list.size() == 0){ - BabyCheckModelQuery babyQuery = new BabyCheckModelQuery(); - babyQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate)); - babyQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate)); - list = babyCheckService.queryBabyCheckRecord(babyQuery); + + BabyCheckModelQuery babyQuery = new BabyCheckModelQuery(); + babyQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate)); + babyQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate)); + list1 = babyCheckService.queryBabyCheckRecord(babyQuery); + if((null != list && list.size() > 0) || (null != list1 && list1.size() > 0)){ + allList.addAll(list); + allList.addAll(list1); } - if(list != null && list.size() > 0){ - for(BabyCheckModel babyCheckModel : list){ + if(allList != null && allList.size() > 0){ + for(BabyCheckModel babyCheckModel : allList){ try{ Map map = new HashMap(); BabyModelQuery babymQuery = new BabyModelQuery(); -- 1.8.3.1