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

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

             >
               {{ item.name }}
             </div>
+            <div
+              class="under_line"
+              style="width: 100px; text-align: center"
+              v-if="!receiverTreatmentAccess.way"
+            >
+              /
+            </div>
           </div>
 
           <div class="inline_block">
             >
               {{ item.name }}
             </div>
+            <div
+              class="under_line"
+              style="width: 100px; text-align: center"
+              v-if="!receiverTreatmentAccess.consciousness"
+            >
+              /
+            </div>
           </div>
 
           <div class="inline_block" style="margin-left: 10px">
                       <div
                         class="under_line"
                         style="
-                          width: 180px;
+                          width: 250px;
                           text-align: center;
                           white-space: normal;
                         "
                       导管：
                       <div
                         class="under_line"
-                        style="width: 150px; text-align: center"
+                        style="width: 270px; text-align: center"
                       >
                         {{ predialysis.catheter ? predialysis.catheter : "/" }}
                       </div>
                         }}
                       </div>
                     </div>
-                    <div class="inline_block" style="flex: 1">
+                    <div class="inline_block" style="padding-right: 15px">
                       灌流器：
                       <div
                         class="under_line"
-                        style="width: 70px; text-align: center"
+                        style="width: 130px; text-align: center"
                       >
                         {{
                           prescription.dialysis_irrigation
 
                     <div class="inline_block" style="flex: 1">
                       穿刺方式：
-                        <div
-                          class="under_line"
-                          style="width: 100px; text-align: center">
-                         {{
-                            predialysis.puncture_way
-                              ? predialysis.puncture_way
-                              : "/"
-                          }}
-                        </div>
-
+                      <div
+                        class="under_line"
+                        style="width: 170px; text-align: center"
+                      >
+                        {{
+                          predialysis.puncture_way
+                            ? predialysis.puncture_way
+                            : "/"
+                        }}
+                      </div>
                     </div>
 
                     <div class="inline_block" style="flex: 1">
                       穿刺针：
-                         <div
-                          class="under_line"
-                          style="width: 100px; text-align: center"
-                        >
-                          {{
-                            predialysis.puncture_needle
-                              ? predialysis.puncture_needle
-                              : "/"
-                          }}
-                        </div>
+                      <div
+                        class="under_line"
+                        style="width: 170px; text-align: center"
+                      >
+                        {{
+                          predialysis.puncture_needle
+                            ? predialysis.puncture_needle
+                            : "/"
+                        }}
+                      </div>
                     </div>
                   </div>
 
                         >
                           置换量<br />(ml)
                         </td>
-                        <td width="200" v-if="org_id == 9919">ktv</td>
                         <td width="200">病情变化及处理</td>
 
                         <!-- <td width="100">时间</td>
                         :key="monindex"
                       >
                         <td>{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
+                        <!-- 血压 -->
                         <td>
                           {{
                             monitor.systolic_blood_pressure
                               : ""
                           }}
                         </td>
+                        <!-- 脉搏 -->
                         <td>
                           {{
                             monitor.pulse_frequency
                               : ""
                           }}
                         </td>
+                        <!-- 呼吸 -->
                         <td>
                           {{
                             monitor.breathing_rate ? monitor.breathing_rate : ""
                           }}
                         </td>
+                        <!-- 血流量 -->
                         <td>
                           {{
                             monitor.blood_flow_volume
                               : ""
                           }}
                         </td>
+                        <!-- 静脉压 -->
                         <td>
                           {{
                             monitor.venous_pressure
                               : ""
                           }}
                         </td>
+                        <!-- 跨膜压 -->
                         <td>
-                          {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }}
+                          {{
+                            monitor.transmembrane_pressure
+                              ? monitor.transmembrane_pressure
+                              : ""
+                          }}
                         </td>
-                        <td v-if="org_id != 9836">
+                        <!-- 透析液温度 -->
+                        <td>
                           {{
                             monitor.dialysate_temperature
                               ? monitor.dialysate_temperature
                               : ""
                           }}
                         </td>
+                        <!-- 电导度 -->
                         <td>
                           {{ monitor.conductivity ? monitor.conductivity : "" }}
                         </td>
-
-                        <td v-if="org_id == 9538">
-                          {{
-                            monitor.sodium_concentration
-                              ? monitor.sodium_concentration
-                              : ""
-                          }}
-                        </td>
+                        <!-- 超滤量 -->
                         <td>
                           {{
                             monitor.ultrafiltration_volume
                               : ""
                           }}
                         </td>
-                        <td
-                          v-if="
-                            dialysisOrder &&
-                            monitor.operate_time <= dialysisOrder.end_time &&
-                            dialysisOrder &&
-                            monitor.operate_time >= dialysisOrder.start_time
-                          "
-                        >
-                          {{
-                            monitor.ultrafiltration_volume
-                              ? monitor.ultrafiltration_volume
-                              : "0"
-                          }}
-                        </td>
-                        <!-- <td style="width:50px">
-                          <span v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time <= dialysisOrder.end_time) && (dialysisOrder && monitor.operate_time >= dialysisOrder.start_time))">
-                            {{ monitor.displacement_quantity ? monitor.displacement_quantity : 0 }}
-                          </span>
-                          <span v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time > dialysisOrder.end_time) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time))">
-                            {{ monitor.displacement_quantity ? monitor.displacement_quantity : "" }}
-                          </span>
-                        </td> -->
                         <td
                           v-if="
                             prescription.mode_id == 2 ||
                             }}
                           </span>
                         </td>
-                        <td width="200" v-if="org_id == 9919">
-                          {{ monitor.ktv }}
-                        </td>
+                        <!-- <td
+                          v-if="
+                            dialysisOrder &&
+                            monitor.operate_time <= dialysisOrder.end_time &&
+                            dialysisOrder &&
+                            monitor.operate_time >= dialysisOrder.start_time
+                          "
+                        >
+                          {{
+                            monitor.ultrafiltration_volume
+                              ? monitor.ultrafiltration_volume
+                              : "0"
+                          }}
+                        </td> -->
                         <td style="line-height: 16px; padding: 0px">
                           <div
                             style="
                                     dialysisOrder.start_time
                                 "
                                 >【开始透析】
-                                </template>
-                              
-                              {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{monitor.dispose}}
+                              </template>
+
+                              {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{
+                                monitor.dispose
+                              }}
                               &nbsp;{{ monitor.result }}
                             </span>
                           </div>
               >
                 {{ item.name }}
               </div>
+              <div
+                class="under_line"
+                style="width: 100px; text-align: center"
+                v-if="!receiverTreatmentAccess.way"
+              >
+                /
+              </div>
               <div class="inline_block">
                 意识状态：
                 <div
                 >
                   {{ item.name }}
                 </div>
+                <div
+                  class="under_line"
+                  style="width: 100px; text-align: center"
+                  v-if="!receiverTreatmentAccess.consciousness"
+                >
+                  /
+                </div>
               </div>
             </div>
             <div class="inline_block" style="margin-left: 10px">
                       透析器凝血：
                       <div
                         class="under_line"
-                        style="
-                          width: 225px;
-                          text-align: center;
-                          white-space: normal;
-                        "
+                        style="width: 200px; text-align: center"
                       >
                         {{ afterdialysis.cruor ? afterdialysis.cruor : "/" }}
+                        
                       </div>
                     </div>
 
                             ? afterdialysis.pip_coagulation
                             : "/"
                         }}
-                        
                       </div>
                     </div>
 
                       <div
                         class="under_line"
                         style="
-                          width: 170px;
                           text-align: center;
-                          white-space: normal;
+                          min-width: 155px;
+                          width: auto;
                         "
                       >
                         {{
                         }}
                       </div>
                     </div>
-                    <div class="inline_block" style="flex: 2">
+                    <div class="inline_block">
                       导管：
                       <div
                         class="under_line"
       return name;
     },
     setAdminUserES(id) {
-      console.log(id,'opo')
       if (id == 0) {
         return "";
       }

src/xt_pages/hospitalStation/template/printTwo.vue

             <p>年龄：{{getAge(item.patient)?getAge(item.patient):""}}岁</p>
         </div>
         <div class="infoMain">
-            <div style="margin-bottom: 10px;">门诊号11：{{this.hisPatient.number?this.hisPatient.number:""}}</div>
+            <div style="margin-bottom: 10px;">门诊号：{{this.hisPatient.number?this.hisPatient.number:""}}</div>
             <div style="margin-bottom: 10px;">科室：{{getDepart(this.hisPatient.departments?this.hisPatient.departments:"")}}</div>
             <div style="margin-bottom: 10px;">医保卡号：{{this.hisPatient.number?this.hisPatient.number:""}}</div>
             <div style="margin-bottom: 10px;">电话：{{patient.phone}}</div>
             <div>地址：{{patient.home_address}}</div>
-            <div style="display:flex;width:50%;">临床诊断：22222{{ getDiagnosis(advicePrint[0].info.diagnosis) }}</div>
+            <div style="display:flex;width:50%;">临床诊断：{{ getDiagnosis(advicePrint[0].info.diagnosis) }}</div>
         </div>
         <div class="prescriptionBox">
             <div class="Rp">Rp:</div>

src/xt_pages/outpatientDoctorStation/print.vue

           >打印</el-button
         >
       </template> -->
-
+<!-- 机构id列表
+3877 ：测试
+10138、10243：百霖
+0:本地
+9675:测试
+ -->
     <div class="dialysisPage" style="padding-top: 40px">
-      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243 && org_id != 9675">
+      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243 && org_id != 4 && org_id !=0">
         <printOne v-if="org_id != 10088 && org_id != 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
 
         <!--        <printSix-->
 
         <!-- <printSix v-if="org_id != 10088 && org_id != 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printSix> -->
       </div>
-      <div v-else-if="org_id == 10243 || org_id == 9675 || org_id == 0 ">
+      <div v-else-if="org_id == 10243 || org_id == 9675">
         <printSix
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"
 
   created() {
     this.org_id = this.$store.getters.xt_user.org_id;
+    console.log(this.org_id,'机构id')
     this.getAllDoctorList();
     var record_date = this.paramsObj.record;
     this.record_date = record_date;

src/xt_pages/outpatientDoctorStation/template/printOne.vue

       org_id: 0,
       operatorMaps: {},
       operators: [],
-      doctorList:[]
+      doctorList_1: []
     };
   },
   methods: {
     // 电子签名
     setAdminUserES(id) {
-      console.log(id,'oo')
       if (id == 0) {
         return "";
       }
           this.advicePrint = advicePrint;
           this.prescriptions = advicePrint;
 
-          this.doctorList = response.data.data.advicePrint.eles
-
+          this.doctorList_1 = response.data.data.eles;
+          console.log(this.doctorList_1, "医生列表");
+          if (this.doctorList_1.length > 0) {
+            var operatorsLen = this.doctorList_1.length;
+            for (var index = 0; index < operatorsLen; index++) {
+              this.$set(
+                this.operatorMaps,
+                this.doctorList_1[index].creator,
+                this.doctorList_1[index]
+              );
+            }
+          }
 
           console.log("处方222222", this.prescriptions);
           var hisPatient = response.data.data.hisPatient;

src/xt_pages/outpatientDoctorStation/treatPrint.vue

       </template> -->
             
       <div class='dialysisPage' style="padding-top:40px;">
-        <printOne v-if="org_id != 10138 && org_id != 10278" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+        <!-- 此下条为本地开发下页面 -->
+        <!-- <printTwo v-if="org_id == 4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo> -->
+        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4&& org_id !=0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
         <printTwo v-else v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo>
       </div>
   </div>