Commit e8ba0536a28dc137100bd76f2273bc7c0f516a09
1 parent
ad3ee88903
Exists in
master
and in
6 other branches
初诊和复诊查看页面下次检查孕周
Showing 3 changed files with 12 additions and 11 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
View file @
e8ba053
| ... | ... | @@ -553,7 +553,7 @@ |
| 553 | 553 | { |
| 554 | 554 | StringBuffer sb = new StringBuffer(); |
| 555 | 555 | List<String> list = getCurrentUserHospPermissions( userId, provinceId, cityId, areaId); |
| 556 | - if (CollectionUtils.isEmpty(list)) | |
| 556 | + if (CollectionUtils.isNotEmpty(list)) | |
| 557 | 557 | { |
| 558 | 558 | sb.append("("); |
| 559 | 559 | for(int i = 0;i < list.size() ;i++) |
| 560 | 560 | |
| ... | ... | @@ -570,8 +570,9 @@ |
| 570 | 570 | } |
| 571 | 571 | } |
| 572 | 572 | sb.append(")"); |
| 573 | + return sb.toString(); | |
| 573 | 574 | } |
| 574 | - return sb.toString(); | |
| 575 | + return null; | |
| 575 | 576 | |
| 576 | 577 | } |
| 577 | 578 | |
| 578 | 579 | |
| 579 | 580 | |
| ... | ... | @@ -620,17 +621,14 @@ |
| 620 | 621 | organizationQuery.setAreaId(areaId); |
| 621 | 622 | } |
| 622 | 623 | } |
| 623 | - List<String> orgId = new ArrayList<>(); | |
| 624 | 624 | List<Organization> organizations = organizationService.queryOrganization(organizationQuery); |
| 625 | 625 | if (CollectionUtils.isNotEmpty(organizations)) { |
| 626 | 626 | for (Organization org : organizations) { |
| 627 | 627 | if (null != org.getId()) { |
| 628 | - orgId.add(org.getId() + ""); | |
| 628 | + orgHospitalList.add(org.getId() + ""); | |
| 629 | 629 | } |
| 630 | 630 | } |
| 631 | 631 | } |
| 632 | - orgHospitalList.retainAll(orgId); | |
| 633 | - | |
| 634 | 632 | } |
| 635 | 633 | else |
| 636 | 634 | { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
e8ba053
| ... | ... | @@ -1726,17 +1726,17 @@ |
| 1726 | 1726 | model.setPee(checkModel.getPee()); |
| 1727 | 1727 | model.setExcrement(checkModel.getExcrement()); |
| 1728 | 1728 | model.setSleep(checkModel.getSleep()); |
| 1729 | - model.setActivity(checkModel.getActivity()); | |
| 1730 | - model.setVitaminD(checkModel.getVitaminD()); | |
| 1729 | + model.setActivity(checkModel.getActivity() + UnitConstants.HD); | |
| 1730 | + model.setVitaminD(checkModel.getVitaminD()+ UnitConstants.WSSD); | |
| 1731 | 1731 | model.setAssistFood(checkModel.getAssistFood()); |
| 1732 | 1732 | model.setHomeMeasure(checkModel.getHomeMeasure()); |
| 1733 | 1733 | model.setMorbidity(checkModel.getMorbidity()); |
| 1734 | 1734 | |
| 1735 | 1735 | |
| 1736 | - model.setTemperature(checkModel.getTemperature()); | |
| 1737 | - model.setHeight(checkModel.getHeight()); | |
| 1736 | + model.setTemperature(checkModel.getTemperature()+ UnitConstants.WENDU); | |
| 1737 | + model.setHeight(checkModel.getHeight()+UnitConstants.CM); | |
| 1738 | 1738 | model.setWeight(checkModel.getWeight()); |
| 1739 | - model.setHead(checkModel.getHead()); | |
| 1739 | + model.setHead(checkModel.getHead()+UnitConstants.CM); | |
| 1740 | 1740 | model.setHeightWeight(checkModel.getHeightWeight()); |
| 1741 | 1741 | if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(checkModel.getGrowthEvaluate())) |
| 1742 | 1742 | { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitConstants.java
View file @
e8ba053
| ... | ... | @@ -27,6 +27,9 @@ |
| 27 | 27 | public static final String GE = " 个"; |
| 28 | 28 | public static final String SUI = " 岁"; |
| 29 | 29 | public static final String REN = " 人"; |
| 30 | + public static final String HD = " 时/日"; | |
| 31 | + public static final String WENDU = " ℃"; | |
| 32 | + public static final String WSSD = " IU/日"; | |
| 30 | 33 | |
| 31 | 34 | |
| 32 | 35 | } |