优化2 patch2

tests/admission.test.mjs

@@ -1,5 +1,5 @@
 import assert from 'node:assert/strict';
-import { admissionCutoffRows, buildVolunteerPlacements, candidateTotalScore, publicAdmissionRows, remainingPlanQuota, sourceSchoolQualificationStatus } from '../src/services/volunteer-admission.mjs';
+import { admissionCutoffRows, buildVolunteerPlacements, candidateAdmissionScore, candidateTotalScore, publicAdmissionRows, remainingPlanQuota, sourceSchoolQualificationStatus } from '../src/services/volunteer-admission.mjs';
 import { candidateEligibleForCategory, specialtyLabel } from '../src/data/specialty-types.mjs';
 
 const now = '2026-07-21T08:00:00.000Z';
@@ -46,24 +46,42 @@ const db = {
 const setting = { examId: 'exam', payload: { round: 1 } };
 const placements = buildVolunteerPlacements(db, setting, { uid: prefix => `${prefix}-${++sequence}`, nowIso: () => now });
 assert.equal(candidateTotalScore(db, 'exam', 'u-high'), 250, '投档总分应取当次全部已发布科目之和');
+assert.equal(candidateAdmissionScore(db, 'exam', 'u-sport', { code: 'general' }), 215, '普通招生类别不得加入特征分');
+assert.equal(candidateAdmissionScore(db, 'exam', 'u-sport', { specialtyCategory: 'sports', specialtyType: 'track_field' }), 303.5, '特长生招生类别应使用文化课总分加特征分');
 assert.equal(placements.length, 3, '三个符合条件且计划充足的考生都应投档');
 assert.equal(placements.find(item => item.userId === 'u-high').schoolId, 'target-b', '最高分考生应优先满足第一志愿');
 assert.equal(placements.find(item => item.userId === 'u-low').schoolId, 'target-a', '第一志愿已满时应继续遵循下一志愿');
 assert.equal(placements.find(item => item.userId === 'u-sport').payload.quotaBucket, 'indicator:source-b', '特长生指标应使用对应生源学校指标名额');
-assert.equal(placements.find(item => item.userId === 'u-sport').payload.featureScore, 88.5, '特征分应随投档材料发送，但不并入文化课总分');
+assert.equal(placements.find(item => item.userId === 'u-sport').payload.featureScore, 88.5, '特征分应随投档材料发送');
+assert.equal(placements.find(item => item.userId === 'u-sport').payload.culturalScore, 215, '特长生投档材料应保留文化课原始总分');
+assert.equal(placements.find(item => item.userId === 'u-sport').payload.totalScore, 303.5, '特长生类别投档总分应加入特征分');
 assert.equal(specialtyLabel('sports', 'track_field'), '体育·田径', '特长资格应显示大类和小类');
 assert.equal(candidateEligibleForCategory(db.candidateProfiles[2], { specialtyCategory: 'arts', specialtyType: 'fine_arts' }), false, '体育资格考生不得填报艺术类计划');
 
+const specialtyPriorityDb = structuredClone(db);
+specialtyPriorityDb.users.push({ id: 'u-sport-rival', role: 'candidate', active: true, candidateNumber: '20260004', displayName: '特长竞争考生' });
+specialtyPriorityDb.candidateProfiles.push({ userId: 'u-sport-rival', name: '特长竞争考生', schoolId: 'source-b', profileCompleted: true, specialtyCategory: 'sports', specialtyType: 'track_field', specialtyTypes: ['track_field'] });
+specialtyPriorityDb.registrations.push({ id: 'r-sport-rival', examId: 'exam', userId: 'u-sport-rival', status: 'approved', subjectIds: ['cn', 'math'], featureScore: 0 });
+specialtyPriorityDb.results.push({ registrationId: 'r-sport-rival', subjectId: 'cn', score: 125, published: true }, { registrationId: 'r-sport-rival', subjectId: 'math', score: 125, published: true });
+specialtyPriorityDb.admissionRecords.push(
+  { id: 'qual-sport-rival', kind: 'indicator_qualification', examId: 'exam', userId: 'u-sport-rival', schoolId: 'source-b', status: 'confirmed', payload: { eligible: true } },
+  { id: 'pref-sport-rival', kind: 'preference', examId: 'exam', userId: 'u-sport-rival', status: 'submitted', payload: { round: 1, choices: [{ schoolId: 'target-b', categoryCode: 'sport', preferenceType: 'indicator' }] } }
+);
+const specialtyPriorityPlacements = buildVolunteerPlacements(specialtyPriorityDb, setting, { uid: prefix => `${prefix}-priority-${++sequence}`, nowIso: () => now });
+assert.equal(specialtyPriorityPlacements.find(item => item.payload.categoryCode === 'sport').userId, 'u-sport', '特长类别应按文化课加特征分排序，而不是只按文化课排序');
+
 db.admissionRecords.push(...placements.map(item => ({ ...item, status: 'final' })));
 const remaining = remainingPlanQuota(db, db.admissionRecords.find(item => item.id === 'plan-b'));
 assert.equal(remaining.find(item => item.code === 'general').remaining, 0, '普通生计划占用应准确统计');
 assert.equal(remaining.find(item => item.code === 'sport').remaining, 0, '特长生计划占用应准确统计');
 const publicRows = publicAdmissionRows(db, 'exam');
-assert.equal(publicRows[0].registrationNumber, '20260001', '公示必须公开报名号');
-assert.equal(publicRows[0].name, '高分考生', '公示必须公开姓名');
-assert.equal(publicRows[0].totalScore, 250, '公示必须公开总成绩');
-assert.equal(publicRows[0].admittedSchool, '第二中学', '公示必须公开录取学校');
-assert.ok(publicRows[0].idNumberMasked.includes('*') && !publicRows[0].idNumberMasked.includes('20090101'), '重要身份信息必须脱敏');
+const highPublicRow = publicRows.find(item => item.registrationNumber === '20260001');
+assert.equal(highPublicRow.registrationNumber, '20260001', '公示必须公开报名号');
+assert.equal(highPublicRow.name, '高分考生', '公示必须公开姓名');
+assert.equal(highPublicRow.totalScore, 250, '普通类别公示总成绩不得加入特征分');
+assert.equal(highPublicRow.admittedSchool, '第二中学', '公示必须公开录取学校');
+assert.ok(highPublicRow.idNumberMasked.includes('*') && !highPublicRow.idNumberMasked.includes('20090101'), '重要身份信息必须脱敏');
+assert.equal(publicRows.find(item => item.registrationNumber === '20260003').totalScore, 303.5, '特长生类别公示总成绩应包含特征分');
 const cutoffs = admissionCutoffRows(db, 'exam');
 assert.equal(cutoffs.find(item => item.schoolId === 'target-b' && item.categoryCode === 'general').cutoffScore, 250, '录取分数线应取学校招生类别最终录取最低总分');
 const qualificationStatus = sourceSchoolQualificationStatus(db, 'exam', 'source-b');