提交merge1.3

2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions
--- a/openhis-ui-vue3/src/utils/his.js
+++ b/openhis-ui-vue3/src/utils/his.js
@@ -501,4 +501,36 @@ export function getGroupMarkers(tableData) {
    }
  });
  return tableData;
+<<<<<<< HEAD
+=======
+}
+
+/**
+ * 格式化库存数量显示(大单位情况) 示例 1盒5片
+ * @param quantity 小单位库存数量
+ * @param partPercent 拆零比
+ * @param unitCode 大单位label
+ * @param minUnitCode 小单位label
+ */
+export function formatInventory(quantity, partPercent, unitCode, minUnitCode) {
+  // 处理负数情况
+  const isNegative = quantity < 0;
+  const absQuantity = Math.abs(quantity);
+
+  if (absQuantity % partPercent !== 0) {
+    const integerPart = Math.floor(absQuantity / partPercent);
+    const decimalPart = absQuantity % partPercent;
+
+    let result = integerPart.toString() + ' ' + unitCode;
+    if (decimalPart > 0) {
+      result += decimalPart.toString() + ' ' + minUnitCode;
+    }
+
+    return isNegative ? '-' + result : result;
+  }
+
+  // 整除情况
+  const result = absQuantity / partPercent;
+  return isNegative ? '-' + result : result + ' ' + unitCode;
+>>>>>>> v1.3
 }
--- a/openhis-ui-vue3/src/utils/printUtils.js
+++ b/openhis-ui-vue3/src/utils/printUtils.js
@@ -3,7 +3,11 @@
 * 集中管理所有打印相关功能
 */

+<<<<<<< HEAD
 // 打印模板映射表
+=======
+// 打印模板映射表   .
+>>>>>>> v1.3
 const TEMPLATE_MAP = {
  // CLINIC_CHARGE: () => import('@/views/charge/cliniccharge/components/template.json'),
  // DISPOSAL: () => import('@/views/clinicmanagement/disposal/components/disposalTemplate.json'),
@@ -21,6 +25,28 @@ const TEMPLATE_MAP = {
  OUTPATIENT_REGISTRATION: () => import('@/components/Print/OutpatientRegistration.json'),
  //门诊收费
  OUTPATIENT_CHARGE: () => import('@/components/Print/OutpatientBilling.json'),
+<<<<<<< HEAD
+=======
+  //门诊病历
+  OUTPATIENT_MEDICAL_RECORD: () => import('@/components/Print/OutpatientMedicalRecord.json'),
+  //门诊输液贴
+  OUTPATIENT_INFUSION: () => import('@/components/Print/OutpatientInfusion.json'),
+  //手术记录
+  OPERATIVE_RECORD: () => import('@/components/Print/OperativeRecord.json'),
+
+  //红旗门诊病历
+  HQOUTPATIENT_MEDICAL_RECORD: () => import('@/components/Print/HQOutpatientMedicalRecord.json'),
+  //预交金
+  ADVANCE_PAYMENT: () => import('@/components/Print/AdvancePayment.json'),
+  //中药处方单
+  CHINESE_MEDICINE_PRESCRIPTION: () =>
+    import('@/components/Print/ChineseMedicinePrescription.json'),
+  //药房处方单
+  PHARMACY_PRESCRIPTION: () => import('@/components/Print/Pharmacy.json'),
+  //中药医生处方单
+  DOC_CHINESE_MEDICINE_PRESCRIPTION: () =>
+    import('@/components/Print/DocChineseMedicinePrescription.json'),
+>>>>>>> v1.3
 };

 /**
@@ -108,6 +134,25 @@ export const PRINT_TEMPLATE = {
  PRESCRIPTION: 'PRESCRIPTION',
  //处置单
  DISPOSAL: 'DISPOSAL',
+<<<<<<< HEAD
+=======
+  //门诊病历
+  OUTPATIENT_MEDICAL_RECORD: 'OUTPATIENT_MEDICAL_RECORD',
+  //门诊输液贴
+  OUTPATIENT_INFUSION: 'OUTPATIENT_INFUSION',
+  //手术记录
+  OPERATIVE_RECORD: 'OPERATIVE_RECORD',
+  //红旗门诊病历
+  HQOUTPATIENT_MEDICAL_RECORD: 'HQOUTPATIENT_MEDICAL_RECORD',
+  //预交金
+  ADVANCE_PAYMENT: 'ADVANCE_PAYMENT',
+  //中药处方单
+  CHINESE_MEDICINE_PRESCRIPTION: 'CHINESE_MEDICINE_PRESCRIPTION',
+  //药房处方单
+  PHARMACY_PRESCRIPTION: 'PHARMACY_PRESCRIPTION',
+  //中药医生处方单
+  DOC_CHINESE_MEDICINE_PRESCRIPTION: 'DOC_CHINESE_MEDICINE_PRESCRIPTION',
+>>>>>>> v1.3
 };

 /**
@@ -128,6 +173,10 @@ export function getPrinterList() {
 }

 import useUserStore from '@/store/modules/user';
+<<<<<<< HEAD
+=======
+import { ElMessage } from 'element-plus';
+>>>>>>> v1.3

 /**
 * 获取当前登录用户ID
@@ -280,6 +329,25 @@ export async function selectPrinterAndPrint(
  }
 }

+<<<<<<< HEAD
+=======
+// 预览打印
+export function previewPrint(elementDom) {
+  if (elementDom) {
+    //初始化
+    window.hiprint.init();
+    const hiprintTemplate = new window.hiprint.PrintTemplate();
+    // printByHtml为预览打印
+    hiprintTemplate.printByHtml(elementDom, {});
+  } else {
+    ElMessage({
+      type: 'error',
+      message: '加载模版失败',
+    });
+  }
+}
+
+>>>>>>> v1.3
 // 默认导出简化的打印方法
 export default {
  print: simplePrint,
--- a/openhis-ui-vue3/src/utils/validate.js
+++ b/openhis-ui-vue3/src/utils/validate.js
@@ -1,10 +1,10 @@
 /**
- * 判断url是否是http或https 
+ * 判断url是否是http或https
 * @param {string} path
 * @returns {Boolean}
 */
- export function isHttp(url) {
-  return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
+export function isHttp(url) {
+  return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1;
 }

 /**
@@ -12,8 +12,8 @@
 * @param {string} path
 * @returns {Boolean}
 */
- export function isExternal(path) {
-  return /^(https?:|mailto:|tel:)/.test(path)
+export function isExternal(path) {
+  return /^(https?:|mailto:|tel:)/.test(path);
 }

 /**
@@ -21,8 +21,8 @@
 * @returns {Boolean}
 */
 export function validUsername(str) {
-  const valid_map = ['admin', 'editor']
-  return valid_map.indexOf(str.trim()) >= 0
+  const valid_map = ['admin', 'editor'];
+  return valid_map.indexOf(str.trim()) >= 0;
 }

 /**
@@ -30,8 +30,9 @@ export function validUsername(str) {
 * @returns {Boolean}
 */
 export function validURL(url) {
-  const reg = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/
-  return reg.test(url)
+  const reg =
+    /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/;
+  return reg.test(url);
 }

 /**
@@ -39,8 +40,8 @@ export function validURL(url) {
 * @returns {Boolean}
 */
 export function validLowerCase(str) {
-  const reg = /^[a-z]+$/
-  return reg.test(str)
+  const reg = /^[a-z]+$/;
+  return reg.test(str);
 }

 /**
@@ -48,8 +49,8 @@ export function validLowerCase(str) {
 * @returns {Boolean}
 */
 export function validUpperCase(str) {
-  const reg = /^[A-Z]+$/
-  return reg.test(str)
+  const reg = /^[A-Z]+$/;
+  return reg.test(str);
 }

 /**
@@ -57,8 +58,8 @@ export function validUpperCase(str) {
 * @returns {Boolean}
 */
 export function validAlphabets(str) {
-  const reg = /^[A-Za-z]+$/
-  return reg.test(str)
+  const reg = /^[A-Za-z]+$/;
+  return reg.test(str);
 }

 /**
@@ -66,8 +67,9 @@ export function validAlphabets(str) {
 * @returns {Boolean}
 */
 export function validEmail(email) {
-  const reg = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
-  return reg.test(email)
+  const reg =
+    /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+  return reg.test(email);
 }

 /**
@@ -76,9 +78,9 @@ export function validEmail(email) {
 */
 export function isString(str) {
  if (typeof str === 'string' || str instanceof String) {
-    return true
+    return true;
  }
-  return false
+  return false;
 }

 /**
@@ -87,7 +89,39 @@ export function isString(str) {
 */
 export function isArray(arg) {
  if (typeof Array.isArray === 'undefined') {
-    return Object.prototype.toString.call(arg) === '[object Array]'
+    return Object.prototype.toString.call(arg) === '[object Array]';
  }
-  return Array.isArray(arg)
+  return Array.isArray(arg);
+}
+// 手机号正则
+export function isValidCNPhoneNumber(phone) {
+  const regex = /^1[3-9]\d{9}$/;
+  return regex.test(phone);
+}
+// 身份证号正则
+export function isValidCNidCardNumber(idCard) {
+  const regex = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
+  return regex.test(idCard);
+}
+// 根据身份证号获取性别和年龄
+export function getGenderAndAge(idCard) {
+  // 确保身份证号码是18位
+  if (idCard.length !== 18) {
+    return { error: '身份证号码必须是18位' };
+  }
+  // 提取出生年月日
+  const birthDate = idCard.substr(6, 8); // YYYYMMDD
+  const year = birthDate.substr(0, 4);
+  const month = birthDate.substr(4, 2);
+  const day = birthDate.substr(6, 2);
+  const dateOfBirth = new Date(`${year}-${month}-${day}`);
+  // 计算年龄
+  const age = new Date().getFullYear() - dateOfBirth.getFullYear();
+  const m = new Date().getMonth() - dateOfBirth.getMonth();
+  if (m < 0 || (m === 0 && new Date().getDate() < dateOfBirth.getDate())) {
+    age--;
+  }
+  // 提取性别
+  const gender = idCard.charAt(16) % 2 === 0 ? 1 : 0;
+  return { age, gender };
 }