diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java
index bdc7d533..ddf9fcc5 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java
@@ -69,14 +69,34 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
 
     @Override
     public IPage<DirectiveOrderEntity> queryOrderList(Integer pageNo, Integer pageSize, DirectiveOrderEntity directiveOrderEntity, HttpServletRequest req) {
-        String nowDate = DateUtils.formatDate(new Date(),"yyyy-MM-dd");
+        String nowDate = DateUtils.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss");
         DirectiveOrder directiveOrder = new DirectiveOrder();
         BeanUtils.copyProperties(directiveOrderEntity, directiveOrder);
         QueryWrapper<DirectiveOrder> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("nu_id", directiveOrderEntity.getNuId());
-        queryWrapper.eq("iz_finish", "N");
-        queryWrapper.like("start_time",nowDate);
         queryWrapper.eq(StringUtils.isNotBlank(directiveOrderEntity.getEmployeeId()),"employee_id",directiveOrderEntity.getEmployeeId());
+        /**工单类型 1待执行 2已执行 3已完成 4已过期 5待执行或者已执行未完成 空是全部*/
+        if (StringUtils.equals("1", directiveOrderEntity.getWorkType())) {
+            queryWrapper.eq("iz_start", "N");
+            queryWrapper.eq("iz_finish", "N");
+            queryWrapper.apply("start_time > now()");
+            queryWrapper.orderByAsc("start_time");
+        } else if (StringUtils.equals("2", directiveOrderEntity.getWorkType())) {
+            queryWrapper.eq("iz_start", "Y");
+            queryWrapper.eq("iz_finish", "N");
+            queryWrapper.orderByAsc("start_time");
+        } else if (StringUtils.equals("3", directiveOrderEntity.getWorkType())) {
+            queryWrapper.eq("iz_start", "Y");
+            queryWrapper.eq("iz_finish", "Y");
+        } else if (StringUtils.equals("4", directiveOrderEntity.getWorkType())) {
+            queryWrapper.eq("iz_start", "N");
+            queryWrapper.eq("iz_finish", "N");
+            queryWrapper.apply("start_time < now()");
+        } else if (StringUtils.equals("5", directiveOrderEntity.getWorkType())) {
+            queryWrapper.apply("((iz_start = 'N' and iz_finish='N') or (iz_start='Y' and iz_finish='N'))");
+        }
+
+
         Page<DirectiveOrder> page = new Page<>(pageNo, pageSize);
         List<DirectiveOrder> list = baseMapper.selectList(page, queryWrapper);
         IPage<DirectiveOrderEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());