病案首页横线调整

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

@@ -156,8 +156,8 @@
           <span style="width: 30px;padding-left: 5px; border-bottom: 1px solid black">
             {{patient.noCertReason}}
           </span>
-          <span v-for="item in dics.noCertReasons">
-              {{ item.code }}.{{ item.name }}
+          <span v-for="(item,index) in dics.noCertReasons">
+              <template v-if="index > 0">{{ item.code }}.{{ item.name }}</template>
             </span>
           其他
           <span

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

@@ -18,10 +18,10 @@
           "
         >
           <tr>
-            <th rowspan="2">手术及操作名称</th>
+            <th rowspan="2">手术及操作编码</th>
             <th rowspan="2" style="width: 70px">手术及操作日期</th>
             <th rowspan="2" style="width: 10px">手术级别</th>
-            <th rowspan="2">手术及操作编码</th>
+            <th rowspan="2">手术及操作名称</th>
             <th colspan="3">手术及操作医师</th>
             <th rowspan="2" style="width: 30px">切口愈合等级</th>
             <th rowspan="2">麻醉方式</th>
@@ -33,8 +33,8 @@
             <th>II助</th>
           </tr>
           <tr v-for="n in 5" :key="n">
-            <td style="padding: 3px">
-              {{ patient.surgeryList[n - 1].name }}
+            <td style="width: 70px">
+              {{ patient.surgeryList[n - 1].code }}
             </td>
             <td style="padding: 3px; width: 70px">
               {{ patient.surgeryList[n - 1].date }}
@@ -47,9 +47,10 @@
                 )
               }}
             </td>
-            <td style="width: 70px">
-              {{ patient.surgeryList[n - 1].code }}
+            <td style="padding: 3px">
+              {{ patient.surgeryList[n - 1].name }}
             </td>
+            
             <td style="width: 40px">
               {{ patient.surgeryList[n - 1].operatorName }}
             </td>

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

@@ -1533,7 +1533,7 @@
               <tr v-for="n in 3">
                 <td>
                   <div style="height: 26px;line-height: 26px;padding-left: 5px" @click="clickIcuInfo('icuName',n)">
-                    {{ initIcuInfoListName(n) }}
+                    {{ patient.icuInfoList[n - 1].name }}
                   </div>
                 </td>
                 <td>
@@ -2326,14 +2326,6 @@ const searchPatient = () => {
     smoothScrollTableColumn(asideTable.value, patientIndex, currentPatient);
   }
 };
-const initIcuInfoListName = (n) => {
-  if (n == 1) {
-    if (patient.value.icuInfoList[n - 1].icuName == null) {
-      return "-"
-    }
-  }
-  return patient.value.icuInfoList[n - 1].icuName
-};
 const changeDate = () => {
   console.log("changeDate",v  )
 };
@@ -2440,14 +2432,14 @@ const fetchSheetInfo = row => {
       patient.value.newBornWeight1 == null?patientTransformData.value.newBornWeight1 = '-':false;
       patient.value.newBornWeight2 == null?patientTransformData.value.newBornWeight2 = '-':false;
       patient.value.newBornAdmissWeight == null?patientTransformData.value.newBornAdmissWeight = '-':false;
-      console.log("initSheetInfoLine1",patientTransformData.value.newBornWeight1)
+      
     }
     if(patient.value.birthDate != null){
       patientTransformData.value.birthYear = patient.value.birthDate.slice(0,4);
       patientTransformData.value.birthMonth = patient.value.birthDate.slice(5,7);
       patientTransformData.value.birthDay = patient.value.birthDate.slice(8,10);
     } 
-    console.log("patient",patient.value.ageDays,patientTransformData.value.ageDays)
+    
     patient.value.noCertReason == null?patient.value.noCertReason = "-":false;
     patient.value.noCertReason == null?patient.value.noCertReason = "-":false;
     patient.value.autopsy == null?patient.value.autopsy = "-":false;
@@ -2470,9 +2462,30 @@ const fetchSheetInfo = row => {
     patient.value.blh == null?patientTransformData.value.blh = "-":false;
     patient.value.transDept == null?patientTransformData.value.transDept = "-":false;
 
-    console.log("data.surgeryList0",patient.value.surgeryList[0].name)
+    //初始化其他诊断横线
+    for (let i = 1; i < patient.value.disdiagList.length; i++) {
+      if(patient.value.disdiagList[i].name == '-' || patient.value.disdiagList[i].name == '' || patient.value.disdiagList[i].name == null){
+        patient.value.disdiagList[i].name = '-'
+        break;
+      }
+    }
+    console.log("patient.value.disdiagList",patient.value.disdiagList)
+    //初始化手术横线
+    for (let i = 0; i < patient.value.surgeryList.length; i++) {
+      if(patient.value.surgeryList[i].name == '-' || patient.value.surgeryList[i].name == null){
+        patient.value.surgeryList[i].name = '-'
+        break;
+      }
+    }
+    //初始化重症监护室横线
+    for (let i = 0; i < patient.value.icuInfoList.length; i++) {
+      if(patient.value.icuInfoList[i].name == '-' || patient.value.icuInfoList[i].name == null){
+        patient.value.icuInfoList[i].name = '-'
+        break;
+      }
+    }
+    
     patient.value.surgeryList[0].name == null?patient.value.surgeryList[0].name = '-':false;
-    console.log("data.surgeryList1",patient.value.surgeryList[0].name)
 
     
     // 为工作单位相关字段设置默认短横线
@@ -3180,6 +3193,27 @@ const saveVerifyFillBlank = (data) => {
   patientTransformData.value.blh == null || patientTransformData.value.blh == "-"?data.blh = '-':data.blh = patientTransformData.value.blh;
 
   data.surgeryList[0].name == '-'?data.surgeryList[0].name = null:false;
+  //去除初始化其他诊断横线
+    for (let index = 1; index < patient.value.disdiagList.length; index++) {
+      if(patient.value.disdiagList[index].name == '-'){
+        patient.value.disdiagList[index].name = null
+        break;
+      }
+    }
+    //去除初始化手术横线
+    for (let index = 0; index < patient.value.surgeryList.length; index++) {
+      if(patient.value.surgeryList[index].name == '-'){
+        patient.value.surgeryList[index].name = null
+        break;
+      }
+    }
+    //去除初始化重症监护室横线
+    for (let index = 0; index < patient.value.icuInfoList.length; index++) {
+      if(patient.value.icuInfoList[index].name == '-'){
+        patient.value.icuInfoList[index].name = null
+        break;
+      }
+    }
   // console.log("patient.value",data.internshipDoctorName)
   // data.internshipDoctorName == null?data.internshipDoctorName = '-':false;
   if(data.internshipDoctor  == null){
@@ -3190,6 +3224,10 @@ const saveVerifyFillBlank = (data) => {
     data.studyDoctor = '-'
     data.studyDoctorName = '-'
   }
+
+  console.log("data.surgeryList0",patient.value.surgeryList[0].name)
+  patient.value.surgeryList[0].name == '-'?patient.value.surgeryList[0].name = null:false;
+  console.log("data.surgeryList1",patient.value.surgeryList[0].name)
   
   data.noCertReasonInput == null?data.noCertReasonInput = '-':false;
   data.dismissDestination == null?data.dismissDestination = '-':false;