Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_thirtyTwo.vue

@@ -214,7 +214,7 @@
                                  
                                 <label-box :isChecked="record.assessment_before_dislysis.internal_fistula.indexOf('震颤-减弱') > -1 ? true : false" showValue="减弱"></label-box>
                                 &nbsp;
-                                <label-box :isChecked="(record.assessment_before_dislysis.internal_fistula.indexOf('震颤-无') > -1 || record.assessment_before_dislysis.internal_fistula.indexOf('不存在') > -1) ? true : false" showValue="不存在"></label-box>
+                                <label-box :isChecked="(record.assessment_before_dislysis.internal_fistula.indexOf('不存在') > -1 || record.assessment_before_dislysis.internal_fistula.indexOf('不存在') > -1) ? true : false" showValue="不存在"></label-box>
                             </div>
                             </td>
                             <td width="30"></td>
@@ -705,7 +705,7 @@
                                 <div style="display:flex;justify-content:space-between;">
                                 <label-box :isChecked="record.assessment_after_dislysis.internal_fistula.indexOf('震颤-存在') > -1 ? true : false" showValue="存在"></label-box>
                                 <label-box :isChecked="record.assessment_after_dislysis.internal_fistula.indexOf('震颤-减弱') > -1 ? true : false" showValue="减弱"></label-box>
-                                <label-box :isChecked="record.assessment_after_dislysis.internal_fistula.indexOf('震颤-无') > -1 ? true : false" showValue="不存在"></label-box>
+                                <label-box :isChecked="record.assessment_after_dislysis.internal_fistula.indexOf('不存在') > -1 ? true : false" showValue="不存在"></label-box>
                                 </div>
                             </td>
                             <td width='30'></td>

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyTwo.vue

@@ -271,7 +271,7 @@
                        
                       <label-box :isChecked="predialysis.internal_fistula.indexOf('震颤-减弱') > -1 ? true : false" showValue="减弱"></label-box>
                       &nbsp;
-                      <label-box :isChecked="(predialysis.internal_fistula.indexOf('震颤-无') > -1 || predialysis.internal_fistula.indexOf('不存在') > -1) ? true : false" showValue="不存在"></label-box>
+                      <label-box :isChecked="(predialysis.internal_fistula.indexOf('不存在') > -1 || predialysis.internal_fistula.indexOf('不存在') > -1) ? true : false" showValue="不存在"></label-box>
                     </div>
                   </td>
                   <td width="30"></td>
@@ -774,7 +774,7 @@
                       <div style="display:flex;justify-content:space-between;">
                         <label-box :isChecked="afterdialysis.internal_fistula.indexOf('震颤-存在') > -1 ? true : false" showValue="存在"></label-box>
                         <label-box :isChecked="afterdialysis.internal_fistula.indexOf('震颤-减弱') > -1 ? true : false" showValue="减弱"></label-box>
-                        <label-box :isChecked="afterdialysis.internal_fistula.indexOf('震颤-无') > -1 ? true : false" showValue="不存在"></label-box>
+                        <label-box :isChecked="afterdialysis.internal_fistula.indexOf('不存在') > -1 ? true : false" showValue="不存在"></label-box>
                       </div>
                     </td>
                     <td width='30'></td>
@@ -1429,6 +1429,8 @@ export default {
               this.patientInfo.birthday,
               '{y}-{m}-{d}'
             )
+            console.log('response.data.data',response.data.data);
+            
             // this.patientInfo.age = jsGetAge(this.patientInfo.birth, '-')
             if (response.data.data.patientInfo.first_dialysis_date != 0) {
               this.patientInfo.first_dialysis_date = uParseTime(

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -281,7 +281,7 @@
               v-else
             />
           </p>
-          <p v-if="org_id == 10510  || org_id == 10265">
+          <p v-if="org_id == 10510  || org_id == 10265 || org_id ==0">
             医师：
             <span
               style="width: 100px; display: inline-block"
@@ -301,9 +301,13 @@
               alt=""
               srcset=""
               v-else
-            />
+            /> &nbsp;&nbsp;
+            <span v-if="org_id == 10265 || org_id ==0">
+              {{ item.doctor ? item.doctor : "" }}
+            </span>
+            
           </p>
-          <p v-if="org_id!=10217 && org_id!=10510 && org_id !=10265">
+          <p v-if="org_id!=10217 && org_id!=10510 && org_id !=10265 && org_id !=0">
             医师： {{ item.doctor ? item.doctor : "" }}
           </p>
           <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>