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/DialysisPrintOrderForty.vue

@@ -816,6 +816,7 @@
           <td width="60" style="line-height:20px">血流量<br />ml/min</td>
           <td width="60" style="line-height:20px">电导度<br />mS/cm</td>
           <td width="60" style="line-height:20px">超滤量<br />ml</td>
+          <td width="40" style="line-height:20px">Kt/V</td>
           <!-- <td width="60">钠浓度<br/>mmol/L</td>
         <td width="80">透析液温度<br/>℃</td>
         <td width="60">置换率<br/>ml/min</td> -->
@@ -876,6 +877,9 @@
           <td>
             &nbsp;{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}
           </td>
+          <td>
+            &nbsp;{{ monitor.ktv ? monitor.ktv : "" }}
+          </td>
           <!-- <td>&nbsp;{{monitor.sodium_concentration}}</td>
         <td>&nbsp;{{monitor.dialysate_temperature}}</td>
         <td>&nbsp;{{monitor.replacement_rate}}</td> -->

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

@@ -397,7 +397,7 @@
             <tr style="line-height:20px;">
               <td width="60">时间</td>
               <td width="60">BP</td>
-              <td width="40">心率</td>
+              <td width="40">脉搏</td>
               <td width="40">血流速</td>
               <td width="100">静脉压/动脉压</td>
               <td width="40">超滤量</td>

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1341,7 +1341,9 @@
         if (this.teamList.length > 0) {
           for (let i = 0; i < this.teamList.length; i++) {
             if (this.curPrescriptions.med_type == 14 && this.teamList[i].is_special_diseases != 1) {
-              this.$message.error('该处方属于特病类型处方，请开特病类型的项目')
+              setTimeout(() => {
+                this.$message.error('该处方属于特病类型处方，请开特病类型的项目')
+              }, 100)
               // return
             }
 
@@ -1803,7 +1805,8 @@
                   remark: '',
                   medical_code: project[i].project.medical_code,
                   unit: project[i].project.unit,
-                  type: project[i].type
+                  type: project[i].type,
+                  is_special_diseases: project[i].project.disease_directory,
                 }
                 if (obj.total == 0 || obj.total == undefined) {
                   obj.total = 1
@@ -1824,7 +1827,8 @@
                   remark: '',
                   medical_code: project[i].good_info.medical_insurance_number,
                   unit: project[i].good_info.unit,
-                  type: project[i].type
+                  type: project[i].type,
+                  is_special_diseases: project[i].good_info.is_special_diseases,
                 }
                 if (obj.total == 0 || obj.total == undefined) {
                   obj.total = 1

src/xt_pages/user/components/PatientForm.vue

@@ -1421,6 +1421,7 @@ export default {
               this.form.avatar = this.form.avatar + "?imageView2/2/w/500/h/500/q/90"
             }
             console.log("form---",this.form)
+        
             editPatient(this.patientID, this.form)
 
               .then(response => {

src/xt_pages/user/templateSummary.vue

@@ -1552,7 +1552,7 @@
                this.form.natrium =list.natrium
                this.form.perfusion_apparatus= list.perfusion_apparatus
                this.form.other_count = list.other_count
-               this.form.record_time = this.getTimeTwo(list.record_time)
+              //  this.form.record_time = this.getTimeTwo(list.record_time)
                console.log("时间232233232",list.record_time)
                if(list.template_inspection_id == 0){
                   list.template_inspection_id = ""

src/xt_pages/workforce/components/tableWeeks.vue

@@ -278,11 +278,7 @@
               ? scope.row.dialysissolution.anticoagulant_zongliang + 'mg'
               : ''
           }}</span>
-                    <span v-if="scope.row.dialysissolution.anticoagulant == 6">{{
-            scope.row.dialysissolution.anticoagulant_zongliang
-              ? scope.row.dialysissolution.anticoagulant_zongliang + 'iu'
-              : ''
-          }}</span>
+            <span v-if="scope.row.dialysissolution.anticoagulant == 6">{{scope.row.dialysissolution.anticoagulant_zongliang? scope.row.dialysissolution.anticoagulant_zongliang + 'iu': ''}}</span>
             <span v-if="scope.row.dialysissolution.anticoagulant == 7">{{scope.row.dialysissolution.anticoagulant_zongliang? scope.row.dialysissolution.anticoagulant_zongliang + 'iu': ''}}</span>
             <span v-if="scope.row.dialysissolution.anticoagulant == 8">{{scope.row.dialysissolution.anticoagulant_zongliang? scope.row.dialysissolution.anticoagulant_zongliang + 'iu': ''}}</span>
             <span v-if="scope.row.dialysissolution.anticoagulant == 9">{{scope.row.dialysissolution.anticoagulant_zongliang? scope.row.dialysissolution.anticoagulant_zongliang + 'iu': ''}}</span>

src/xt_pages/workforce/remind_print.vue

@@ -88,9 +88,9 @@
                   <span v-if="main_collection.prescription.anticoagulant == 6">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.prescription.anticoagulant == 7">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                    <span v-if="main_collection.prescription.anticoagulant == 8">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
-                    <span v-if="main_collection.prescription.anticoagulant == 9">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
-                     <span v-if="main_collection.prescription.anticoagulant == 10">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
-                      <span v-if="main_collection.prescription.anticoagulant == 11">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 9">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 10">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 11">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                 </td>
                 <td :width="td_4_width" style="text-align:left"  v-if="printObj.doctor_advice == 1">
                   <span style="white-space: pre" v-if="main_collection.doctoradvice.length>0">{{getAdvice(main_collection.doctoradvice)}}</span>