Merge remote-tracking branch 'origin/develop' into zhaoyun

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java

@@ -176,9 +176,10 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS
             String searchKey, String registeredFlag, Integer pageNo, Integer pageSize,
             Date startTime, Date endTime, Long organizationId, String idCard, HttpServletRequest request) {
         Integer encounterStatus = EncounterZyStatus.TO_BE_REGISTERED.getValue(); // 待登记
-        // startTime/endTime 直接传给 Mapper XML 参数，不通过 QueryWrapper
-        inHospitalRegisterQueryDto.setStartTime(null);
-        inHospitalRegisterQueryDto.setEndTime(null);
+        // 清除过滤条件字段，避免 HisQueryUtils.buildQueryWrapper 生成无效的外部 SQL 条件（这些条件已在 Mapper XML 内部实现）
+        inHospitalRegisterQueryDto.setStartTime(null)
+                .setEndTime(null)
+                .setOrganizationId(null);
         // 构建查询条件
         QueryWrapper<InHospitalRegisterQueryDto> queryWrapper
                 = HisQueryUtils.buildQueryWrapper(inHospitalRegisterQueryDto, searchKey,

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java

@@ -55,6 +55,16 @@ public class InHospitalRegisterQueryDto {
      */
     private String patientName;
 
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 入院科室
+     */
+    private String organizationName;
+
     /**
      * 性别编码
      */
@@ -120,14 +130,4 @@ public class InHospitalRegisterQueryDto {
      */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long organizationId;
-
-    /**
-     * 身份证号
-     */
-    private String idCard;
-
-    /**
-     * 入院科室名称
-     */
-    private String organizationName;
 }