门诊医生站-》开立诊断 页面调整

openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue

@@ -449,6 +449,10 @@ function handleDiagnosisChange(item, row) {
 
 function handleFocus(row, index) {
   rowIndex.value = index;
+  // 如果当前行已选择adviceType，同步到adviceQueryParams
+  if (row.adviceType !== undefined) {
+    adviceQueryParams.value.adviceType = row.adviceType;
+  }
   row.showPopover = true;
 }
 

openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue

@@ -356,7 +356,7 @@ async function print() {
         ...reportValue.value, // 将 reportValue.value 中的所有属性展开到 result 中
         nickName: userStore.nickName,
         orgName: userStore.orgName,
-        fixmedinsName: '长春市朝阳区中医院医院',
+        fixmedinsName: userStore.hospitalName,
         queryTime: queryTime.value[0] + '~' + queryTime.value[1],
         zfAmount: new Decimal(reportValue.value.zhSum || 0).add(reportValue.value.fundSum || 0),
         feeAmount: new Decimal(reportValue.value.DIAGNOSTIC_FEE || 0)

openhis-ui-vue3/src/views/clinicmanagement/dayEnd/indexccu.vue

@@ -514,7 +514,9 @@ async function print() {
   };
   console.log(result, '==result.data==');
 
-  const printElements = templateJson;
+  const printElements = JSON.parse(
+    JSON.stringify(templateJson).replace(/{{HOSPITAL_NAME}}/g, userStore.hospitalName)
+  );
   var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
   const printerList = hiprintTemplate.getPrinterList();
   console.log(hiprintTemplate, '打印机列表');

openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue

@@ -660,7 +660,9 @@ function printPrescription() {
     // 将对象转换为 JSON 字符串
     console.log(result, 'result');
     // 模板对象获取
-    const printElements = prescriptionTemplate;
+    const printElements = JSON.parse(
+      JSON.stringify(prescriptionTemplate).replace(/{{HOSPITAL_NAME}}/g, userStore.hospitalName)
+    );
     var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
     hiprintTemplate.print2(result, {
       title: '打印标题',
@@ -695,7 +697,9 @@ function printDisposal() {
     .join(',');
   advicePrint({ requestIds: requestIds }).then((res) => {
     const result = res.data;
-    const printElements = disposalTemplate;
+    const printElements = JSON.parse(
+      JSON.stringify(disposalTemplate).replace(/{{HOSPITAL_NAME}}/g, userStore.hospitalName)
+    );
     var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
     hiprintTemplate.print2(result, {
       height: 210,
@@ -735,7 +739,9 @@ function printBloodBarcode() {
   } else {
     printBloodCode({ requestId: selectedRows[0].requestId }).then((res) => {
       const result = res.data;
-      const printElements = bloodTemplate;
+      const printElements = JSON.parse(
+        JSON.stringify(bloodTemplate).replace(/{{HOSPITAL_NAME}}/g, userStore.hospitalName)
+      );
       var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
       hiprintTemplate.print2(result, {
         height: 210,

openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/prescription.vue

@@ -27,7 +27,7 @@
           <span>CF0000000001</span>
         </div>
         <div style="text-align: center">
-          <h2>长春市朝阳区中医院医院</h2>
+          <h2>{{ userStore.hospitalName }}</h2>
         </div>
         <div style="text-align: center">
           <h3>处方单</h3>
@@ -130,7 +130,9 @@
 
 <script setup name="historicalPrescriptionDetail">
 import {getPrescriptionDetail} from './api';
+import useUserStore from '@/store/modules/user';
 
+const userStore = useUserStore();
 const { proxy } = getCurrentInstance();
 
 const props = defineProps({