From 6b88f5fc6179ba45925f2786cf21b99daef4b4af Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 23 Jun 2021 10:22:37 +0800 Subject: [PATCH] update --- .../platform/common/enums/EyeExaminationEnums.java | 20 +++++++---- .../web/service/impl/BabyEyeCheckServiceImpl.java | 40 ++++++++++++++++++---- 2 files changed, 47 insertions(+), 13 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/EyeExaminationEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/EyeExaminationEnums.java index bdfc50a..005b6ed 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/EyeExaminationEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/EyeExaminationEnums.java @@ -12,12 +12,20 @@ import java.util.Map; */ public enum EyeExaminationEnums { - YGY(1,"建议1个月复查"), - NGY(2,"建议2个月复查"), - SGY(3,"建议3个月复查"), - LGY(4,"建议6个月复查"), - JYB(5,"建议进一步检查"), - PHJC(9,"配合检查"); +// YGY(1,"建议1个月复查"), +// NGY(2,"建议2个月复查"), +// SGY(3,"建议3个月复查"), +// LGY(4,"建议6个月复查"), +// JYB(5,"建议进一步检查"), +// PHJC(9,"配合检查"); + + ONE(70, "请于1周后复查"), + TWO(140, "请于2周后复查"), + THREE(10, "请于1月后复查"), + FOUR(20, "请于2月后复查"), + FIVE(30, "请于3月后复查"), + SIX(60, "请于6月后复查"), + SEVEN(120, "请于1年后复查"); private EyeExaminationEnums(int id, String name) { this.id = id; 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 7957193..337d1cd 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 @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.service.impl; import com.lyms.platform.biz.service.BabyBookbuildingService; +import com.lyms.platform.biz.service.BabyCheckService; import com.lyms.platform.biz.service.YunBookbuildingService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.dao.BaseQuery; @@ -21,10 +22,7 @@ import com.lyms.platform.permission.dao.master.BabyEyeCheckMapper; import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; -import com.lyms.platform.pojo.BabyEyeCheck; -import com.lyms.platform.pojo.BabyModel; -import com.lyms.platform.pojo.FilePathModel; -import com.lyms.platform.pojo.Patients; +import com.lyms.platform.pojo.*; import com.lyms.platform.query.BabyModelQuery; import org.apache.commons.collections.map.HashedMap; import org.springframework.beans.factory.annotation.Autowired; @@ -63,7 +61,8 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC private OrganizationService organizationService; @Autowired private MongoUtil mongoUtil; - + @Autowired + private BabyCheckService babyCheckService; @Autowired private OrganizationGroupsFacade organizationGroupsFacade; @@ -344,10 +343,36 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC } else if (filePath != null) { yunBookbuildingService.updateFilePath(filePath); } - + updateBabyCheck( babyEyeCheck); return RespBuilder.buildSuccess(babyEyeCheck.getId()); } + + /** + * 眼保健检查的数据更新到儿童检查 + * @param babyEyeCheck + */ + public void updateBabyCheck(BabyEyeCheck babyEyeCheck) { + + System.out.println(babyEyeCheck.toString()); + System.out.println(babyEyeCheck.getId()); + Date firstSecond = DateUtil.getDayFirstSecond(new Date()); + Date dayLastSecond = DateUtil.getDayLastSecond(new Date()); + List babyCheckModels = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyEyeCheck.getBabyId()) + .and("yn").is(1).and("checkDate").gte(firstSecond).lte(dayLastSecond)) + .with(new Sort(Sort.Direction.DESC, "created")), BabyCheckModel.class); + + if (CollectionUtils.isNotEmpty(babyCheckModels)) { + BabyCheckModel checkModel = babyCheckModels.get(0); + checkModel.setEyeAppearance(babyEyeCheck.getEyeAppearance()); + checkModel.setEyeRedReflex(babyEyeCheck.getRedReflexQhd()); + checkModel.setEyeDioptroscopy(babyEyeCheck.getRefractiveScreening()); + babyCheckService.updateBabyCheck(checkModel,checkModel.getId()); + } + + } + + /** * 眼保健检查 上传 患者签名 * @@ -1816,7 +1841,8 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC temp.put("redReflexQhd", babyEyeCheck.getRedReflexQhd());//红光反射 temp.put("refractiveScreening", babyEyeCheck.getRefractiveScreening());//屈光筛查 temp.put("guidanceOpinions", babyEyeCheck.getGuidanceOpinions());//指导意见 - temp.put("handleOpinionsId", HandleOpinionsQhdEnums.getName(babyEyeCheck.getHandleOpinionsId()));//处理意见 id,历史数据不做匹配 +// temp.put("handleOpinionsId", HandleOpinionsQhdEnums.getName(babyEyeCheck.getHandleOpinionsId()));//处理意见 id,历史数据不做匹配 + temp.put("handleOpinionsId", babyEyeCheck.getHandleOpinionsId());//处理意见 id,历史数据不做匹配 } -- 1.8.3.1