大屏统计优化

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabHazardController.java

@@ -338,7 +338,7 @@ public class LabHazardController extends BaseController {
 
         Map<String,Object> allMap = new HashMap <>();
         List<Map<String,Object>> backtList = new ArrayList<>();
-        Set <String> deptNames = new HashSet <>();
+        LinkedHashSet <String> deptNames = new LinkedHashSet<>();
 
         if(!bottleConfigMap.isEmpty()){
             for (SysDictData dicData:dictDataList) {

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

@@ -513,6 +513,7 @@ public class BigViewController extends BaseController {
                         vo.setRoom(suvo.getRoom());
                         vo.setRiskName(suvo.getRiskName());
                         vo.setRemark("1");//预案
+                        vo.setSubordinateDeptName(suvo.getDeptName());
                     }
                 }
             }
@@ -535,6 +536,7 @@ public class BigViewController extends BaseController {
                 subjectControllerVO.setRoom(warning.getRoomNum());
                 subjectControllerVO.setRemark("2");//气瓶
                 subjectControllerVO.setRiskName(warning.getWarningContent()+": "+warning.getName());
+                subjectControllerVO.setSubordinateDeptName(warning.getCollegeName());
                 list.add(subjectControllerVO);
             }
         }