Pārlūkot izejas kodu

解决分配床位人数计算问题

dzx 1 gadu atpakaļ
vecāks
revīzija
21ed253ee0

+ 2 - 2
src/main/java/com/xjrsoft/module/room/service/impl/RoomBedServiceImpl.java

@@ -177,8 +177,8 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
             }
             record.setMaleCount(maleCount);
 
-            if(allStayFemaleCountMap.get(record.getId()) != null && allArrangedFemaleCountMap.get(record.getId()) != null){
-                femaleCount = allStayFemaleCountMap.get(record.getId()) - allArrangedFemaleCountMap.get(record.getId());
+            if(allStayFemaleCountMap.get(record.getId()) != null){
+                femaleCount = allStayFemaleCountMap.get(record.getId()) - (allArrangedFemaleCountMap.get(record.getId()) == null ? 0 : allArrangedFemaleCountMap.get(record.getId()));
             }
             record.setFemaleCount(femaleCount);