fix: 修复残疾人企业查询页面的 API 客户端初始化和后端查询问题

前端修复 (DisabilityPersonCompanyQuery.tsx):
- 修改 API 客户端初始化方式，从直接使用 rpcClient 改为使用 disabilityClientManager.get() 单例
- 修改 API 调用方式，使用 .$get({ query: ... }) 正确的调用语法
- 添加状态检查和 JSON 解析逻辑

后端修复 (disabled-person.service.ts):
- 修复 findPersonsWithCompany 方法中 getCount() 在有自定义 select 时无法正常工作的问题
- 使用单独的查询来获取总数，避免与 select 语句冲突
- 为所有响应字段添加明确的类型转换，确保数据类型正确

Co-Authored-By: Claude <noreply@anthropic.com>

allin-packages/disability-module/src/services/disabled-person.service.ts

@@ -903,9 +903,54 @@ export class DisabledPersonService extends GenericCrudService<DisabledPerson> {
     // 排序
     queryBuilder.orderBy('op.joinDate', 'DESC');
 
-    // 获取总数
-    const totalQuery = queryBuilder.clone();
-    const total = await totalQuery.getCount();
+    // 获取总数 - 使用单独的查询，因为 getCount() 在有自定义 select 时会失败
+    const countQueryBuilder = orderPersonRepo.createQueryBuilder('op')
+      .innerJoin('op.person', 'person')
+      .innerJoin('op.order', 'order')
+      .leftJoin('order.company', 'company');
+
+    // 应用相同的筛选条件
+    if (gender) {
+      countQueryBuilder.andWhere('person.gender = :gender', { gender });
+    }
+    if (disabilityType) {
+      countQueryBuilder.andWhere('person.disabilityType = :disabilityType', { disabilityType });
+    }
+    if (disabilityLevel) {
+      countQueryBuilder.andWhere('person.disabilityLevel = :disabilityLevel', { disabilityLevel });
+    }
+    if (city) {
+      countQueryBuilder.andWhere('person.city = :city', { city });
+    }
+    if (district) {
+      countQueryBuilder.andWhere('person.district = :district', { district });
+    }
+    if (disabilityId) {
+      countQueryBuilder.andWhere('person.disabilityId = :disabilityId', { disabilityId });
+    }
+    if (companyId) {
+      countQueryBuilder.andWhere('order.companyId = :companyId', { companyId });
+    }
+
+    // 年龄筛选：根据出生日期计算
+    if (minAge !== undefined || maxAge !== undefined) {
+      const today = new Date();
+      const minBirthDate = maxAge !== undefined
+        ? new Date(today.getFullYear() - maxAge - 1, today.getMonth(), today.getDate())
+        : undefined;
+      const maxBirthDate = minAge !== undefined
+        ? new Date(today.getFullYear() - minAge, today.getMonth(), today.getDate())
+        : undefined;
+
+      if (minBirthDate) {
+        countQueryBuilder.andWhere('person.birthDate <= :minBirthDate', { minBirthDate });
+      }
+      if (maxBirthDate) {
+        countQueryBuilder.andWhere('person.birthDate >= :maxBirthDate', { maxBirthDate });
+      }
+    }
+
+    const total = Number(await countQueryBuilder.getCount()) || 0;
 
     // 分页
     queryBuilder.offset((page - 1) * limit).limit(limit);
@@ -913,19 +958,19 @@ export class DisabledPersonService extends GenericCrudService<DisabledPerson> {
     // 执行查询
     const rawResults = await queryBuilder.getRawMany();
 
-    // 转换结果格式
+    // 转换结果格式，确保字段类型正确
     const data = rawResults.map((row: any) => ({
-      personId: row.personid,
-      name: row.name,
-      gender: row.gender,
-      disabilityType: row.disabilitytype,
-      disabilityLevel: row.disabilitylevel,
-      disabilityId: row.disabilityid,
-      city: row.city,
-      district: row.district,
-      companyName: row.companyname,
-      orderId: row.orderid,
-      joinDate: row.joindate
+      personId: Number(row.personid) || 0,
+      name: String(row.name || ''),
+      gender: String(row.gender || ''),
+      disabilityType: String(row.disabilitytype || ''),
+      disabilityLevel: String(row.disabilitylevel || ''),
+      disabilityId: String(row.disabilityid || ''),
+      city: String(row.city || ''),
+      district: row.district || null,
+      companyName: String(row.companyname || ''),
+      orderId: Number(row.orderid) || 0,
+      joinDate: row.joindate ? new Date(row.joindate) : new Date()
     }));
 
     return { data, total };

allin-packages/disability-person-management-ui/src/components/DisabilityPersonCompanyQuery.tsx

@@ -28,7 +28,7 @@ export const DisabilityPersonCompanyQuery: React.FC = () => {
   const { data, isLoading, error } = useQuery({
     queryKey: ['disability-person-company', filters],
     queryFn: async () => {
-      const response = await disabilityClient.findPersonsWithCompany.$get({
+      const res = await disabilityClient.findPersonsWithCompany.$get({
         query: {
           gender: filters.gender || undefined,
           disabilityType: filters.disabilityType || undefined,
@@ -43,9 +43,12 @@ export const DisabilityPersonCompanyQuery: React.FC = () => {
           take: filters.limit
         }
       });
-
-      // 直接返回响应数据
-      return response;
+      if (res.status !== 200) throw new Error('获取残疾人企业关联数据失败');
+      return await res.json();
+    },
+    initialData: {
+      data: [],
+      total: 0
     }
   });