解决合并冲突

openhis-ui-vue3/src/views/clinicmanagement/dayEnd/component/template.json

@@ -108,7 +108,7 @@
             "top": 58.5,
             "height": 13.5,
             "width": 145.5,
-            "title": "机构名称：医院",
+            "title": "机构名称：长春大学医院",
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontSize": 9,

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

@@ -357,7 +357,7 @@ async function print() {
         ...reportValue.value, // 将 reportValue.value 中的所有属性展开到 result 中
         nickName: userStore.nickName,
         orgName: userStore.orgName,
-        fixmedinsName: '医院',
+        fixmedinsName: '长春大学医院',
         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

@@ -92,7 +92,7 @@
         </el-col>
         <el-col :span="5">
           <span class="label">机构：</span>
-          <span class="value">{{ '医院' }}</span>
+          <span class="value">{{ userStore.hospitalName }}</span>
         </el-col>
         <el-col :span="7">
           <span class="label">时间：</span>
@@ -449,7 +449,7 @@ async function print() {
         ...reportValue.value, // 将 reportValue.value 中的所有属性展开到 result 中
         nickName: userStore.nickName,
         orgName: userStore.orgName,
-        fixmedinsName: '医院',
+        fixmedinsName:  userStore.hospitalName,
         createTime: formatDateStr(new Date(), 'YYYY-MM-DD HH:mm:ss'),
         scheduler: userStore.nickName,
         timeRange: queryTime.value[0] + '~' + queryTime.value[1],