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 750cfac..dd5dec8 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 @@ -16,6 +16,7 @@ import com.lyms.platform.operate.web.service.BabyEyeCheckService; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.permission.dao.master.BabyEyeCheckMapper; +import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.pojo.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; @@ -53,6 +54,9 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye @Autowired private OrganizationGroupsFacade organizationGroupsFacade; + @Autowired + private CouponMapper couponMapper; + @Override public BaseObjectResponse init() { List> addSubtract = EnumUtil.toJson(AddSubtractEnums.class); /** (+) (一) 其他 */ @@ -86,6 +90,12 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye public BaseResponse info(String id) { BabyEyeCheck babyEyeCheck = mongoTemplate.findById(id, BabyEyeCheck.class); Map map = ReflectionUtils.beanToMap(babyEyeCheck); + map.put("checkTime", DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime())); + map.put("nextCheckTime", DateUtil.getYyyyMmDd(babyEyeCheck.getNextCheckTime())); + String doctor = babyEyeCheck.getDoctor(); + if(StringUtils.isNotEmpty(doctor)) { + map.put("doctor", couponMapper.getUserName(doctor)); + } map.put("handleOpinionsId", HandleOpinionsEnums.getName(babyEyeCheck.getHandleOpinionsId())); map.put("riskFactorId", EyeHighRiskEnums.getName(babyEyeCheck.getRiskFactorId())); map.put("checkMonthId", CheckMonthEnums.getName(babyEyeCheck.getCheckMonthId())); @@ -134,6 +144,8 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye public BaseResponse edit(String id) { BabyEyeCheck babyEyeCheck = mongoTemplate.findById(id, BabyEyeCheck.class); Map map = ReflectionUtils.beanToMap(babyEyeCheck); + map.put("checkTime", DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime())); + map.put("nextCheckTime", DateUtil.getYyyyMmDd(babyEyeCheck.getNextCheckTime())); CollectionUtils.removeNullValue(map); return RespBuilder.buildSuccess(map); }