Commit 60965d8c1e046f6e4e97eed32d8092b0d6c63758
1 parent
9f6fba296f
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 15 additions and 12 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java
View file @
60965d8
| ... | ... | @@ -230,10 +230,11 @@ |
| 230 | 230 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
| 231 | 231 | List<BabySpecialDiseaseClinicResult> babySpecialDiseaseClinicResults = new ArrayList<>(); |
| 232 | 232 | //单人多条专病记录 |
| 233 | + List<BabySpecialDiseaseClinicModel> babySpecialDiseaseClinicModels = new ArrayList<>(); | |
| 233 | 234 | if( StringUtils.isNotEmpty(babyQuery.getBuildId()) ){ |
| 234 | 235 | babyQuery.setYn(YnEnums.YES.getId()); |
| 235 | 236 | babyQuery.setHospitalId(hospitalId); |
| 236 | - List<BabySpecialDiseaseClinicModel> babySpecialDiseaseClinicModels = babySDCService.queryBabySpecialDiseaseClinicRecord(babyQuery); | |
| 237 | + babySpecialDiseaseClinicModels = babySDCService.queryBabySpecialDiseaseClinicRecord(babyQuery); | |
| 237 | 238 | br.setData(babySpecialDiseaseClinicModels); |
| 238 | 239 | br.setErrorcode(ErrorCodeConstants.SUCCESS); |
| 239 | 240 | br.setErrormsg("成功"); |
| ... | ... | @@ -242,15 +243,16 @@ |
| 242 | 243 | babyQuery.setNeed("true"); |
| 243 | 244 | babyQuery.setYn(YnEnums.YES.getId()); |
| 244 | 245 | babyQuery.setHospitalId(hospitalId); |
| 245 | - List<BabySpecialDiseaseClinicModel> babySpecialDiseaseClinicModels = babySDCService.queryBabySpecialDiseaseClinicRecord(babyQuery); | |
| 246 | - for (int i = 0; i < babySpecialDiseaseClinicModels.size(); i++) { | |
| 247 | - BabySpecialDiseaseClinicModel babySpecialDiseaseClinicModel = babySpecialDiseaseClinicModels.get(i); | |
| 248 | - BabySpecialDiseaseClinicResult babySpecialDiseaseClinicResult = new BabySpecialDiseaseClinicResult(); | |
| 249 | - if(babySpecialDiseaseClinicModel !=null ){ | |
| 250 | - babySpecialDiseaseClinicResult.convertToResult(babySpecialDiseaseClinicModel); | |
| 251 | - babySpecialDiseaseClinicResult.setHospitalName(CommonsHelper.getHospitalName(babySpecialDiseaseClinicModel.getHospitalId(), organizationService)); | |
| 252 | - babySpecialDiseaseClinicResults.add(babySpecialDiseaseClinicResult); | |
| 253 | - } | |
| 246 | + babySpecialDiseaseClinicModels = babySDCService.queryBabySpecialDiseaseClinicRecord(babyQuery); | |
| 247 | + | |
| 248 | + } | |
| 249 | + for (int i = 0; i < babySpecialDiseaseClinicModels.size(); i++) { | |
| 250 | + BabySpecialDiseaseClinicModel babySpecialDiseaseClinicModel = babySpecialDiseaseClinicModels.get(i); | |
| 251 | + BabySpecialDiseaseClinicResult babySpecialDiseaseClinicResult = new BabySpecialDiseaseClinicResult(); | |
| 252 | + if(babySpecialDiseaseClinicModel !=null ){ | |
| 253 | + babySpecialDiseaseClinicResult.convertToResult(babySpecialDiseaseClinicModel); | |
| 254 | + babySpecialDiseaseClinicResult.setHospitalName(CommonsHelper.getHospitalName(babySpecialDiseaseClinicModel.getHospitalId(), organizationService)); | |
| 255 | + babySpecialDiseaseClinicResults.add(babySpecialDiseaseClinicResult); | |
| 254 | 256 | } |
| 255 | 257 | } |
| 256 | 258 | br.setData(babySpecialDiseaseClinicResults); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
View file @
60965d8
| ... | ... | @@ -244,7 +244,7 @@ |
| 244 | 244 | * @Date: 2020/8/4 11:31 |
| 245 | 245 | */ |
| 246 | 246 | if(babyModel!=null && "2".equals(babyModel.getDisplayState())){// 2 是代表没有在眼保健建档的档案，null不处理历史数据 |
| 247 | - mongoTemplate.updateFirst(new Query(Criteria.where("id").is(babyEyeCheck.getBabyId())), Update.update("buildDateNoybj", new Date()), BabyModel.class); | |
| 247 | + mongoTemplate.updateFirst(new Query(Criteria.where("id").is(babyEyeCheck.getBabyId())), Update.update("buildDateNoybj", new Date()).set("displayState","1"), BabyModel.class); | |
| 248 | 248 | } |
| 249 | 249 | /*end*/ |
| 250 | 250 | // 添加追访眼保检查 |
| ... | ... | @@ -1011,6 +1011,7 @@ |
| 1011 | 1011 | System.out.println("2 去重后 "+babyIdsBabyModels.size()); |
| 1012 | 1012 | babyIds.addAll(babyIdsBabyModels); |
| 1013 | 1013 | } |
| 1014 | + babyIds = new ArrayList<String>(new LinkedHashSet<String>(babyIds)); | |
| 1014 | 1015 | System.out.println("总共档案条数 "+ babyIds.size()); |
| 1015 | 1016 | |
| 1016 | 1017 | |
| ... | ... | @@ -1018,7 +1019,7 @@ |
| 1018 | 1019 | Criteria cbaby = new Criteria(); |
| 1019 | 1020 | if (startBuildDate != null && endBuildDate != null) { |
| 1020 | 1021 | cbaby.and("buildDate").gte(startBuildDate).lt(DateUtil.addDay(endBuildDate, 1)).and("yn").ne("0").and("hospitalId").is(hospitalId); |
| 1021 | - //cbaby.orOperator(Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId)); | |
| 1022 | + cbaby.orOperator(Criteria.where("buildDateNoybj").gte(startBuildDate).lt(DateUtil.addDay(endBuildDate, 1))); | |
| 1022 | 1023 | List<BabyModel> jdbabyModels = mongoUtil.findField(BabyModel.class, cbaby, "id"); |
| 1023 | 1024 | babyIds = CollectionUtils.getId(jdbabyModels, "id", String.class); |
| 1024 | 1025 | } |