新分支

src/xt_pages/dialysis/batch_print/batch_print_order_forty.vue

@@ -790,7 +790,7 @@
                                   <label-box :isChecked="record.assessment_after_dislysis.catheter.indexOf('更换敷料')>-1?true:false" showValue='更换敷料'></label-box>
                               </td>
                               <td width='50'>
-                                  <label-box :isChecked="record.assessment_after_dislysis.catheter.indexOf('干洁')==-1 && record.assessment_after_dislysis.catheter.indexOf('更换敷料')==-1?true:false" showValue='其他'></label-box>
+                                  <label-box :isChecked="record.assessment_after_dislysis.catheter!=''&&record.assessment_after_dislysis.catheter.indexOf('干洁')==-1 && record.assessment_after_dislysis.catheter.indexOf('更换敷料')==-1?true:false" showValue='其他'></label-box>
                               </td>
                               <td width='100'>
                                   <div class="under-line">&nbsp;

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -1127,7 +1127,7 @@
                           <label-box :isChecked="afterdialysis.catheter.indexOf('更换敷料')>-1?true:false" showValue='更换敷料'></label-box>
                       </td>
                       <td width='50'>
-                          <label-box :isChecked="afterdialysis.catheter.indexOf('干洁')==-1 && afterdialysis.catheter.indexOf('更换敷料')==-1?true:false" showValue='其他'></label-box>
+                          <label-box :isChecked="afterdialysis.catheter!=''&& afterdialysis.catheter.indexOf('干洁')==-1 && afterdialysis.catheter.indexOf('更换敷料')==-1?true:false" showValue='其他'></label-box>
                       </td>
                       <td width='100'>
                           <div class="under-line">&nbsp;

src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue

@@ -38,11 +38,9 @@
                 <td>姓名：{{ patientInfo.name }}</td>
                 <td>性别： {{ patientInfo_gender_1 ? "男" : "女" }}</td>
                 <td>年龄：{{ getAge(patientInfo) }}</td>
-                <td>门诊号： {{
-                    patientInfo.admission_number
-                      ? patientInfo.admission_number
-                      : "/"
-                  }}</td>
+                <td>门诊号：
+                  {{patientInfo.dialysis_no}}
+                </td>
               </tr>
               <tr>
                 <td>病床床号：
@@ -57,8 +55,7 @@
                   </span>
                 </td>
                 <td>治疗时间：
-                  {{afterdialysis.actual_treatment_hour }}<span v-if="afterdialysis.actual_treatment_hour>0">时</span>
-                  <span v-if="afterdialysis.actual_treatment_minute>0">{{afterdialysis.actual_treatment_minute>0}}</span> {{afterdialysis.actual_treatment_minute }}<span v-if="afterdialysis.actual_treatment_minute>0">分</span>
+                  {{getTime(prescription.record_date,"{y}-{m}-{d}") }}
                 </td>
                 <td>干体重：{{ predialysis.dry_weight ? predialysis.dry_weight : "/" }}kg</td>
                 <td>上次透后体重：
@@ -73,25 +70,34 @@
                 </td>
                 <td>透析总次数：{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }}</td>
                 <td colspan="2">患者评估：
-                  {{ receiverTreatmentAccess.sick_condition ? receiverTreatmentAccess.sick_condition : "/" }}
+                  入科方式:
+                  <span v-if="receiverTreatmentAccess.way == 1">步行</span>
+                  <span v-if="receiverTreatmentAccess.way == 2">扶行</span>
+                  <span v-if="receiverTreatmentAccess.way == 3">轮椅</span>
+                  <span v-if="receiverTreatmentAccess.way == 4">平车</span>
+
+                  意识:
+                  <span v-if="receiverTreatmentAccess.consciousness == 1">清醒</span>
+                  <span v-if="receiverTreatmentAccess.consciousness == 2">嗜睡</span>
+                  <span v-if="receiverTreatmentAccess.consciousness == 4">模糊</span>
+                  <span v-if="receiverTreatmentAccess.consciousness == 3">昏迷</span>
                 </td>
               </tr>
               <tr>
                 <td colspan="4">
-                  <span style="width: 14%;">血管通路：
+                  <span>血管通路：
                     {{ predialysis.blood_access_part_opera_name }}
                   </span>
-                  <span style="width: 14%;">部位：
+                  <span>部位：
                     {{ predialysis.blood_access_part_id }}
                  </span>
-                  <span style="width: 14%;">通路评估：
+                  <span>通路评估：
                      <span v-if="predialysis.internal_fistula.indexOf('震颤-存在') >-1">震颤-存在</span>
                      <span v-if="predialysis.internal_fistula.indexOf('震颤-减弱') >-1">震颤-减弱</span>
                      <span v-if="predialysis.internal_fistula.indexOf('震颤-无') >-1">震颤-无</span>
 
                   </span>
-                  <!-- <span style="width: 14%;">震颤：</span> -->
-                  <!-- <span style="width: 14%;">外观：</span> -->
+                
                   <span style="width: 14%;">置换方式：
                     {{
                       getDisplaceLiquiPart(prescription.displace_liqui_part)
@@ -265,19 +271,21 @@
                 <td>{{monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</td>
                 <td>{{monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: ""}}</td>
                 <td>{{monitor.conductivity? monitor.conductivity: ""}}</td>
-                <td>{{monitor.dispose? monitor.dispose: ""}}
+                <td>
+                  {{monitor.symptom?monitor.symptom:"" }}&nbsp;
+                  {{monitor.dispose? monitor.dispose: ""}}&nbsp;
                   {{monitor.result? monitor.result: ""}}
                 </td>
                 <td>
                   <span
                     style="height: 30px; display: inline-block"
-                      v-if="setAdminUserES(monitor.creater) == ''"
+                      v-if="setAdminUserES(monitor.monitoring_nurse) == ''"
                       >
-                     {{ getAdminUser(monitor.creater) }}
+                     {{ getAdminUser(monitor.monitoring_nurse) }}
                   </span>
                   <img
                     style="height: 40px"
-                    :src="setAdminUserES(monitor.creater)"
+                    :src="setAdminUserES(monitor.monitoring_nurse)"
                     alt=""
                     srcset=""
                     v-else
@@ -430,14 +438,14 @@
               </tr>
               <tr>
                 <td colspan="4">
-                  <span style="width: 14%;">通路评估：
-                    {{
+                  <span>通路评估：
+                    内瘘:{{
                       afterdialysis.internal_fistula
                         ? afterdialysis.internal_fistula
                         : ""
                      }}
 
-                     {{
+                  导管:{{
                         afterdialysis.catheter ? afterdialysis.catheter : ""
                     }}
                   </span>

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -506,21 +506,6 @@ export default{
           this.prescriptions = advicePrint;
 
           this.doctorList_1 = response.data.data.eles;
-          for(let i=0;i<this.advicePrint.length;i++){
-            this.advicess=advicePrint[i].advices
-          }
-          for(let j=0;j<this.advicess.length;j++){
-            for(let x=j+1;x<this.advicess.length;x++){
-              if(this.advicess[j].groupno == this.advicess[x].groupno){
-                this.arr.push(this.advicess.splice(x,1))
-                // this.arrs=this.advicess.splice(x,1)
-              }
-            }
-          }
-          // this.merge(this.advicess)
-          // console.log('4444444',this.arrs);
-          console.log('55555555',this.arr);
-          console.log('6666666',this.advicess);
           console.log(this.doctorList_1, "医生列表");
           if (this.doctorList_1.length > 0) {
             var operatorsLen = this.doctorList_1.length;

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -25,6 +25,7 @@
                             <thead>
                                 <tr>
                                   <td rowspan="2" width="80">序号</td>
+                                  <td rowspan="2" width="80">耗材名称</td>
                                   <td rowspan="2" width="80">耗材类型</td>
                                   <td rowspan="2" width="80">规格&单位</td>
                                   <td rowspan="2" width="80">生产厂商</td>
@@ -52,6 +53,7 @@
                             <tbody>
                                 <tr v-for="(item,index) in this.tableList" :key="index">
                                  <td>{{index + 1}}</td>
+                                 <td>{{item.good_name}}</td>
                                  <td>{{getGoodTypeName(item.good_type_id)}}</td>
                                  <td>{{item.specification_name}}</td>
                                  <td> {{getManufacturName(item.manufacturer)}}</td>