解决床位分配查询不正确问题

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

@@ -175,32 +175,41 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
             if(allStayMaleCountMap.get(record.getId()) != null){
                 maleCount = allStayMaleCountMap.get(record.getId());
             }
+            if(maleCount == null){
+                maleCount = 0;
+            }
             record.setMaleCount(maleCount);
 
             if(allStayFemaleCountMap.get(record.getId()) != null){
                 femaleCount = allStayMaleCountMap.get(record.getId());
             }
+            if(femaleCount == null){
+                femaleCount = 0;
+            }
             record.setFemaleCount(femaleCount);
 
             if("SB10001".equals(dto.getGender()) && allStayMaleCountMap.get(record.getId()) != null){
                 needCout = allStayMaleCountMap.get(record.getId());
-                distributeCount = needCout;
                 if(allArrangedMaleCountMap.get(record.getId()) != null){
                     distributeCount = needCout - (allArrangedMaleCountMap.get(record.getId()) == null ? 0 : allArrangedMaleCountMap.get(record.getId()));
                 }
             }else if("SB10002".equals(dto.getGender())){
                 needCout = femaleCount;
-                distributeCount = needCout;
                 if(allArrangedFemaleCountMap.get(record.getId()) != null){
                     distributeCount = needCout - (allArrangedFemaleCountMap.get(record.getId()) == null ? 0 : allArrangedFemaleCountMap.get(record.getId()));
                 }
             }else{
                 needCout = allStayCountMap.get(record.getId());
-                distributeCount = needCout;
                 if(allArrangedCountMap.get(record.getId()) != null){
                     distributeCount = needCout - (allArrangedCountMap.get(record.getId()) == null ? 0 : allArrangedCountMap.get(record.getId()));
                 }
             }
+            if(needCout == null){
+                needCout = 0;
+            }
+            if(distributeCount == null){
+                distributeCount = 0;
+            }
 
             record.setNeedCount(needCout);
             record.setDistributeCount(distributeCount);