diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java index 08653ee..1bcf6f8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java @@ -553,7 +553,7 @@ public class AreaCountFacade { { StringBuffer sb = new StringBuffer(); List list = getCurrentUserHospPermissions( userId, provinceId, cityId, areaId); - if (CollectionUtils.isEmpty(list)) + if (CollectionUtils.isNotEmpty(list)) { sb.append("("); for(int i = 0;i < list.size() ;i++) @@ -570,8 +570,9 @@ public class AreaCountFacade { } } sb.append(")"); + return sb.toString(); } - return sb.toString(); + return null; } @@ -620,17 +621,14 @@ public class AreaCountFacade { organizationQuery.setAreaId(areaId); } } - List orgId = new ArrayList<>(); List organizations = organizationService.queryOrganization(organizationQuery); if (CollectionUtils.isNotEmpty(organizations)) { for (Organization org : organizations) { if (null != org.getId()) { - orgId.add(org.getId() + ""); + orgHospitalList.add(org.getId() + ""); } } } - orgHospitalList.retainAll(orgId); - } else { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 637230a..28480a9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -1726,17 +1726,17 @@ public class ViewFacade { model.setPee(checkModel.getPee()); model.setExcrement(checkModel.getExcrement()); model.setSleep(checkModel.getSleep()); - model.setActivity(checkModel.getActivity()); - model.setVitaminD(checkModel.getVitaminD()); + model.setActivity(checkModel.getActivity() + UnitConstants.HD); + model.setVitaminD(checkModel.getVitaminD()+ UnitConstants.WSSD); model.setAssistFood(checkModel.getAssistFood()); model.setHomeMeasure(checkModel.getHomeMeasure()); model.setMorbidity(checkModel.getMorbidity()); - model.setTemperature(checkModel.getTemperature()); - model.setHeight(checkModel.getHeight()); + model.setTemperature(checkModel.getTemperature()+ UnitConstants.WENDU); + model.setHeight(checkModel.getHeight()+UnitConstants.CM); model.setWeight(checkModel.getWeight()); - model.setHead(checkModel.getHead()); + model.setHead(checkModel.getHead()+UnitConstants.CM); model.setHeightWeight(checkModel.getHeightWeight()); if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(checkModel.getGrowthEvaluate())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitConstants.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitConstants.java index 483a6fe..2672033 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitConstants.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitConstants.java @@ -27,6 +27,9 @@ public class UnitConstants { public static final String GE = " 个"; public static final String SUI = " 岁"; public static final String REN = " 人"; + public static final String HD = " 时/日"; + public static final String WENDU = " ℃"; + public static final String WSSD = " IU/日"; }