Browse Source

<兼容时尚版和豪华版混搭,由于注册的门口机是没有对应床位的,所以床位列表中为空的房间不显示出来,否则会出现两个同样的房间号,但是一个有床位,一个无床位>

weizhengliang 5 years ago
parent
commit
3a9bf75fdc

+ 9 - 0
app/src/main/java/com/wdkl/callingmainnurse/entity/RoomEntity.java

@@ -16,7 +16,16 @@ public class RoomEntity {
 
 
     public ArrayList<WardInformation> getWardInformationList() {
     public ArrayList<WardInformation> getWardInformationList() {
         WardInformation callEntity = new WardInformation();
         WardInformation callEntity = new WardInformation();
+        //兼容时尚版和豪华版混搭,若房间没有床位则不显示这个房间,否则这种情况下会显示两个同样的房间,其中一个房间是空的
         if (null != wardInformationList) {
         if (null != wardInformationList) {
+            ArrayList<WardInformation> list = new ArrayList<>();
+            for (WardInformation info : wardInformationList) {
+                if (info.getSickbedInformationList() != null && info.getSickbedInformationList().size() > 0) {
+                    list.add(info);
+                }
+            }
+            wardInformationList.clear();
+            wardInformationList.addAll(list);
             wardInformationList.add(0, callEntity);
             wardInformationList.add(0, callEntity);
         }
         }
         return wardInformationList;
         return wardInformationList;