大屏修改

db/sql/20251213-xj_emergency新增字段.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `emergency_resource`
+    ADD COLUMN `geo_collect_type` tinyint NULL DEFAULT 0 COMMENT '位置数据维护方式(0-地图选点,1-手动维护)' AFTER `ay_id`;

health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/Resource.java

@@ -190,4 +190,11 @@ public class Resource implements Serializable {
      */
     @Schema(title = "安眼id")
     private String ayId;
+
+    /**
+     * 位置数据维护方式
+     */
+    @Schema(title = "位置数据维护方式(0-地图选点,1-手动维护)")
+    @Dict(dicCode = "geo_collect_type")
+    private Integer geoCollectType;
 }

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/EmergencyOrderApiService.java

@@ -70,7 +70,7 @@ public interface EmergencyOrderApiService {
 
     Order getOrderById(String id);
 
-    List<TblHelpCentorVo> getSicknessTypeStatistic(String sex, String depart);
+    List<TblHelpCentorVo> getSicknessTypeStatistic(String sex, String depart,String centerId);
 
     List<GroupMemberVO> getGroupMemberList(String sessionId);
 

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyOrderApiServiceImpl.java

@@ -551,7 +551,7 @@ public class EmergencyOrderApiServiceImpl implements EmergencyOrderApiService {
     }
 
     @Override
-    public List<TblHelpCentorVo> getSicknessTypeStatistic(String sex, String depart) {
+    public List<TblHelpCentorVo> getSicknessTypeStatistic(String sex, String depart,String centerId) {
         LambdaQueryWrapper<Order> queryWrapper = new LambdaQueryWrapper<>();
         if (StrUtil.isNotBlank(sex) && !"0".equals(sex)) {
             queryWrapper.eq(Order::getSalvageUserSex, sex);
@@ -559,6 +559,9 @@ public class EmergencyOrderApiServiceImpl implements EmergencyOrderApiService {
         if (StrUtil.isNotBlank(depart)) {
             queryWrapper.like(Order::getSalvageUserDepart, depart);
         }
+        if (StrUtil.isNotBlank(centerId)) {
+            queryWrapper.eq(Order::getCenterId, centerId);
+        }
         queryWrapper.eq(Order::getDelFlag, CommonConstant.DEL_FLAG_0);
         List<Order> orders = orderMapper.selectList(queryWrapper);
         // 统计

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java

@@ -718,6 +718,7 @@ public class LargeScreenDataServiceImpl extends ServiceImpl<LargeScreenDataMappe
                     vo.setRealName(sysUser.getRealname());
                     vo.setSex(sysUser.getSex());
                     vo.setAge(sysUser.getAge());
+                    vo.setEmployeeNum(sysUser.getWorkNo());
                     if (ObjUtil.isNotEmpty(sysUser.getOrgCode())) {
                         SysDepart secondDepart = sysCache.getDepartByOrgCode(GlobalUtils.getSecondDepartOrgCode(sysUser.getOrgCode()));
                         if (secondDepart != null) {
@@ -830,6 +831,7 @@ public class LargeScreenDataServiceImpl extends ServiceImpl<LargeScreenDataMappe
                                 vo.setOrgName(thirdDepart.getDepartName());
                             }
                         }
+                        vo.setEmployeeNum(item.getWorkNo());
                     });
                     vo.setUserId(watch.getUserId());
                     vo.setRealName(watch.getRealName());

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/OrderServiceImpl.java

@@ -57,11 +57,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Override
     public IPage<Order> pageCustom(Page<Order> page, Order order, HttpServletRequest req) {
         String salvageUserName = order.getSalvageUserName();
+        String initiatorUserName = order.getInitiatorUserName();
         Order orderCopy = new Order();
         handleOrder(order, orderCopy);
 
         QueryWrapper<Order> queryWrapper = QueryGenerator.initQueryWrapper(orderCopy, req.getParameterMap());
-        handleQueryWrapper(order, salvageUserName, queryWrapper);
+        handleQueryWrapper(order, salvageUserName,initiatorUserName, queryWrapper);
         // 处理应急中心
         handleCenterAndManagerWrapper(queryWrapper, order.getCenterId(), order.getOrgCode());
         Page<Order> result = page(page, queryWrapper);
@@ -219,12 +220,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         LoginUser loginUser = GlobalUtils.getLoginUser();
         // 筛选条件: 员工姓名 状态 时间段
         QueryWrapper<Order> queryWrapper = new QueryWrapper<>();
-        handleQueryWrapper(order, order.getSalvageUserName(), queryWrapper);
+        handleQueryWrapper(order, order.getSalvageUserName(),order.getInitiatorUserName(), queryWrapper);
 
         //queryWrapper.lambda().eq(Order::getMajorUserId, loginUser.getId());
         queryWrapper.lambda().and(orWrapper -> orWrapper.eq(Order::getMajorUserId, loginUser.getId()).or().eq(Order::getMajorUserTwoId, loginUser.getId()));
 
-        if (StrUtil.isBlank(order.getOrderStatus())) {
+        if (StrUtil.isNotEmpty(order.getOrderStatus())) {
             queryWrapper.lambda().in(Order::getOrderStatus, Arrays.asList(EmergencyConstants.ORDER_STATUS_5_NEW, EmergencyConstants.ORDER_STATUS_1_NEW));
         }
         if (EmergencyConstants.ORDER_STATUS_5_NEW.equals(order.getOrderStatus())) {
@@ -281,7 +282,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         BeanUtil.copyProperties(order, copy);
     }
 
-    private void handleQueryWrapper(Order orderCopy, String salvageUserName, QueryWrapper<Order> queryWrapper) {
+    private void handleQueryWrapper(Order orderCopy, String salvageUserName,String initiatorUserName, QueryWrapper<Order> queryWrapper) {
         if (ObjectUtil.isNull(orderCopy)) {
             return;
         }
@@ -302,6 +303,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         if (StrUtil.isNotBlank(salvageUserName)) {
             queryWrapper.lambda().like(Order::getSalvageUserName, salvageUserName);
         }
+        // 发起人姓名模糊查找
+        if (StrUtil.isNotBlank(initiatorUserName)) {
+            queryWrapper.lambda().like(Order::getInitiatorUserName, initiatorUserName);
+        }
 
         // 时间范围查询
         if (ObjectUtil.isNotNull(orderCopy.getCreateTimeStart()) && ObjectUtil.isNotNull(orderCopy.getCreateTimeEnd())) {

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblHelpCenterServiceImpl.java

@@ -44,7 +44,7 @@ public class TblHelpCenterServiceImpl extends ServiceImpl<TblHelpCenterMapper, T
      */
     @Override
     public List<TblHelpCentorVo> sicknessTypeStatistic(String sex, String depart,String centerId) {
-        List<TblHelpCentorVo> statistic = emergencyOrderApiService.getSicknessTypeStatistic(sex, depart);
+        List<TblHelpCentorVo> statistic = emergencyOrderApiService.getSicknessTypeStatistic(sex, depart,centerId);
         for (TblHelpCentorVo tblHelpCentorVo : statistic) {
             if (tblHelpCentorVo.getType().equals("0")) {
                 tblHelpCentorVo.setName("120");