diff --git a/platform-common/src/main/java/com/lyms/platform/common/dao/BaseMongoDAOImpl.java b/platform-common/src/main/java/com/lyms/platform/common/dao/BaseMongoDAOImpl.java index 23b66b9..7539203 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/dao/BaseMongoDAOImpl.java +++ b/platform-common/src/main/java/com/lyms/platform/common/dao/BaseMongoDAOImpl.java @@ -157,6 +157,7 @@ public class BaseMongoDAOImpl implements BaseMongoDAO { || "SmsConfigModel".equals(data.getClass().getSimpleName()) || "OperateLogModel".equals(data.getClass().getSimpleName()) || "TrackDown".equals(data.getClass().getSimpleName()) + || "ModularFunctionConfigModel".equals(data.getClass().getSimpleName()) || "ArchiveData".equals(data.getClass().getSimpleName())) { if(!"LisReport".equals(data.getClass().getSimpleName())){ //ExceptionUtils.catchException("NotSerializable for class :"+data.getClass().getSimpleName() ); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java index eb4e476..7faef83 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java @@ -554,18 +554,29 @@ public class StopPregnancyFacade { * @return */ public BaseResponse organizations() { - List organizations = organizationService.queryHospital(); + List modularFunctionConfigModels = + mongoTemplate.find(Query.query(Criteria.where("configs.type").is("88")),ModularFunctionConfigModel.class); List> orgList = new LinkedList<>(); - for (Organization organization : organizations) { - ModularFunctionConfigModel modularFunctionConfigModel = mongoTemplate.findOne(Query.query(Criteria. - where("configs.type").is("88"). - and("configs.value").is("2").and("hospitalId").is(organization.getId().toString())), - ModularFunctionConfigModel.class); - if (modularFunctionConfigModel != null) { - Map map = new HashMap<>(); - map.put("hospitalId", organization.getId().toString()); - map.put("hospitalName", organization.getName()); - orgList.add(map); + + for (ModularFunctionConfigModel modular : modularFunctionConfigModels) + { + if (modular != null) { + List> items = modular.getConfigs(); + if (CollectionUtils.isNotEmpty(items)) + { + for (Map map : items) + { + if (map.get("type") != null && map.get("type").toString().equals("88") && map.get("value") != null && map.get("value").toString().equals("2")) + { + Map map1 = new HashMap<>(); + map1.put("hospitalId", modular.getHospitalId()); + map1.put("hospitalName", organizationService.getOrganizationName(modular.getHospitalId())); + orgList.add(map1); + } + } + + } + } } BaseResponse baseResponse = new BaseResponse();