服务指令预览查询逻辑调整

nursing-unit-api/src/main/java/com/nu/modules/pad/employee/api/EmployeeApi.java

@@ -26,7 +26,7 @@ public class EmployeeApi {
      * @return
      */
     @GetMapping("/queryEmpList")
-    public Result<List<EmployeesInfoEntity>> queryEmpList() {
+    public Result<List<EmployeesInfoEntity>> queryEmpList(EmployeesInfoEntity dto) {
         return Result.OK(employeesInfoApi.queryEmpList());
     }
 

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml

@@ -398,8 +398,7 @@
                 <![CDATA[
                         AND (
                             (DATE(o.start_time) = DATE(#{dto.queryDate}) AND o.end_time < NOW())
-                            OR
+
-                            (DATE(o.start_time) = DATE(#{dto.queryDate}) AND o.start_time < NOW() AND o.iz_finish = 'Y')
                         )
                     ]]>
             </when>
@@ -418,7 +417,7 @@
         <include refid="baseSelect"/>
 
         <![CDATA[
-                AND (DATE(o.start_time) = DATE(now()) AND o.start_time <= now() AND now() <= o.end_time AND o.iz_finish = 'N')
+                AND (DATE(o.start_time) = DATE(now()) AND o.start_time <= now() AND now() <= o.end_time )
             ]]>
 
         <include refid="commonConditions"/>

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml

@@ -326,6 +326,7 @@
                                 )
                     )
             )
+          AND STR_TO_DATE(CONCAT(DATE_FORMAT(CURDATE(), '%Y-%m-%d'), ' ', p.start_time), '%Y-%m-%d %H:%i:%s') > NOW()
         ORDER BY STR_TO_DATE(CONCAT(DATE_FORMAT(CURDATE(), '%Y-%m-%d'), ' ', p.start_time), '%Y-%m-%d %H:%i:%s') ASC
     </select>
 </mapper>