wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

解决合并冲突

Browse Source
This commit is contained in:
chenqi
2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openhis-server-new/openhis-application/src/main/resources/mapper/document/DocDefinitionAppMapper.xml
View File

@@ -33,7 +33,7 @@
</foreach>
</if>
<if test="organizationId != null and organizationId != 0">
AND ddo.organization_id = #{organizationId} OR dd.use_range_enum = 1
AND (ddo.organization_id = #{organizationId} OR dd.use_range_enum = 1)
</if>
<if test="name != null and !name.isEmpty()">
AND dd.name LIKE CONCAT('%',#{name},'%')