221,222,223,224,227,228,229,230,231

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java

@@ -1,6 +1,7 @@
 package com.openhis.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
@@ -91,4 +92,8 @@ public class Organization extends HisBaseEntity {
     
     /** 备注 */
     private String remark;
+
+    /** 租户名称（从 sys_tenant 表关联查询，非数据库字段） */
+    @TableField(exist = false)
+    private String tenantName;
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationMapper.java

@@ -1,6 +1,8 @@
 package com.openhis.administration.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.openhis.administration.domain.Organization;
 import com.openhis.administration.dto.OrgDataDto;
 import org.apache.ibatis.annotations.Param;
@@ -9,7 +11,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 /**
- * 机构管理Mapper接口
+ * 机构管理 Mapper 接口
  *
  * @author system
  * @date 2025-02-20
@@ -25,5 +27,21 @@ public interface OrganizationMapper extends BaseMapper<Organization> {
      **/
     List<OrgDataDto> searchOrgDataByHealth();
 
-
-}
+    /**
+     * 分页查询挂号科室列表，关联租户表获取租户名称
+     * @param page 分页对象
+     * @param registerFlag 挂号标记
+     * @param deleteFlag 删除标记
+     * @param name 机构名称
+     * @param orgName 机构名称筛选
+     * @return 分页结果
+     */
+    @InterceptorIgnore(tenantLine = "true")
+    IPage<Organization> selectRegisterOrganizationsWithTenant(
+        IPage<Organization> page,
+        @Param("registerFlag") Integer registerFlag,
+        @Param("deleteFlag") String deleteFlag,
+        @Param("name") String name,
+        @Param("orgName") String orgName
+    );
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/DoctorSchedule.java

@@ -72,6 +72,9 @@ public class DoctorSchedule extends HisBaseEntity {
     /** 关联科室id */
     private Long deptId;
 
+    /** 号别：0=普通，1=专家 */
+    private Integer regType;
+
     /** 医生ID - 不映射到数据库表字段，仅作传输使用 */
     private Long doctorId;
 

openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/DoctorScheduleWithDateDto.java

@@ -61,6 +61,9 @@ public class DoctorScheduleWithDateDto {
     /** 关联科室ID */
     private Long deptId;
 
+    /** 号别：0=普通，1=专家 */
+    private Integer regType;
+
     /** 医生姓名 */
     private String doctorName;
 

openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrganizationMapper.xml

@@ -14,5 +14,54 @@
                GROUP BY heal.offered_org_id)
     </select>
 
+    <!-- 分页查询挂号科室列表，关联租户表获取租户名称 -->
+    <select id="selectRegisterOrganizationsWithTenant" resultType="com.openhis.administration.domain.Organization">
+        SELECT
+            org.id,
+            org.bus_no,
+            org.name,
+            org.active_flag,
+            org.type_enum,
+            org.class_enum,
+            org.py_str,
+            org.wb_str,
+            org.yb_no,
+            org.yb_name,
+            org.caty,
+            org.display_order,
+            org.medins_id,
+            org.medins_admdvs,
+            org.medins_type,
+            org.medins_lv,
+            org.def_doctor_id,
+            org.register_flag,
+            org.location,
+            org.intro,
+            org.remark,
+            org.tenant_id,
+            org.delete_flag,
+            org.create_by,
+            org.create_time,
+            org.update_by,
+            org.update_time,
+            st.tenant_name AS tenantName
+        FROM adm_organization org
+        LEFT JOIN sys_tenant st ON org.tenant_id = st.id
+        <where>
+            <if test="registerFlag != null">
+                AND org.register_flag = #{registerFlag}
+            </if>
+            <if test="deleteFlag != null">
+                AND org.delete_flag = #{deleteFlag}
+            </if>
+            <if test="name != null and name != ''">
+                AND org.name LIKE CONCAT('%', #{name}, '%')
+            </if>
+            <if test="orgName != null and orgName != ''">
+                AND st.tenant_name = #{orgName}
+            </if>
+        </where>
+        ORDER BY org.bus_no ASC
+    </select>
 
-</mapper>
+</mapper>