From 59d6e9e37e69319a72209c43b7241537b0795011 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 25 Jul 2022 16:40:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E9=9A=90=E8=97=8F=E6=A1=A3?= =?UTF-8?q?=E6=A1=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../permission/service/impl/CouponServiceImpl.java | 2 +- .../main/resources/mainOrm/master/CouponMapper.xml | 2 +- .../operate/web/controller/FollowUpController.java | 2 +- .../operate/web/facade/BabyBookbuildingFacade.java | 5 ++-- .../operate/web/facade/BabyCheckFacade.java | 14 +++++----- .../platform/operate/web/facade/BabyEarFacade.java | 2 +- .../web/facade/BabySpecialDiseaseClinicFacade.java | 14 +++++----- .../lyms/platform/operate/web/utils/MongoUtil.java | 32 +++++++++++----------- 8 files changed, 37 insertions(+), 36 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java index 07e163e..2f9e421 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java @@ -807,7 +807,7 @@ public class CouponServiceImpl implements CouponService { Map param = new HashMap<>(); param.put("userId", userId); - param.put("hospitalId", hospitalId); + //param.put("hospitalId", hospitalId); Map restMap = new HashMap<>(); restMap.put("topName", couponMapper.findTopName(hospitalId)); diff --git a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml index 4f2a1ce..62daa56 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -128,7 +128,7 @@ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java index c0a26a0..7c489ca 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java @@ -544,7 +544,7 @@ public class FollowUpController extends BaseController { //听力筛查-当某个儿童在同一院组内某家医院完成了的听筛建档后去院组内其他医院做了听筛、听诊或随访，应该要在对应的医院下创建一个隐藏档案 //建立隐藏档案 - babyEarFacade.addhideBabyEar(obj.getBabyId(), hospitalId, "2"); + //babyEarFacade.addhideBabyEar(obj.getBabyId(), hospitalId, "2"); babyPatientExtendEarFollowUpService.addBabyPatientExtendEarFollowUp(obj); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 77ac844..4040395 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -270,7 +270,8 @@ public class BabyBookbuildingFacade { } //表示区域的 - if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId)) && org.apache.commons.lang.StringUtils.isNotEmpty(pid)) { + if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId)) + && org.apache.commons.lang.StringUtils.isNotEmpty(pid)) { if (babyModel == null) { babyModel = babyModel1; @@ -294,7 +295,7 @@ public class BabyBookbuildingFacade { babyModel.setId(null); babyModel.setHospitalId(hospitalId); babyModel.setCreated(new Date()); - babyModel.setEnable("2"); + // babyModel.setEnable("2"); babyBookbuildingService.addBabyBookbuilding(babyModel); return babyModel.getId(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index d872b46..aae4399 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -832,13 +832,13 @@ public class BabyCheckFacade extends BaseServiceImpl { String hospitalId = autoMatchFacade.getHospitalId(userId); //表示区域的 - if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { - String parentId = babyBookbuildingFacade.handHideBuild(request.getPid(), request.getBuildId(), userId, 1); - if (org.apache.commons.lang.StringUtils.isEmpty(parentId)) { - //打印日志 - } - request.setBuildId(parentId); - } +// if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { +// String parentId = babyBookbuildingFacade.handHideBuild(request.getPid(), request.getBuildId(), userId, 1); +// if (org.apache.commons.lang.StringUtils.isEmpty(parentId)) { +// //打印日志 +// } +// request.setBuildId(parentId); +// } //儿童体检后 更新下次预约时间和是否高危 在基础数据表里面 BabyModel bm = new BabyModel(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java index 8d3ae4a..481e3e3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java @@ -1885,7 +1885,7 @@ public class BabyEarFacade { //听力筛查-当某个儿童在同一院组内某家医院完成了的听筛建档后去院组内其他医院做了听筛、听诊或随访，应该要在对应的医院下创建一个隐藏档案 //建立隐藏档案 - addhideBabyEar(babyPatientExtendEarScreen.getBabyId(), hId, "2"); + //addhideBabyEar(babyPatientExtendEarScreen.getBabyId(), hId, "2"); /*0-追访概况 7 更新听力筛查数量*/ BabyModel model = new BabyModel(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java index 5e98a1a..88636a2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java @@ -134,13 +134,13 @@ public class BabySpecialDiseaseClinicFacade extends BaseServiceImpl { String hospitalId = autoMatchFacade.getHospitalId(userId); //表示区域的 - if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { - String parentId = babyBookbuildingFacade.handHideBuild(request.getPid(), request.getBuildId(), userId, 1); - if (org.apache.commons.lang.StringUtils.isEmpty(parentId)) { - //打印日志 - } - request.setBuildId(parentId); - } +// if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { +// String parentId = babyBookbuildingFacade.handHideBuild(request.getPid(), request.getBuildId(), userId, 1); +// if (org.apache.commons.lang.StringUtils.isEmpty(parentId)) { +// //打印日志 +// } +// request.setBuildId(parentId); +// } BabySpecialDiseaseClinicModel model = getBabySpecialDiseaseClinicModel(request); model.setCheckDate(new Date()); model.setHospitalId(hospitalId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java index f68a0b8..832d6e3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java @@ -137,22 +137,22 @@ public class MongoUtil { return true; } - List hospitalIds = organizationGroupsFacade.findGroupHospital(userId, true); - if (CollectionUtils.isNotEmpty(hospitalIds)) { - BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("hospitalId").in(hospitalIds) - .and("pid").is(pid).and("enable").ne("2")).with(new Sort(Sort.Direction.DESC, "created")), BabyModel.class); - if (babyModel == null) { - return false; // 需 要建档 - } - babyModel.setId(null); - babyModel.setHospitalId(hospitalId); - babyModel.setEnable("2"); - babyModel.setSource(babyId); - babyModel.setCreated(new Date()); -// mongoTemplate.save(babyModel); - babyBookbuildingService.addBabyBookbuilding(babyModel); - return true; - } +// List hospitalIds = organizationGroupsFacade.findGroupHospital(userId, true); +// if (CollectionUtils.isNotEmpty(hospitalIds)) { +// BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("hospitalId").in(hospitalIds) +// .and("pid").is(pid).and("enable").ne("2")).with(new Sort(Sort.Direction.DESC, "created")), BabyModel.class); +// if (babyModel == null) { +// return false; // 需 要建档 +// } +// babyModel.setId(null); +// babyModel.setHospitalId(hospitalId); +// babyModel.setEnable("2"); +// babyModel.setSource(babyId); +// babyModel.setCreated(new Date()); +//// mongoTemplate.save(babyModel); +// babyBookbuildingService.addBabyBookbuilding(babyModel); +// return true; +// } return false; } -- 1.8.3.1