提交merge1.3

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

@@ -110,11 +110,7 @@
             "top": 57,
             "height": 13.5,
             "width": 145.5,
-<<<<<<< HEAD
-            "title": "机构名称：长春大学医院",
-=======
             "title": "机构名称：长春市朝阳区中医院",
->>>>>>> v1.3
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontSize": 9,

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

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

@@ -473,11 +473,7 @@ async function print() {
         ...reportValue.value, // 将 reportValue.value 中的所有属性展开到 result 中
         nickName: userStore.nickName,
         orgName: userStore.orgName,
-<<<<<<< HEAD
-        fixmedinsName:  userStore.hospitalName,
-=======
         fixmedinsName: userStore.hospitalName,
->>>>>>> v1.3
         createTime: formatDateStr(new Date(), 'YYYY-MM-DD HH:mm:ss'),
         scheduler: userStore.nickName,
         timeRange: queryTime.value[0] + '~' + queryTime.value[1],