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 48f3af3..6e51d87 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 @@ -238,69 +238,69 @@ public class BabyBookbuildingFacade { * @param userId * @return */ - public String handHideBuild(String pid, String parentId, Integer userId, int type) { - String hospitalId = autoMatchFacade.getHospitalId(userId); - BabyModel babyModel = null; - BabyModel babyModel1 = null; - if (org.apache.commons.lang.StringUtils.isNotEmpty(parentId)) { - BabyModelQuery babyModelQuery = new BabyModelQuery(); - babyModelQuery.setId(parentId); - List patients1 = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); - if (CollectionUtils.isNotEmpty(patients1)) { - babyModel1 = patients1.get(0); - } - if (babyModel1 != null & org.apache.commons.lang.StringUtils.isEmpty(pid)) { - pid = babyModel1.getPid(); - } - } - - BabyModelQuery babyModelQuery = new BabyModelQuery(); - babyModelQuery.setSource(parentId); - babyModelQuery.setPid(pid); - - List li = new ArrayList(); - li.add(hospitalId); - babyModel = findBabyCond(babyModelQuery, li, true); - //表示本院已经有隐藏建档 - if (null != babyModel) { - return babyModel.getId(); - } - if (babyModel1.getHospitalId().equals(hospitalId)) { - return babyModel1.getId(); - } - - //表示区域的 - if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId)) - && org.apache.commons.lang.StringUtils.isNotEmpty(pid)) { - if (babyModel == null) - { - babyModel = babyModel1; - } - babyModelQuery.setId(null); - babyModelQuery.setPid(pid); - babyModelQuery.setSource(null); - babyModelQuery.setEnable(null); - babyModelQuery.setHospitalIdList(null); - List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); - if (CollectionUtils.isNotEmpty(babyModels)) { - for (BabyModel model : babyModels) - { - if (StringUtils.isEmpty(model.getSource())) - { - babyModel.setSource(model.getId()); - break; - } - } - } - babyModel.setId(null); - babyModel.setHospitalId(hospitalId); - babyModel.setCreated(new Date()); - // babyModel.setEnable("2"); - babyBookbuildingService.addBabyBookbuilding(babyModel); - return babyModel.getId(); - } - return null; - } +// public String handHideBuild(String pid, String parentId, Integer userId, int type) { +// String hospitalId = autoMatchFacade.getHospitalId(userId); +// BabyModel babyModel = null; +// BabyModel babyModel1 = null; +// if (org.apache.commons.lang.StringUtils.isNotEmpty(parentId)) { +// BabyModelQuery babyModelQuery = new BabyModelQuery(); +// babyModelQuery.setId(parentId); +// List patients1 = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); +// if (CollectionUtils.isNotEmpty(patients1)) { +// babyModel1 = patients1.get(0); +// } +// if (babyModel1 != null & org.apache.commons.lang.StringUtils.isEmpty(pid)) { +// pid = babyModel1.getPid(); +// } +// } +// +// BabyModelQuery babyModelQuery = new BabyModelQuery(); +// babyModelQuery.setSource(parentId); +// babyModelQuery.setPid(pid); +// +// List li = new ArrayList(); +// li.add(hospitalId); +// babyModel = findBabyCond(babyModelQuery, li, true); +// //表示本院已经有隐藏建档 +// if (null != babyModel) { +// return babyModel.getId(); +// } +// if (babyModel1.getHospitalId().equals(hospitalId)) { +// return babyModel1.getId(); +// } +// +// //表示区域的 +// if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId)) +// && org.apache.commons.lang.StringUtils.isNotEmpty(pid)) { +// if (babyModel == null) +// { +// babyModel = babyModel1; +// } +// babyModelQuery.setId(null); +// babyModelQuery.setPid(pid); +// babyModelQuery.setSource(null); +// babyModelQuery.setEnable(null); +// babyModelQuery.setHospitalIdList(null); +// List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); +// if (CollectionUtils.isNotEmpty(babyModels)) { +// for (BabyModel model : babyModels) +// { +// if (StringUtils.isEmpty(model.getSource())) +// { +// babyModel.setSource(model.getId()); +// break; +// } +// } +// } +// babyModel.setId(null); +// babyModel.setHospitalId(hospitalId); +// babyModel.setCreated(new Date()); +// // babyModel.setEnable("2"); +// babyBookbuildingService.addBabyBookbuilding(babyModel); +// return babyModel.getId(); +// } +// return null; +// } /** * 儿童电子病历