Merge remote-tracking branch 'origin/master'

src/components/inpatient/frontsheet-printpage/FullPage.vue

@@ -95,7 +95,7 @@
               padding: 0 4px;
               border-bottom: 1px solid black;
               width: 50px;
-            ">{{ patient.ageDays}}</span>
+            ">{{ patient.ageDays }}</span>
           天
         </div>
         <div style="margin: 8px 8px 8px 0">
@@ -829,9 +829,12 @@
             <th rowspan="2">手术及操作编码</th>
             <th rowspan="2" style="width: 70px">手术及操作日期</th>
             <th rowspan="2" style="width: 10px">手术级别</th>
+            <th rowspan="2" style="width: 10px">手术类别</th>
             <th rowspan="2">手术及操作名称</th>
             <th colspan="3">手术及操作医师</th>
-            <th rowspan="2" style="width: 30px">切口愈合等级</th>
+            <!-- <th rowspan="2" style="width: 30px">切口愈合等级</th> -->
+            <th rowspan="2" style="width: 10px">切口等级</th>
+            <th rowspan="2" style="width: 10px">愈合等级</th>
             <th rowspan="2">麻醉方式</th>
             <th rowspan="2">麻醉医师</th>
           </tr>
@@ -855,6 +858,9 @@
                 )
               }}
             </td>
+            <td style="padding: 3px">
+              {{ patient.surgeryList[n - 1].classType }}
+            </td>
             <td style="padding: 3px">
               {{ patient.surgeryList[n - 1].name }}
             </td>
@@ -867,13 +873,23 @@
             <td style="width: 50px">
               {{ patient.surgeryList[n - 1].assistantTwoName }}
             </td>
-            <td style="text-align-last: center">
+            <!-- <td style="text-align-last: center">
               {{
                 filterNameInDic(
                   patient.surgeryList[n - 1].cutHeal,
                   "getCutHealGrade"
                 )
               }}
+            </td> -->
+            <td style="width: 25px;">
+              {{
+                patient.surgeryList[n - 1].cut
+              }}
+            </td>
+            <td style="width: 25px;">
+              {{
+                patient.surgeryList[n - 1].heal
+              }}
             </td>
             <td>
               {{
@@ -1418,17 +1434,17 @@
           </span>
           1.完成&nbsp;2.变异&nbsp;3.退出&nbsp;4.未入&nbsp;&nbsp;&nbsp;
         </div>
-                <div style="width: 700px;box-sizing: border-box;">
-            <span>说明：（一）医疗付费方式&nbsp;&nbsp;1.城镇职工基本医疗保险&nbsp;&nbsp;2.城镇居民基本医疗保险&nbsp;&nbsp;3.新型农村合作医疗&nbsp;&nbsp;4.贫困救助
-              &nbsp;&nbsp;5.商业医疗保险&nbsp;&nbsp;6.全公费&nbsp;&nbsp;7.全自费&nbsp;&nbsp;8.其他社会保险&nbsp;&nbsp;9.其他
-            </span>
-          </div>
-          <div style="width: 700px;box-sizing: border-box;">
-            <span>说明：（二）身份证件类型</span>
-            <span v-for="item in dics.getPsnCertType">
-              {{ item.code }}.{{ item.name }}
-            </span>
-          </div>
+        <div style="width: 700px;box-sizing: border-box;">
+          <span>说明：（一）医疗付费方式&nbsp;&nbsp;1.城镇职工基本医疗保险&nbsp;&nbsp;2.城镇居民基本医疗保险&nbsp;&nbsp;3.新型农村合作医疗&nbsp;&nbsp;4.贫困救助
+            &nbsp;&nbsp;5.商业医疗保险&nbsp;&nbsp;6.全公费&nbsp;&nbsp;7.全自费&nbsp;&nbsp;8.其他社会保险&nbsp;&nbsp;9.其他
+          </span>
+        </div>
+        <div style="width: 700px;box-sizing: border-box;">
+          <span>说明：（二）身份证件类型</span>
+          <span v-for="item in dics.getPsnCertType">
+            {{ item.code }}.{{ item.name }}
+          </span>
+        </div>
         <!-- <div style="margin: 8px 8px 8px 0">
           单病种管理:
           <span style="

src/components/inpatient/frontsheet-printpage/HeadPage.vue

@@ -43,7 +43,7 @@
           <span style="display: inline-block">
             医疗付费方式:
             <span style="display: inline-block; width: 180px">{{
-              filterNameInDic(patient.payMethod, "getPayMethod")
+              patient.payMethod
             }}</span>
           </span>
           <span

src/components/medical-advice/temperature/graphics.vue

@@ -813,12 +813,16 @@ export default {
     }
     this.initData();
     // 计算默认marginTop
-    const defaultMarginTop =
-      (Math.round(this.$refs.topTd[0].getBoundingClientRect().height) - 18) *
-        10 +
-      28;
+    const topTdHeight = this.$refs.topTd[0].getBoundingClientRect().height;
+    const defaultMarginTop = (Math.round(topTdHeight) - 18) * 10 + 28;
     this.marginTop = defaultMarginTop;
     
+    console.log('=== mounted调试信息 ===');
+    console.log('topTd元素高度:', topTdHeight);
+    console.log('计算过程:', `(${Math.round(topTdHeight)} - 18) * 10 + 28 = ${defaultMarginTop}`);
+    console.log('最终marginTop:', this.marginTop);
+    console.log('========================');
+    
     // 根据分辨率设置样式
     this.setStyleByResolution();
     
@@ -1460,7 +1464,26 @@ export default {
        const screenWidth = window.screen.width;
        const screenHeight = window.screen.height;
        
-       console.log('当前分辨率:', screenWidth + 'x' + screenHeight);
+       console.log('=== 调试信息 ===');
+       console.log('屏幕分辨率:', screenWidth + 'x' + screenHeight);
+       console.log('浏览器缩放比例:', window.devicePixelRatio);
+       console.log('实际窗口尺寸:', window.innerWidth + 'x' + window.innerHeight);
+       console.log('计算的marginTop:', this.marginTop);
+       console.log('topTd元素高度:', this.$refs.topTd ? this.$refs.topTd[0].getBoundingClientRect().height : '未获取到');
+       
+       // DPI相关调试信息
+       console.log('=== DPI调试信息 ===');
+       console.log('devicePixelRatio (设备像素比):', window.devicePixelRatio);
+       console.log('CSS像素与物理像素比例:', 1 / window.devicePixelRatio);
+       console.log('屏幕物理尺寸 (英寸):', {
+         width: screenWidth / (96 * window.devicePixelRatio),
+         height: screenHeight / (96 * window.devicePixelRatio)
+       });
+       console.log('估算DPI:', {
+         horizontal: Math.round(screenWidth / (screenWidth / (96 * window.devicePixelRatio))),
+         vertical: Math.round(screenHeight / (screenHeight / (96 * window.devicePixelRatio)))
+       });
+       console.log('================');
        
        // 默认样式（当前分辨率）
        let style = {
@@ -1580,24 +1603,45 @@ export default {
       // 可以根据不同分辨率设置不同样式
       // 例如：1920x1080
       if (screenWidth === 1920 && screenHeight === 1080) {
-        pulseStyle = {
-          titleMarginTop: '0px',
-          firstRowMarginTop: '44px',
-          normalRowMarginTop: '61px',
-          lastRowMarginTop: '61px'
-        };
-        temperatureStyle = {
-          titleMarginTop: '0px',
-          firstRowMarginTop: '44px',
-          normalRowMarginTop: '61px',
-          lastRowMarginTop: '61px'
-        };
-        legendStyle = {
-          marginTop: '476px'
-        };
-        containerStyle = {
-          marginTop: '22px'
-        };
+        if(this.marginTop > 0) {//marginTop:48
+          pulseStyle = {
+            titleMarginTop: '0px',
+            firstRowMarginTop: '32px',
+            normalRowMarginTop: '55px',
+            lastRowMarginTop: '56px'
+          };
+          temperatureStyle = {
+            titleMarginTop: '0px',
+            firstRowMarginTop: '32px',
+            normalRowMarginTop: '55px',
+            lastRowMarginTop: '56px'
+          };
+          legendStyle = {
+            marginTop: '476px'
+          };
+          containerStyle = {
+            marginTop:  this.marginTop + 'px',
+          };  
+        }else {//marginTop:-2
+          pulseStyle = {
+            titleMarginTop: '0px',
+            firstRowMarginTop: '44px',
+            normalRowMarginTop: '61px',
+            lastRowMarginTop: '61px'
+          };
+          temperatureStyle = {
+            titleMarginTop: '0px',
+            firstRowMarginTop: '44px',
+            normalRowMarginTop: '61px',
+            lastRowMarginTop: '61px'
+          };
+          legendStyle = {
+            marginTop: '476px'
+          };
+          containerStyle = {
+            marginTop: '22px'
+          };
+        }
       }
       // 例如：1366x768
       else if (screenWidth === 1366 && screenHeight === 768) {

src/views/hospitalization/case-front-sheet/FillCaseFrontSheet.vue

@@ -1177,17 +1177,32 @@
                 </div>
               </td>
               <td>
+                <div style="position: relative">
                 <input
                   style="border: none !important; width: 40px"
                   v-model="patient.surgeryList[n - 1].operatorName"
+                  readonly
                   @click="showSearchSurgerior('operator', n)"
                 />
+                <div
+                    v-if="patient.surgeryList[n - 1].operatorName"
+                    style="position: absolute; top: -20px; right: 0"
+                  >
+                    <el-button
+                      type="danger"
+                      circle
+                      icon="Delete"
+                      @click="deleteOperatorName(n - 1)"
+                    ></el-button>
+                  </div>
+                  </div>
               </td>
               <td style="width: 50px">
                 <div style="position: relative">
                   <input
                     style="border: none !important; width: 40px"
                     v-model="patient.surgeryList[n - 1].assistantOneName"
+                    readonly
                     @click="showSearchSurgerior('assistantone', n)"
                   />
                   <div
@@ -3145,6 +3160,11 @@ const deleteSurgery = index => {
   }
 };
 
+const deleteOperatorName = index => {
+  patient.value.surgeryList[index].operator = "";
+  patient.value.surgeryList[index].operatorName = "";
+};
+
 const deleteAssistantOne = index => {
   patient.value.surgeryList[index].assistantOne = "";
   patient.value.surgeryList[index].assistantOneName = "";

src/views/medicine-management/MedicinePageSubmit.vue

@@ -436,30 +436,30 @@ const poisonousAnestheticsCounts = ref({});
 const showUsedPoisonousAnesthetics = ref(false);
 const medBatchNos = ref({});
 
-const today = getFormatDatetime(new Date(), "YYYY-MM-DD hh:mm:ss");
+const today = getFormatDatetime(new Date(), "YYYY-MM-DD HH:mm:ss");
 const formatDateRange = () => {
-  console.log("dateRange.value1", dateRange.value);
+  //   console.log("dateRange.value1", dateRange.value);
   dateRange.value[0] = getFormatDatetime(
     dateRange.value[0],
-    "YYYY-MM-DD hh:mm:ss"
+    "YYYY-MM-DD HH:mm:ss"
   );
   dateRange.value[1] = getFormatDatetime(
     dateRange.value[1],
-    "YYYY-MM-DD hh:mm:ss"
+    "YYYY-MM-DD HH:mm:ss"
   );
-  console.log("dateRange.value2", dateRange.value);
+  //   console.log("dateRange.value2", dateRange.value);
 };
 const userInfo = useUserStore().userInfo;
 
 const getMedicinePages = () => {
-  console.log(medicineType.value);
+  //   console.log(medicineType.value);
   const params = {
     start: dateRange.value[0],
     end: dateRange.value[1],
     dept: userInfo.deptCode,
     chargeCodes: medicineType.value,
   };
-  console.log("getMedicinePages", params);
+  //   console.log("getMedicinePages", params);
   fetchMedicinePages(params).then(res => {
     allMedicines.value = res;
   });