From 4d3a41056906220a3251c451cb0e1a26e70889d7 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 8 Dec 2022 16:36:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/controller/TestController.java | 4 +++- .../operate/web/service/impl/OrgCouponServiceImpl.java | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 4a2a751..40a72b9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -5697,7 +5697,9 @@ public class TestController extends BaseController { @ResponseBody public void eyeCheckLh(HttpServletResponse response) { Criteria criteria = Criteria.where("yn").is(YnEnums.YES.getId()).and("hospitalId").is("2100001605") - .and("lhywgInfo").exists(false); + ; + criteria.orOperator(Criteria.where("lhywgInfo").exists(false),Criteria.where("lhywgInfo").is(new HashMap<>())); + System.out.println(new Query(criteria).toString()); List models = mongoTemplate.find(new Query(criteria), LhBabyEyeCheck.class); if (CollectionUtils.isNotEmpty(models)) { for (LhBabyEyeCheck model : models) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java index 6513be2..16851b0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java @@ -244,6 +244,17 @@ public class OrgCouponServiceImpl extends BaseServiceImpl implements OrgCouponSe couponInfo.put("type_desc", s); } Date useDate = (Date) couponInfo.get("use_date"); + + List patients = mongoTemplate.find(Query.query(Criteria.where("pid").is(couponInfo.get("user_id")) + .and("yn").is(1)), Patients.class); + String age = ""; + if (CollectionUtils.isNotEmpty(patients) && useDate != null) + { + Date birth = patients.get(0).getBirth(); + age = DateUtil.getAge(birth,useDate)+""; + } + couponInfo.put("age",age); + couponInfo.put("use_date", DateUtil.getyyyy_MM_dd(useDate)); /** 设置产检日期、姓名、产检孕周、产检第次、产检机构、产检医生、联系电话 */ setUsedInfo((Integer) couponInfo.get("type"), (String) couponInfo.get("used_id"), -- 1.8.3.1