新分支

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                             {{
                               monitor_record.venous_pressure
                                 ? monitor_record.venous_pressure
-                                : ""
+                                : "/"
                             }}
                           </td>
                           <td>
                             {{
                               monitor_record.transmembrane_pressure
                                 ? monitor_record.transmembrane_pressure
-                                : ""
+                                : "/"
                             }}
                           </td>
                           <td v-if="org_id != 9836">

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyFive.vue

                             <td width="50" >1:9肝素盐水剩余量<br />(ml)</td>
                             
                             <td width="60">体温(°C)</td>
+                            <td width="60">透析液温度(°C)</td>
                             <td width="60">病情变化及处理</td>
                             <td width="60">签名</td>
                             
                                 : ""
                             }}
                             </td>
+                            <td >
+                               {{
+                              monitor_record.dialysate_temperature
+                                ? monitor_record.dialysate_temperature
+                                : ""
+                            }}
+                            </td>
                             <td width="60">
                               {{ monitor_record.symptom }} &nbsp;{{
                                 monitor_record.dispose

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

                 this.dialysisPrescription.remark = response.data.data.dialysisPrescription.remark
               }
             }
+            if(this.$store.getters.xt_user.template_info.org_id== 10013 || this.$store.getters.xt_user.template_info.org_id== 10014){
+              if (this.last_prescription != null && response.data.data.dialysisPrescription != null) {
+                this.dialysisPrescription.remark = response.data.data.dialysisPrescription.remark
+              }
+            }
           } else {
             if (response.data.data.prescription != null) {
               // 临时处方不为空
                 this.dialysisPrescription.remark = this.last_prescription.remark
               }
             }
+            if(this.$store.getters.xt_user.template_info.org_id== 10013 || this.$store.getters.xt_user.template_info.org_id== 10014){
+              if (this.last_prescription != null) {
+                this.dialysisPrescription.remark = this.last_prescription.remark
+              }
+            }
+
           }
         if (
           this.dialysisPrescription.dialysis_duration_hour === '' ||

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

           <div class="inline_block" v-if="org_id!=10460">
             床号：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id == 0 || org_id ==10460">{{
+              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id == 0 || org_id ==10460 || org_id ==10515">{{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
                 dialysisOrder.DeviceNumber.number.length > 0
                           {{
                             monitor.venous_pressure
                               ? monitor.venous_pressure
-                              : ""
+                              : "/"
                           }}
                         </td>
                         <td>
                             {{
                               monitor.transmembrane_pressure
                                 ? monitor.transmembrane_pressure
-                                : ""
+                                : "/"
                             }}
                           </span>
                           <span

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyFive.vue

                         <td width="50">超滤率<br />(ml/h)</td>
                         <td width="50">超滤量<br />(ml/h)</td>
                         <td width="50">1:9肝素盐水剩余量<br />(ml/h)</td>
-                        <td width="50">体温<br />(ml/h)</td>
+                        <td width="50">体温<br />(℃)</td>
+                        <td width="50">透析液温度<br />(℃)</td>
                         <td width="50">病情变化及处理</td>
                         <td width="50">签名<br /></td>
                      
                         <td width="50">{{monitor.ultrafiltration_volume }}<br /></td>
                         <td width="50">{{monitor.heparin }}<br /></td>
                         <td width="50">{{monitor.temperature }}<br /></td>
+                        <td width="50">{{monitor.dialysate_temperature }}<br /></td>
                         <td width="50">{{ monitor.symptom }} &nbsp;{{
                                 monitor.dispose
                               }}</td>
         return "0.0";
       }
     },
+    compare (property) {
+      return function (a, b) {
+          var value1 = a[property]
+          var value2 = b[property]
+          return value1 - value2
+      }
+    },
   },
   watch: {
     "patientInfo.gender": function () {

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

         let projects = [];
         response.data.data.projects.map((item) => {
           if (item.type == 2 && item.project.is_print == 1) {
+          
             projects.push(item);
           }
         });
         console.log("this.projects", this.projects);
 
         // var objProject = {advice_name:"",start_time:"",single_dose:"",single_dose_unit:"",}
-      
+        
+        
         if(this.projects!=null && this.projects.length >0){
            for(let i=0;i<this.projects.length;i++){
+             this.projects.sort(this.compare('execution_time'))
              if(this.projects[i].type== 2){
             
               this.projects[i].project_team_name = ""
       // 通过Blob将Uint8Array数组转换成pdf类型的文件对象
       return new Blob([uInt8Array], { type: 'application/pdf' });
     },
+    compare (property) {
+      return function (a, b) {
+          var value1 = a[property]
+          var value2 = b[property]
+          return value1 - value2
+      }
+    },
   },
   created() {
     var bloodAccessParOpera = getDataConfig(

src/xt_pages/user/components/PatientDetail.vue

     <div style="display: none">
       <div id="print-info-box">
         <div class="print_main_content" >
-          <div class="order_title">{{ orgname }} 血液透析门诊病历</div>
+          <div class="order_title" v-if="org_id!=10210">{{ orgname }} 血液透析门诊病历</div>
+          <div class="order_title" v-if="org_id==10210">{{ orgname }} 血液透析住院病历</div>
           <div >
             <table >
               <!-- 用 thead 规定好宽度 -->