Commit fdbb20323222bbcea7478dd39f83a43e2ddb7e52
1 parent
bd78952f22
Exists in
master
and in
6 other branches
体重
Showing 3 changed files with 48 additions and 1 deletions
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
View file @
fdbb203
... | ... | @@ -6630,6 +6630,43 @@ |
6630 | 6630 | } |
6631 | 6631 | |
6632 | 6632 | |
6633 | + | |
6634 | + //更新档案重复的情况 | |
6635 | + @RequestMapping(value = "/updatePatientRep", method = RequestMethod.GET) | |
6636 | + @ResponseBody | |
6637 | + public String updatePatientRep(String start,String end) { | |
6638 | + List<Patients> patients = mongoTemplate.find(Query.query(Criteria.where("hospitalId").is("216") | |
6639 | + .and("enable").is("2").and("created").gte(DateUtil.parseYMD(start)).lt(DateUtil.parseYMD(end))), Patients.class); | |
6640 | + if (CollectionUtils.isNotEmpty(patients)) { | |
6641 | + for (Patients pat : patients) { | |
6642 | + List<AntExChuModel> antExChuModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(pat.getId()). | |
6643 | + and("yn").is(YnEnums.YES.getId())), AntExChuModel.class); | |
6644 | + | |
6645 | + boolean isChu = true; | |
6646 | + boolean isFu = true; | |
6647 | + if (CollectionUtils.isNotEmpty(antExChuModels)) { | |
6648 | + isChu = false; | |
6649 | + } | |
6650 | + List<AntenatalExaminationModel> examinationModel = mongoTemplate.find(Query.query(Criteria.where("parentId"). | |
6651 | + is(pat.getId()).and("yn").is(YnEnums.YES.getId())), AntenatalExaminationModel.class); | |
6652 | + if (CollectionUtils.isNotEmpty(examinationModel)) { | |
6653 | + isFu = false; | |
6654 | + } | |
6655 | + if (isChu && isFu) { | |
6656 | + System.out.println("id=="+pat.getId()); | |
6657 | + pat.setYn(0); | |
6658 | + pat.setShortCode("del"); | |
6659 | + Query query1 = Query.query(Criteria.where("id").is(pat.getId())); | |
6660 | + Update update = MongoConvertHelper | |
6661 | + .convertToNativeUpdate(ReflectionUtils.getUpdateField(pat)); | |
6662 | + mongoTemplate.updateFirst(query1,update,Patients.class); | |
6663 | + } | |
6664 | + } | |
6665 | + } | |
6666 | + return "success"; | |
6667 | + | |
6668 | + } | |
6669 | + | |
6633 | 6670 | /** |
6634 | 6671 | * 查询一段时间内隆化县的双胎数量 |
6635 | 6672 | * @param start |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java
View file @
fdbb203
... | ... | @@ -278,12 +278,18 @@ |
278 | 278 | List<LhBabyEyeCheck> babyEyeChecks=lhBabyEyeCheckService.queryList(request,Sort.Direction.DESC,new String[]{"eyeCheckTime","created"}); |
279 | 279 | List<Map> result=new ArrayList<>(); |
280 | 280 | for (LhBabyEyeCheck babyCheck : babyEyeChecks) { |
281 | + if (babyCheck.getEyeHighRisk() == null) | |
282 | + { | |
283 | + babyCheck.setEyeHighRisk(new ArrayList<String>()); | |
284 | + } | |
281 | 285 | Map<String,Object> map=ReflectionUtils.beanToMap(babyCheck);//对象转map |
282 | 286 | map.put("sex",SexEnum.getTextById(babyCheck.getBabySex())); |
283 | 287 | map.put("eyeCheckDoctor",couponMapper.getUserName(babyCheck.getEyeCheckDoctor())); |
284 | 288 | //异常项 |
285 | 289 | map.put("abnormal",getAbnormal(babyCheck)); |
286 | 290 | map.put("abnormalInfo", getAbnormalInfo(babyCheck)); |
291 | + | |
292 | + | |
287 | 293 | result.add(map); |
288 | 294 | } |
289 | 295 | BaseObjectResponse br = new BaseObjectResponse(); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
View file @
fdbb203
... | ... | @@ -154,9 +154,13 @@ |
154 | 154 | pw = mongoTemplate.findOne(Query.query(Criteria.where("patientId").is(patients.getId()).and("hospitalId").is(hospitalId)), PatientWeight.class); |
155 | 155 | } |
156 | 156 | if (patients != null) {// 隐藏建档 |
157 | - patients = mongoTemplate.findOne(Query.query(Criteria.where("source").is( | |
157 | + Patients patients1 = mongoTemplate.findOne(Query.query(Criteria.where("source").is( | |
158 | 158 | patients.getSource() != null ? patients.getSource() : patients.getId() |
159 | 159 | ).and("hospitalId").is(hospitalId).and("enable").is("2")), Patients.class); |
160 | + if(patients1 != null) | |
161 | + { | |
162 | + patients = patients1; | |
163 | + } | |
160 | 164 | if (!hospitalId.equals(patients.getHospitalId())) |
161 | 165 | { |
162 | 166 | patients.setId(null); |