|
@@ -16,7 +16,16 @@ public class RoomEntity {
|
|
|
|
|
|
public ArrayList<WardInformation> getWardInformationList() {
|
|
|
WardInformation callEntity = new WardInformation();
|
|
|
+ //兼容时尚版和豪华版混搭,若房间没有床位则不显示这个房间,否则这种情况下会显示两个同样的房间,其中一个房间是空的
|
|
|
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);
|
|
|
}
|
|
|
return wardInformationList;
|