From 8d0c1d8ca9c028473e2cedd3dafe1b33a9ac1b8f Mon Sep 17 00:00:00 2001 From: wtt Date: Fri, 18 Sep 2020 09:29:29 +0800 Subject: [PATCH] update --- .../web/facade/BabyKindergartenCheckFacade.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java index bb2b49c..ca0e6a1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java @@ -188,8 +188,25 @@ public class BabyKindergartenCheckFacade extends BaseServiceImpl { model.setOnly("0"); } model = babyKindergartenCheckService.add(model); - if (model != null && model.getId() != null && "1".equals(model.getOnly()) ) { + + + //首次2 定期体检判断是否存在档案，存在就更新为主表id + List babyResultList = null; + if (StringUtils.isNotEmpty(model.getPhon()) && "2".equals(model.getType()) ) { + BabyKindergartenCheckQuery babyQuery1 = new BabyKindergartenCheckQuery(); + babyQuery1.setYn(YnEnums.YES.getId()); + babyQuery1.setHospitalId(hospitalId); + babyQuery1.setPhon(model.getPhon()); + babyQuery1.setOnly("1"); + babyQuery1.setSort("checkDate"); + babyResultList = babyKindergartenCheckService.queryOne(babyQuery1); + } + + if ((model != null && model.getId() != null && "1".equals(model.getOnly()))|| CollectionUtils.isEmpty(babyResultList)) { BabyKindergartenCheckModel m = new BabyKindergartenCheckModel(); + if(CollectionUtils.isEmpty(babyResultList)){ + m.setOnly("1"); + } m.setParentId(model.getId());//区分一个手机号码多个儿童 babyKindergartenCheckService.update(m, model.getId()); -- 1.8.3.1