From 60965d8c1e046f6e4e97eed32d8092b0d6c63758 Mon Sep 17 00:00:00 2001 From: wtt Date: Tue, 4 Aug 2020 14:34:37 +0800 Subject: [PATCH] update --- .../web/facade/BabySpecialDiseaseClinicFacade.java | 22 ++++++++++++---------- .../web/service/impl/BabyEyeCheckServiceImpl.java | 5 +++-- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java index 4cf2a2c..605c2f8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java @@ -230,10 +230,11 @@ public class BabySpecialDiseaseClinicFacade extends BaseServiceImpl { String hospitalId = autoMatchFacade.getHospitalId(userId); List babySpecialDiseaseClinicResults = new ArrayList<>(); //单人多条专病记录 + List babySpecialDiseaseClinicModels = new ArrayList<>(); if( StringUtils.isNotEmpty(babyQuery.getBuildId()) ){ babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setHospitalId(hospitalId); - List babySpecialDiseaseClinicModels = babySDCService.queryBabySpecialDiseaseClinicRecord(babyQuery); + babySpecialDiseaseClinicModels = babySDCService.queryBabySpecialDiseaseClinicRecord(babyQuery); br.setData(babySpecialDiseaseClinicModels); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); @@ -242,15 +243,16 @@ public class BabySpecialDiseaseClinicFacade extends BaseServiceImpl { babyQuery.setNeed("true"); babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setHospitalId(hospitalId); - List babySpecialDiseaseClinicModels = babySDCService.queryBabySpecialDiseaseClinicRecord(babyQuery); - for (int i = 0; i < babySpecialDiseaseClinicModels.size(); i++) { - BabySpecialDiseaseClinicModel babySpecialDiseaseClinicModel = babySpecialDiseaseClinicModels.get(i); - BabySpecialDiseaseClinicResult babySpecialDiseaseClinicResult = new BabySpecialDiseaseClinicResult(); - if(babySpecialDiseaseClinicModel !=null ){ - babySpecialDiseaseClinicResult.convertToResult(babySpecialDiseaseClinicModel); - babySpecialDiseaseClinicResult.setHospitalName(CommonsHelper.getHospitalName(babySpecialDiseaseClinicModel.getHospitalId(), organizationService)); - babySpecialDiseaseClinicResults.add(babySpecialDiseaseClinicResult); - } + babySpecialDiseaseClinicModels = babySDCService.queryBabySpecialDiseaseClinicRecord(babyQuery); + + } + for (int i = 0; i < babySpecialDiseaseClinicModels.size(); i++) { + BabySpecialDiseaseClinicModel babySpecialDiseaseClinicModel = babySpecialDiseaseClinicModels.get(i); + BabySpecialDiseaseClinicResult babySpecialDiseaseClinicResult = new BabySpecialDiseaseClinicResult(); + if(babySpecialDiseaseClinicModel !=null ){ + babySpecialDiseaseClinicResult.convertToResult(babySpecialDiseaseClinicModel); + babySpecialDiseaseClinicResult.setHospitalName(CommonsHelper.getHospitalName(babySpecialDiseaseClinicModel.getHospitalId(), organizationService)); + babySpecialDiseaseClinicResults.add(babySpecialDiseaseClinicResult); } } br.setData(babySpecialDiseaseClinicResults); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index fc3fd78..019e265 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -244,7 +244,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC * @Date: 2020/8/4 11:31 */ if(babyModel!=null && "2".equals(babyModel.getDisplayState())){// 2 是代表没有在眼保健建档的档案，null不处理历史数据 - mongoTemplate.updateFirst(new Query(Criteria.where("id").is(babyEyeCheck.getBabyId())), Update.update("buildDateNoybj", new Date()), BabyModel.class); + mongoTemplate.updateFirst(new Query(Criteria.where("id").is(babyEyeCheck.getBabyId())), Update.update("buildDateNoybj", new Date()).set("displayState","1"), BabyModel.class); } /*end*/ // 添加追访眼保检查 @@ -1011,6 +1011,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC System.out.println("2 去重后 "+babyIdsBabyModels.size()); babyIds.addAll(babyIdsBabyModels); } + babyIds = new ArrayList(new LinkedHashSet(babyIds)); System.out.println("总共档案条数 "+ babyIds.size()); @@ -1018,7 +1019,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC Criteria cbaby = new Criteria(); if (startBuildDate != null && endBuildDate != null) { cbaby.and("buildDate").gte(startBuildDate).lt(DateUtil.addDay(endBuildDate, 1)).and("yn").ne("0").and("hospitalId").is(hospitalId); - //cbaby.orOperator(Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId)); + cbaby.orOperator(Criteria.where("buildDateNoybj").gte(startBuildDate).lt(DateUtil.addDay(endBuildDate, 1))); List jdbabyModels = mongoUtil.findField(BabyModel.class, cbaby, "id"); babyIds = CollectionUtils.getId(jdbabyModels, "id", String.class); } -- 1.8.3.1