fix: 修复前端重命名残留问题

- 删除冗余的 openhis.js 工具文件
- 修正所有 utils import 路径 (healthlink-his → his)
- 更新 package.json 名称为 healthlink-his
- 更新 settings.js 版权声明
- 修正 .env 文件注释
- 修正 Java 包名示例 (com.healthlink-his → com.healthlink.his)
This commit is contained in:
2026-06-05 13:18:15 +08:00
parent 473a2c974f
commit d07cab2314
26 changed files with 27 additions and 312 deletions

View File

@@ -4,7 +4,7 @@ VITE_APP_TITLE =医院信息管理系统
# 开发环境配置
VITE_APP_ENV = 'dev'
# OpenHIS管理系统/开发环境
# HealthLink-HIS管理系统/开发环境
VITE_APP_BASE_API = '/dev-api'
# 租户ID配置

View File

@@ -4,5 +4,5 @@ VITE_APP_TITLE =医院信息管理系统
# 开发环境配置
VITE_APP_ENV = 'development'
# OpenHIS管理系统/开发环境
# HealthLink-HIS管理系统/开发环境
VITE_APP_BASE_API = '/dev-api'

View File

@@ -4,7 +4,7 @@ VITE_APP_TITLE=医院信息管理系统
# 生产环境配置
VITE_APP_ENV= 'prod'
# OpenHIS管理系统/生产环境
# HealthLink-HIS管理系统/生产环境
VITE_APP_BASE_API= '/prd-api'
# 租户ID配置

View File

@@ -10,7 +10,7 @@ VITE_BASE_URL='http://192.168.110.252'
# 文件上传类型server - 后端上传, client - 前端直连上传仅支持S3服务
VITE_UPLOAD_TYPE=server
# OpenHIS管理系统/SPUG环境
# HealthLink-HIS管理系统/SPUG环境
VITE_APP_BASE_API = '/admin-api'
# 租户ID配置

View File

@@ -1,8 +1,8 @@
{
"name": "openhis",
"name": "healthlink-his",
"version": "3.8.10",
"description": "OpenHIS管理系统",
"author": "OpenHIS",
"description": "HealthLink-HIS管理系统",
"author": "HealthLink-HIS",
"license": "MIT",
"type": "module",
"scripts": {

View File

@@ -1,5 +1,5 @@
import request from '@/utils/request'
import {parseStrEmpty} from "@/utils/openhis";
import {parseStrEmpty} from "@/utils/his";
// 查询用户列表
export function listUser(query) {

View File

@@ -1,5 +1,5 @@
import request from '@/utils/request'
import {parseStrEmpty} from "@/utils/healthlink-his";
import {parseStrEmpty} from "@/utils/his";
// 查询用户列表
export function listUser(query) {

View File

@@ -33,7 +33,7 @@
<script setup>
import Fuse from 'fuse.js';
import {getNormalPath} from '@/utils/healthlink-his';
import {getNormalPath} from '@/utils/his';
import {isHttp} from '@/utils/validate';
import usePermissionStore from '@/store/modules/permission';

View File

@@ -57,7 +57,7 @@
<script setup>
import {isExternal} from '@/utils/validate'
import AppLink from './Link'
import {getNormalPath} from '@/utils/healthlink-his'
import {getNormalPath} from '@/utils/his'
const props = defineProps({
// route object

View File

@@ -70,7 +70,7 @@
<script setup>
import ScrollPane from './ScrollPane';
import {getNormalPath} from '@/utils/healthlink-his';
import {getNormalPath} from '@/utils/his';
import useTagsViewStore from '@/store/modules/tagsView';
import useSettingsStore from '@/store/modules/settings';
import usePermissionStore from '@/store/modules/permission';

View File

@@ -27,7 +27,7 @@ import elementIcons from '@/components/SvgIcon/svgicon';
import './permission'; // permission control
import {useDict} from '@/utils/dict';
import {addDateRange, handleTree, parseTime, resetForm, selectDictLabel, selectDictLabels,} from '@/utils/healthlink-his';
import {addDateRange, handleTree, parseTime, resetForm, selectDictLabel, selectDictLabels,} from '@/utils/his';
import {formatDateStr} from '@/utils/index';

View File

@@ -3,7 +3,7 @@ import {ElLoading, ElMessage} from 'element-plus'
import {saveAs} from 'file-saver'
import {getToken} from '@/utils/auth'
import errorCode from '@/utils/errorCode'
import {blobValidate, tansParams} from '@/utils/healthlink-his'
import {blobValidate, tansParams} from '@/utils/his'
const baseURL = import.meta.env.VITE_APP_BASE_API
let downloadLoadingInstance;

View File

@@ -70,5 +70,5 @@ export default {
/**
* 底部版权内容
*/
footerContent: 'Copyright © 2018-2026 OpenHIS. All Rights Reserved.'
footerContent: 'Copyright © 2018-2026 HealthLink-HIS. All Rights Reserved.'
}

View File

@@ -1,4 +1,4 @@
import { parseTime } from './healthlink-his'
import { parseTime } from './his'
// 导出 parseTime 函数以供其他模块使用
export { parseTime }

View File

@@ -1,285 +0,0 @@
/**
* 通用js方法封装处理
* Copyright (c) 2019 ruoyi
*/
// 日期格式化
export function parseTime(time, pattern) {
if (arguments.length === 0 || !time) {
return null
}
const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
let date
if (typeof time === 'object') {
date = time
} else {
if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
time = parseInt(time)
} else if (typeof time === 'string') {
// 处理 ISO 8601 格式的时间字符串,保留时区信息
// 例如:"2026-01-19T01:59:27.239+08:00"
if (time.includes('T')) {
// 直接使用 ISO 8601 格式的字符串创建日期对象
date = new Date(time)
// 如果日期无效,尝试其他格式
if (isNaN(date.getTime())) {
// 移除毫秒部分但保留时区信息
time = time.replace(/\.\d{3}/, '')
date = new Date(time)
}
} else {
// 处理其他格式的字符串
time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
}
}
if (!date || isNaN(date.getTime())) {
// 如果还没有创建有效的日期对象,则基于处理后的字符串创建
if (typeof time === 'string') {
date = new Date(time)
}
}
if ((typeof time === 'number') && (time.toString().length === 10)) {
time = time * 1000
}
if (!date || isNaN(date.getTime())) {
// 最终尝试使用原始时间值
date = new Date(time)
}
}
// 检查日期是否有效
if (isNaN(date.getTime())) {
return null
}
const formatObj = {
y: date.getFullYear(),
m: date.getMonth() + 1,
d: date.getDate(),
h: date.getHours(),
i: date.getMinutes(),
s: date.getSeconds(),
a: date.getDay()
}
const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
let value = formatObj[key]
// Note: getDay() returns 0 on Sunday
if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
if (result.length > 0 && value < 10) {
value = '0' + value
}
return value || 0
})
return time_str
}
// 表单重置
export function resetForm(refName) {
if (this.$refs[refName]) {
this.$refs[refName].resetFields();
}
}
// 添加日期范围
export function addDateRange(params, dateRange, propName) {
let search = params;
search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {};
dateRange = Array.isArray(dateRange) ? dateRange : [];
if (typeof (propName) === 'undefined') {
search.params['beginTime'] = dateRange[0];
search.params['endTime'] = dateRange[1];
} else {
search.params['begin' + propName] = dateRange[0];
search.params['end' + propName] = dateRange[1];
}
return search;
}
// 回显数据字典
export function selectDictLabel(datas, value) {
if (value === undefined) {
return "";
}
var actions = [];
Object.keys(datas).some((key) => {
if (datas[key].value == ('' + value)) {
actions.push(datas[key].label);
return true;
}
})
if (actions.length === 0) {
actions.push(value);
}
return actions.join('');
}
// 回显数据字典(字符串数组)
export function selectDictLabels(datas, value, separator) {
if (value === undefined || value.length ===0) {
return "";
}
if (Array.isArray(value)) {
value = value.join(",");
}
var actions = [];
var currentSeparator = undefined === separator ? "," : separator;
var temp = value.split(currentSeparator);
Object.keys(value.split(currentSeparator)).some((val) => {
var match = false;
Object.keys(datas).some((key) => {
if (datas[key].value == ('' + temp[val])) {
actions.push(datas[key].label + currentSeparator);
match = true;
}
})
if (!match) {
actions.push(temp[val] + currentSeparator);
}
})
return actions.join('').substring(0, actions.join('').length - 1);
}
// 字符串格式化(%s )
export function sprintf(str) {
var args = arguments, flag = true, i = 1;
str = str.replace(/%s/g, function () {
var arg = args[i++];
if (typeof arg === 'undefined') {
flag = false;
return '';
}
return arg;
});
return flag ? str : '';
}
// 转换字符串undefined,null等转化为""
export function parseStrEmpty(str) {
if (!str || str == "undefined" || str == "null") {
return "";
}
return str;
}
// 数据合并
export function mergeRecursive(source, target) {
for (var p in target) {
try {
if (target[p].constructor == Object) {
source[p] = mergeRecursive(source[p], target[p]);
} else {
source[p] = target[p];
}
} catch (e) {
source[p] = target[p];
}
}
return source;
};
/**
* 构造树型结构数据
* @param {*} data 数据源
* @param {*} id id字段 默认 'id'
* @param {*} parentId 父节点字段 默认 'parentId'
* @param {*} children 孩子节点字段 默认 'children'
*/
export function handleTree(data, id, parentId, children) {
let config = {
id: id || 'id',
parentId: parentId || 'parentId',
childrenList: children || 'children'
};
var childrenListMap = {};
var nodeIds = {};
var tree = [];
for (let d of data) {
let parentId = d[config.parentId];
if (childrenListMap[parentId] == null) {
childrenListMap[parentId] = [];
}
nodeIds[d[config.id]] = d;
childrenListMap[parentId].push(d);
}
for (let d of data) {
let parentId = d[config.parentId];
if (nodeIds[parentId] == null) {
tree.push(d);
}
}
for (let t of tree) {
adaptToChildrenList(t);
}
function adaptToChildrenList(o) {
if (childrenListMap[o[config.id]] !== null) {
o[config.childrenList] = childrenListMap[o[config.id]];
}
if (o[config.childrenList]) {
for (let c of o[config.childrenList]) {
adaptToChildrenList(c);
}
}
}
return tree;
}
/**
* 参数处理
* @param {*} params 参数
*/
export function tansParams(params) {
let result = ''
for (const propName of Object.keys(params)) {
const value = params[propName];
var part = encodeURIComponent(propName) + "=";
if (value !== null && value !== "" && typeof (value) !== "undefined") {
if (typeof value === 'object') {
// 处理数组类型
if (Array.isArray(value)) {
for (const item of value) {
if (item !== null && item !== "" && typeof (item) !== 'undefined') {
result += part + encodeURIComponent(item) + "&";
}
}
} else {
// 处理对象类型
for (const key of Object.keys(value)) {
if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') {
let params = propName + '[' + key + ']';
var subPart = encodeURIComponent(params) + "=";
result += subPart + encodeURIComponent(value[key]) + "&";
}
}
}
} else {
result += part + encodeURIComponent(value) + "&";
}
}
}
return result
}
// 返回项目路径
export function getNormalPath(p) {
if (p.length === 0 || !p || p == 'undefined') {
return p
};
let res = p.replace('//', '/')
if (res[res.length - 1] === '/') {
return res.slice(0, res.length - 1)
}
return res;
}
// 验证是否为blob格式
export function blobValidate(data) {
return data.type !== 'application/json'
}

View File

@@ -2,7 +2,7 @@ import axios from 'axios'
import {ElLoading, ElMessage, ElMessageBox, ElNotification} from 'element-plus'
import {getToken} from '@/utils/auth'
import errorCode from '@/utils/errorCode'
import {blobValidate, tansParams} from '@/utils/healthlink-his'
import {blobValidate, tansParams} from '@/utils/his'
import cache from '@/plugins/cache'
import {saveAs} from 'file-saver'
import useUserStore from '@/store/modules/user'

View File

@@ -304,7 +304,7 @@ import {
updateNurseSign,
updateSkinTestRecord,
} from './component/api';
import {parseTime} from '@/utils/healthlink-his';
import {parseTime} from '@/utils/his';
import {formatDateStr} from '@/utils/index';
import useUserStore from '@/store/modules/user';

View File

@@ -128,7 +128,7 @@
<script setup>
import {onMounted, reactive, ref} from 'vue';
import {ElMessage, ElMessageBox} from 'element-plus';
import {parseTime} from '@/utils/healthlink-his';
import {parseTime} from '@/utils/his';
import Pagination from '@/components/Pagination';
import {
cancelSupplyRequestData,

View File

@@ -159,7 +159,7 @@
<script setup>
import {onMounted, reactive, ref} from 'vue';
import {ElMessage} from 'element-plus';
import {parseTime} from '@/utils/healthlink-his';
import {parseTime} from '@/utils/his';
import Pagination from '@/components/Pagination';
import request from '@/utils/request';
//import { getPriceAdjustmentPage, getPriceAdjustmentDetail, cancelPriceAdjustment } from './components/api';

View File

@@ -230,7 +230,7 @@
import {computed, ref, watch} from 'vue';
import {useRouter} from 'vue-router';
import {getInit, getOrderList} from './components/api';
import {parseTime} from '@/utils/healthlink-his';
import {parseTime} from '@/utils/his';
const router = useRouter();
// 制单日期

View File

@@ -337,7 +337,7 @@
<template #content>
<div>
Bean调用示例ryTask.ryParams('healthlink-his')
<br>Class类调用示例com.healthlink-his.quartz.task.RyTask.ryParams('healthlink-his')
<br>Class类调用示例com.healthlink.his.quartz.task.RyTask.ryParams('healthlink-his')
<br>参数说明支持字符串布尔类型长整型浮点型整型
</div>
</template>

View File

@@ -7,7 +7,7 @@
class="register-form"
>
<h3 class="title">
OpenHIS后台管理系统
HealthLink-HIS后台管理系统
</h3>
<el-form-item prop="username">
<el-input

View File

@@ -1645,7 +1645,7 @@
<script setup name="SurgicalSchedule">
import { ref, reactive, onMounted, nextTick, computed, watch } from 'vue'
import { getCurrentInstance } from 'vue'
import { parseTime } from '@/utils/healthlink-his'
import { parseTime } from '@/utils/his'
import { useDict } from '@/utils/dict'
import download from '@/plugins/download'
import Prescriptionlist from '@/views/clinicmanagement/bargain/component/prescriptionlist.vue'

View File

@@ -399,7 +399,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
import useUserStore from '@/store/modules/user'
import { checkPassword } from '@/api/surgicalschedule'
import { savePrescription } from '@/views/clinicmanagement/bargain/component/api.js'
import { parseTime } from '@/utils/healthlink-his'
import { parseTime } from '@/utils/his'
// 定义props
const props = defineProps({

View File

@@ -585,7 +585,7 @@
import {addMenu, delMenu, getMenu, listMenu, updateMenu, treeselect, refreshMenuCache} from "@/api/system/menu";
import SvgIcon from "@/components/SvgIcon";
import IconSelect from "@/components/IconSelect";
import {getNormalPath} from "@/utils/healthlink-his";
import {getNormalPath} from "@/utils/his";
const { proxy } = getCurrentInstance();
const { sys_show_hide, sys_normal_disable } = proxy.useDict("sys_show_hide", "sys_normal_disable");

View File

@@ -54,7 +54,7 @@
<template #label>
生成包路径
<el-tooltip
content="生成在哪个java包下例如 com.healthlink-his.system"
content="生成在哪个java包下例如 com.healthlink.his.system"
placement="top"
>
<el-icon><question-filled /></el-icon>