气瓶统计优化

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/bigview/BigViewController.java

@@ -515,6 +515,7 @@ public class BigViewController extends BaseController {
                         vo.setRemark("1");//预案
                         vo.setSubordinateDeptName(suvo.getDeptName());
                         vo.setBuildId(suvo.getBuildId());
+                        vo.setFloorId(suvo.getFloorId());
                     }
                 }
             }
@@ -539,7 +540,11 @@ public class BigViewController extends BaseController {
                 subjectControllerVO.setRemark("2");
                 subjectControllerVO.setRiskName(warning.getWarningContent()+": "+warning.getName());
                 subjectControllerVO.setSubordinateDeptName(warning.getCollegeName());
-                subjectControllerVO.setBuildId(warning.getSubId()!=null?subjectService.selectLabSubjectById(warning.getSubId()).getBuildId():null);
+                //查询实验室详情
+                LabSubject subject = subjectService.selectLabSubjectById(warning.getSubId());
+                subjectControllerVO.setBuildId(subject!=null?subject.getBuildId():null);
+                subjectControllerVO.setFloorId(subject!=null?subject.getFloorId():null);
+                subjectControllerVO.setId(warning.getSubId());
                 list.add(subjectControllerVO);
             }
         }