diff --git a/models/schema/hospital.js b/models/schema/hospital.js index ebb7e62..a9bcfc7 100644 --- a/models/schema/hospital.js +++ b/models/schema/hospital.js @@ -7,6 +7,8 @@ import { resolveHospitalNicknames } from "../../resource/hospital_nicknames.js"; // 复旦综合榜未上榜医院的默认档位:排在所有上榜医院之后 const DEFAULT_FUDAN_RANK = 999; +// 同档内按榜单文件顺序排,未上榜医院用更大的默认值排在最后 +const DEFAULT_FUDAN_ORDER = 9999; // 复旦综合榜只有等级档位(A+++++ / A++++ / A+++),同档不分先后; // 按榜单出现顺序映射成 1/2/3,后续榜单新增更低档位也能自动延续 @@ -27,21 +29,22 @@ const normalizeHospitalName = (value) => .replace(/[\s\--—–·]/g, ""); const FUDAN_RANK_BY_NAME = new Map(); -for (const item of hospitalRanking.rankings) { +hospitalRanking.rankings.forEach((item, index) => { const key = normalizeHospitalName(item.name); if (key && !FUDAN_RANK_BY_NAME.has(key)) { FUDAN_RANK_BY_NAME.set(key, { rank: FUDAN_GRADE_ORDER.get(item.grade) || DEFAULT_FUDAN_RANK, grade: item.grade, + order: index + 1, }); } -} +}); /** * 解析医院对应的复旦综合榜档位 * 以主体名称优先;名称带括号别名时先归一,再处理统一前缀与历史别名。 * @param {string[]} names 依次尝试的名称 - * @returns {{rank:number, grade:string}|null} + * @returns {{rank:number, grade:string, order:number}|null} */ const resolveFudanRank = (names = []) => { for (const value of names) { @@ -92,6 +95,12 @@ const HospitalSchema = mongoose.Schema( comment: "复旦综合排行榜档位,1 最高;未上榜为默认值", }, fudanGrade: { type: String, default: "", comment: "复旦综合排行榜等级,如 A+++++" }, + fudanOrder: { + type: Number, + default: DEFAULT_FUDAN_ORDER, + index: true, + comment: "复旦榜单文件内顺序,用于同档内的稳定排序", + }, meta: { createtime: { type: Date, default: Date.now, comment: "创建时间" }, updatetime: { type: Date, default: Date.now, comment: "更新时间" }, @@ -141,6 +150,7 @@ HospitalSchema.pre("save", function (next) { const fudan = resolveFudanRank([this.entityName, name]); this.fudanRank = fudan ? fudan.rank : DEFAULT_FUDAN_RANK; this.fudanGrade = fudan ? fudan.grade : ""; + this.fudanOrder = fudan ? fudan.order : DEFAULT_FUDAN_ORDER; next(); }); @@ -176,8 +186,8 @@ HospitalSchema.statics.findHospitals = async function (options = {}) { const skip = (page - 1) * pageSize; const [list, total] = await Promise.all([ - // 复旦榜上榜医院优先,同档按拼音排序;未上榜的默认值排在最后 - this.find(filter).sort({ fudanRank: 1, pinyin: 1, name: 1 }).skip(skip).limit(pageSize).exec(), + // 复旦榜上榜医院优先;同档按榜单文件顺序,最后用拼音兜底;未上榜排在最后 + this.find(filter).sort({ fudanRank: 1, fudanOrder: 1, pinyin: 1, name: 1 }).skip(skip).limit(pageSize).exec(), this.countDocuments(filter).exec(), ]); @@ -237,6 +247,7 @@ HospitalSchema.statics.updateHospitalById = async function (id, update) { const fudan = resolveFudanRank([finalEntityName, finalName]); update.fudanRank = fudan ? fudan.rank : DEFAULT_FUDAN_RANK; update.fudanGrade = fudan ? fudan.grade : ""; + update.fudanOrder = fudan ? fudan.order : DEFAULT_FUDAN_ORDER; } update["meta.updatetime"] = Date.now(); @@ -248,4 +259,4 @@ HospitalSchema.statics.deleteHospitalById = async function (id) { return await this.findByIdAndDelete(id).exec(); }; -export { HospitalSchema, DEFAULT_FUDAN_RANK, resolveFudanRank }; +export { HospitalSchema, DEFAULT_FUDAN_RANK, DEFAULT_FUDAN_ORDER, resolveFudanRank }; diff --git a/scripts/backfill_hospital_fudan_rank.js b/scripts/backfill_hospital_fudan_rank.js index 9dea5d7..481dbc0 100644 --- a/scripts/backfill_hospital_fudan_rank.js +++ b/scripts/backfill_hospital_fudan_rank.js @@ -1,11 +1,15 @@ /** - * 一次性回填:按复旦综合排行榜给存量医院写入 fudanRank / fudanGrade。 + * 一次性回填:按复旦综合排行榜给存量医院写入 fudanRank / fudanGrade / fudanOrder。 * * 用法:在 api/health 下执行 `node scripts/backfill_hospital_fudan_rank.js` - * 未上榜医院写默认档位 999,保证接口排序时排在所有上榜医院之后。 + * 未上榜医院写默认档位 999 / 默认顺序 9999,保证接口排序时排在所有上榜医院之后。 */ import { DBModel } from "../models/index.js"; -import { DEFAULT_FUDAN_RANK, resolveFudanRank } from "../models/schema/hospital.js"; +import { + DEFAULT_FUDAN_RANK, + DEFAULT_FUDAN_ORDER, + resolveFudanRank, +} from "../models/schema/hospital.js"; DBModel.init(); const conn = DBModel.dbConnection; @@ -13,7 +17,7 @@ const conn = DBModel.dbConnection; async function backfill() { const hospitals = await DBModel.Hospital.find( {}, - { name: 1, entityName: 1, fudanRank: 1, fudanGrade: 1 } + { name: 1, entityName: 1, fudanRank: 1, fudanGrade: 1, fudanOrder: 1 } ).lean(); const operations = []; @@ -23,14 +27,15 @@ async function backfill() { const fudan = resolveFudanRank([hospital.entityName, hospital.name]); const rank = fudan ? fudan.rank : DEFAULT_FUDAN_RANK; const grade = fudan ? fudan.grade : ""; + const order = fudan ? fudan.order : DEFAULT_FUDAN_ORDER; if (fudan) ranked += 1; - if (hospital.fudanRank === rank && hospital.fudanGrade === grade) continue; + if (hospital.fudanRank === rank && hospital.fudanGrade === grade && hospital.fudanOrder === order) continue; operations.push({ updateOne: { filter: { _id: hospital._id }, - update: { $set: { fudanRank: rank, fudanGrade: grade } }, + update: { $set: { fudanRank: rank, fudanGrade: grade, fudanOrder: order } }, }, }); }