新分支

src/xt_pages/dialysis/batch_print/batch_print_order_fiftyThree.vue

@@ -848,6 +848,7 @@
                         :src="setAdminUserES(advice[0]&&advice[0].execution_staff)"
                         alt=""
                         srcset=""
+                        v-else
                       />
                     </td>
                     <td style="line-height: 30px" width="90">

src/xt_pages/dialysis/details/index.vue

@@ -489,7 +489,7 @@
               </div>
               <div style="display: flex;margin: 5px 0;">
                 <div style="flex: 1;">血流量:{{main_collection.prescription.blood_flow_volume}}ml/min</div>
-                <div style="flex: 1;">置换液总量:{{main_collection.prescription.displace_liqui_value}}L</div>
+                <div style="flex: 1;">置换液总量:<span v-if="main_collection.prescription.displace_liqui_value>0">{{main_collection.prescription.displace_liqui_value}}</span>L</div>
               </div>
               <div style="margin: 5px 0;">
                 <div>透析液类型:

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -2051,7 +2051,6 @@ export default {
         });
       }
       else if (this.org_template_info.template_id == 68 ) {
-        console.log('6666',this.org_template_info.template_id);
         printJS({
           printable: "dialysis-print-box-1",
           type: "html",

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -2501,12 +2501,12 @@
          <div style="position: relative; left: 70%;top: 50px;width: 288px;">
           患者签名：
           <div class="under_line" style="width: 120px;">
-            <img
+            <!-- <img
               style="height: 30px"
               :src="dialysisOrder == null? 0: dialysisOrder.url"
               alt=""
               srcset=""
-            />
+            /> -->
           </div>
         </div>
       </div>

src/xt_pages/hospitalStation/print.vue

@@ -14,9 +14,9 @@
 
         <div class='dialysisPage'>
             <div v-if="org_id != 10138">
-                <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>
-                <printFour v-if="org_id == 10088" 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"></printFour>
-                <printFive v-if="org_id == 10215 || org_id == 0" 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"></printFive>
+                <printOne v-if="org_id != 10088 && org_id != 10215 && org_id!=0" 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>
+                <printFour v-if="org_id == 10088 || org_id == 0" 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"></printFour>
+                <printFive v-if="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"></printFive>
             </div>
             <div v-else>
                 <printThree 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"></printThree>

src/xt_pages/outpatientDoctorStation/template/printFour.vue

@@ -55,13 +55,13 @@
             <p>
             医师：
             <span
-              style="width: 100px; display: inline-block"
+              style="display: inline-block"
               v-if="item.creator == ''"
             >
                 {{ item.doctor }}
               </span>
             <span
-              style="width: 100px; display: inline-block"
+              style="display: inline-block"
               v-else-if="doc_name != ''"
             >
                 {{ doc_name }}
@@ -71,7 +71,7 @@
               :src="setAdminUserES(item.creator,item.doctor)"
               alt=""
               srcset=""
-              v-else
+
             />
           </p>
               <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
@@ -125,9 +125,29 @@ export default {
         projectList:[],
         orgname:"",
         diagnoses:[],
+        operatorMaps: {},
+        operators: [],
+        doctorList_1: [],
       }
     },
    methods:{
+   // 电子签名
+   setAdminUserES(id,name) {
+      console.log(id)
+      console.log(name)
+      console.log(this.operatorMaps)
+
+
+      if (id == 0) {
+        return "";
+      }
+      if (id in this.operatorMaps) {
+        return this.operatorMaps[id].url;
+      } else {
+        this.doc_name = name
+        return "";
+      }
+    },
      getAge(patient){
        var thisLen = patient.id_card_no.length
        var birth = ''
@@ -191,6 +211,18 @@ export default {
             this.advicePrint = advicePrint
             this.prescriptions = advicePrint
             console.log("处方222222",this.prescriptions)
+            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]
+                );
+              }
+            }
             var hisPatient = response.data.data.hisPatient
             console.log("hisPatient",hisPatient)
             this.hisPatient = hisPatient

src/xt_pages/workforce/remind_print_setting_two.vue

@@ -26,8 +26,6 @@
                     <span v-if="type ==1 && printObj.name == 1">{{main_collection.patient.name}} </span>
                     <span v-if="type ==2 && printObj.name == 1">{{main_collection.patient}} </span>
                   </span>&nbsp;&nbsp;
-                  <!-- <span style="font-weight: bolder;">
-                    {{main_collection.patient.name}} </span>&nbsp;&nbsp;  -->
                   <span>
                     <span v-if="main_collection.patient.gender==1">男</span>
                     <span v-if="main_collection.patient.gender==2">女</span>