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

src/xt_pages/dialysis/details/dialog/doubleCheckDialog.vue

@@ -215,8 +215,14 @@
         let ParamsQuery = this.doubleReview
         ParamsQuery['patient'] = this.patient.id
         ParamsQuery['record_date'] = this.record_date
-        ParamsQuery['check_time'] = this.record_date + ' ' + this.check_time
-        ParamsQuery['first_check_time'] = this.record_date + ' ' + this.first_check_time
+        if(this.check_time){
+          ParamsQuery['check_time'] = this.record_date + ' ' + this.check_time
+        }
+        // ParamsQuery['check_time'] = this.record_date + ' ' + this.check_time
+        if(this.first_check_time){
+          ParamsQuery['first_check_time'] = this.record_date + ' ' + this.first_check_time
+        }
+        
         ParamsQuery['creater'] = this.doubleReview.creater
         ParamsQuery['modifier'] = this.doubleReview.modifier
 

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -569,8 +569,8 @@
             医生签名
             <span style="display: inline-block;width:100px;text-align: left;">
               &nbsp;
-              <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:prescription.creater)) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:prescription.creater)) }} </span>
-              <img style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:prescription.creater))" alt="" srcset="" v-else />
+              <span v-if="setAdminUserES(summary==null? 0 : (summary.modifier?summary.modifier:summary.creater)) == ''"> {{ getAdminUser(summary==null?0:(summary.modifier?summary.modifier:summary.creater)) }} </span>
+              <img style="height:30px;" :src="setAdminUserES(summary==null?0:(summary.modifier?summary.modifier:summary.creater))" alt="" srcset="" v-else />
               <!-- <span v-if="doctorForm.url === ''">{{ doctorForm.doctor }}</span>
               <span v-if="doctorForm.url !== ''">
                 <img class="es-img" style="height:30px;" :src="doctorForm.url" />