修复床位分配提交报错的问题

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

@@ -172,26 +172,25 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
             Integer needCout = 0;
             Integer distributeCount = 0;
             Integer maleCount = 0, femaleCount = 0;
-            if(allStayMaleCountMap.get(record.getId()) != null){
-                maleCount = allStayMaleCountMap.get(record.getId()) - (allArrangedMaleCountMap.get(record.getId()) == null ? 0 : allArrangedMaleCountMap.get(record.getId()));
-            }
-            record.setMaleCount(maleCount);
-
-            if(allStayFemaleCountMap.get(record.getId()) != null){
-                femaleCount = allStayFemaleCountMap.get(record.getId()) - (allArrangedFemaleCountMap.get(record.getId()) == null ? 0 : allArrangedFemaleCountMap.get(record.getId()));
-            }
-            record.setFemaleCount(femaleCount);
 
             if("SB10001".equals(dto.getGender()) && allStayMaleCountMap.get(record.getId()) != null){
                 needCout = allStayMaleCountMap.get(record.getId());
                 if(allArrangedMaleCountMap.get(record.getId()) != null){
                     distributeCount = (allArrangedMaleCountMap.get(record.getId()) == null ? 0 : allArrangedMaleCountMap.get(record.getId()));
                 }
+                if(allStayMaleCountMap.get(record.getId()) != null){
+                    maleCount = allStayMaleCountMap.get(record.getId()) - (allArrangedMaleCountMap.get(record.getId()) == null ? 0 : allArrangedMaleCountMap.get(record.getId()));
+                }
+                record.setMaleCount(maleCount);
             }else if("SB10002".equals(dto.getGender())){
                 needCout = femaleCount;
                 if(allArrangedFemaleCountMap.get(record.getId()) != null){
                     distributeCount = (allArrangedFemaleCountMap.get(record.getId()) == null ? 0 : 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);
             }else{
                 needCout = allStayCountMap.get(record.getId());
                 if(allArrangedCountMap.get(record.getId()) != null){
@@ -248,6 +247,7 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
             //根据性别查询出所有床位信息
             List<RoomBed> bedInfoList = roomBedMapper.selectList(
                 new MPJLambdaWrapper<RoomBed>()
+                .select(RoomBed.class, x -> VoToColumnUtil.fieldsToColumns(RoomBed.class).contains(x.getProperty()))
                 .innerJoin(Room.class, Room::getId, RoomBed::getRoomId)
                 .eq(Room::getGender, genderMap.get(genderNumber))
                 .in(RoomBed::getRoomId, dto.getRoomIds())