yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
1378012178@qq.com 2026-01-13 14:22:11 +08:00
parent c728363b34
commit 39202e34ae
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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());
}

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

@ -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"/>

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

@ -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>