Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

src/pages/main/dialog/AssessmentDialog.vue

@@ -273,7 +273,7 @@
           <h2 class="name">透析机型号</h2>
           <div class="content">
             <input
-              type="number"
+              type="text"
               @click="newClick($event)"
               @focus="inputFocus"
               v-model="formValue.machine_type"

src/pages/main/dialog/DoubleDialog.vue

@@ -177,6 +177,7 @@ export default {
         vascular_access_desc: "",
         pipeline_connection_desc: "",
         collator: "",
+
         creater: 0,
         modifier: 0,
         created_time: 0,

src/pages/main/dialog/PrescriptionDialog.vue

@@ -83,16 +83,15 @@
             </div>
           </div>
 
-          <div class="item" v-if="anticoagulant.shouji != -1&&isShow('首剂')">
+          <div class="item" v-if="dialysisPrescription.anticoagulant != 5&&isShow('首剂')">
             <label
               class="name"
               for="zl"
               v-if="dialysisPrescription.anticoagulant == 0 ||dialysisPrescription.anticoagulant == -2"
             >首剂(mg)</label>
-            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 2">首剂(mg)</label>
+            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 2">首剂(iu)</label>
             <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 3">首剂(iu)</label>
             <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 4">首剂(mg)</label>
-            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 5">首剂(mg)</label>
             <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 1">首剂(mg)</label>
             <div class="content">
               <input
@@ -122,11 +121,11 @@
               for="zl"
               v-if="dialysisPrescription.anticoagulant == 0 ||dialysisPrescription.anticoagulant == -2"
             >维持(mg/h)</label>
-            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 2">维持(mg/h)</label>
+            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 2">维持(iu)</label>
             <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 3">维持(iu)</label>
-            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 4">维持(mg/h)</label>
-            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 5">维持(ml/h)</label>
-            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 1">维持(mg/h)</label>
+            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 4">维持(mg)</label>
+            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 5">维持(ml)</label>
+            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 1">维持(mg)</label>
             <div class="content">
               <input
                 v-if="dialysisPrescription.anticoagulant != 1"
@@ -150,16 +149,15 @@
               />
             </div>
           </div>
-          <div class="item" v-if="anticoagulant.zongliang != -1 && isShow('总量')">
+          <div class="item" v-if="dialysisPrescription.anticoagulant != 5&& isShow('总量')">
             <label
               class="name"
               for="zl"
               v-if="dialysisPrescription.anticoagulant == 0 ||dialysisPrescription.anticoagulant == -2"
             >总量(mg)</label>
-            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 2">总量(mg)</label>
+            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 2">总量(iu)</label>
             <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 3">总量(iu)</label>
             <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 4">总量(mg)</label>
-            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 5">总量(mg)</label>
             <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 1">总量(mg)</label>
 
             <div class="content">
@@ -186,7 +184,7 @@
             </div>
           </div>
 
-          <div class="item" v-if="anticoagulant.gaimingcheng != -1 && isShow('钙名称')">
+          <div class="item" v-if="dialysisPrescription.anticoagulant == 5&& isShow('钙名称')">
             <label class="name" for="g">钙名称</label>
             <div class="content">
               <input
@@ -194,20 +192,18 @@
                 id="g"
                 class="inputBox"
                 v-model="dialysisPrescription.anticoagulant_gaimingcheng"
-                :disabled="anticoagulant.gaimingcheng==1?false:true"
               />
             </div>
           </div>
 
-          <div class="item" v-if="anticoagulant.gaijiliang != -1 && isShow('钙剂量')">
-            <label class="name" for="gjl">钙剂量({{anticoagulant.gaimingcheng_unit}})</label>
+          <div class="item" v-if="dialysisPrescription.anticoagulant == 5&& isShow('钙剂量')">
+            <label class="name" for="gjl">钙剂量(ml)</label>
             <div class="content">
               <input
                 type="text"
                 id="gjl"
                 class="inputBox"
                 v-model="dialysisPrescription.anticoagulant_gaijiliang"
-                :disabled="anticoagulant.gaijiliang==1?false:true"
               />
             </div>
           </div>
@@ -1289,7 +1285,7 @@
               this.zhiShow = true
               this.totalShow = true
               this.huShow  = true
-             
+
             }
           }
         }

src/pages/main/template/DialysisPrintOrderSix.vue

@@ -352,29 +352,54 @@
                       {{prescription.anticoagulant_name?prescription.anticoagulant_name:'/'}}
                     </div>
                   </div>
-                  <div class="inline_block" style="margin-left:20px;">
+                  <div class="inline_block" style="margin-left:20px;" v-if="prescription.anticoagulant != 5">
                     首剂：
                     <div class="under_line" style="width: 50px;text-align: center;">
                       {{prescription.anticoagulant_shouji?prescription.anticoagulant_shouji:'/'}}
                     </div>
-                    lu
+                    <span v-if="prescription.anticoagulant == 4">mg</span>
+                    <span v-if="prescription.anticoagulant == 3">iu</span>
+                    <span v-if="prescription.anticoagulant == 2">iu</span>
+                    <span v-if="prescription.anticoagulant == 1">mg</span>
                   </div>
+
                   <div class="inline_block" style="margin-left:20px;">
                   维持：
-                    <div v-if="prescription.anticoagulant == 1" class="under_line" style="width: 50px;text-align: center;">
-                      {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:'/'}}
+                    <div v-if="prescription.anticoagulant == 1"  class="under_line" style="width: 50px;text-align: center;">
+                      {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:"/"}}
                     </div>
-                    <div v-if="prescription.anticoagulant != 1" class="under_line" style="width: 50px;text-align: center;">
-                      {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:0}}
+                    <div v-if="prescription.anticoagulant != 1"  class="under_line" style="width: 50px;text-align: center;">
+                      {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:"0"}}
                     </div>
-                    lu
+                    <span v-if="prescription.anticoagulant == 5">ml</span>
+                    <span v-if="prescription.anticoagulant == 4">mg</span>
+                    <span v-if="prescription.anticoagulant == 3">iu</span>
+                    <span v-if="prescription.anticoagulant == 2">iu</span>
+                    <span v-if="prescription.anticoagulant == 1">mg</span>
                   </div>
-                  <div class="inline_block" style="margin-left:20px;">
+
+                  <div class="inline_block" style="margin-left:20px;" v-if="prescription.anticoagulant == 5">
+                    钙名称：
+                    <div class="under_line" style="width: 150px;text-align: center;">
+                      {{prescription.anticoagulant_gaimingcheng?prescription.anticoagulant_gaimingcheng:'/'}}
+                    </div>
+                  </div>
+                  <div class="inline_block" style="margin-left:20px;" v-if="prescription.anticoagulant == 5">
+                    钙剂量：
+                    <div class="under_line" style="width: 50px;text-align: center;">
+                      {{prescription.anticoagulant_gaijiliang?prescription.anticoagulant_gaijiliang:'/'}}
+                    </div>
+                    ml
+                  </div>
+                  <div class="inline_block" style="margin-left:20px;" v-if="prescription.anticoagulant != 5">
                   总量：
                     <div class="under_line" style="width: 50px;text-align: center;">
                       {{prescription.anticoagulant_zongliang?prescription.anticoagulant_zongliang:'/'}}
                     </div>
-                    lu
+                    <span v-if="prescription.anticoagulant == 4">mg</span>
+                    <span v-if="prescription.anticoagulant == 3">iu</span>
+                    <span v-if="prescription.anticoagulant == 2">iu</span>
+                    <span v-if="prescription.anticoagulant == 1">mg</span>
                   </div>
                   <div class="inline_block" style="margin-left:20px;">
                   透析机号：
@@ -664,7 +689,7 @@
                     {{afterdialysis.catheter?afterdialysis.catheter:'/'}}
                   </div>
                 </div>
-                
+
               </div>
 
               <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">

src/pages/main/template/DialysisPrintOrderTwo.vue

@@ -66,7 +66,7 @@
                   透析机编号:
                   <div class="under_line" style="width: 40px;text-align: left">{{dialysisOrder&&dialysisOrder.DeviceNumber&&dialysisOrder.DeviceNumber.number.length > 0?dialysisOrder.DeviceNumber.number:patientInfo.DialysisSchedule.device_number.number}}</div>
                   型号
-                  <div class="under_line" style="width: 70px;text-align: left">{{predialysis&&predialysis.machine_type.length > 0 ?predialysis.machine_type:''}}</div>
+                  <div class="under_line" style="width: 70px;text-align: left">{{predialysis?predialysis.machine_type:''}}</div>
                 </div>
 
 

src/pages/main/today/dialysisPrescription.vue

@@ -26,11 +26,11 @@
           <!--v-if="this.$store.getters.user.template_info.template_id == 6"-->
           <!--&gt;{{target_ultrafiltration != '0'?"ml":''}}</span>-->
         </li>
-        <li v-if="isShow('首剂')">
-          <label>首剂 :</label>
-          <span class="content">{{anticoagulant_shouji != '0'?anticoagulant_shouji:''}}</span>
-          <span class="unit">{{anticoagulant_shouji != '0'?"mg":''}}</span>
-        </li>
+        <!--<li v-if="isShow('首剂')">-->
+          <!--<label>首剂 :</label>-->
+          <!--<span class="content">{{anticoagulant_shouji != '0'?anticoagulant_shouji:''}}</span>-->
+          <!--<span class="unit">{{anticoagulant_shouji != '0'?"mg":''}}</span>-->
+        <!--</li>-->
         <li v-if="isShow('钙')">
           <label>钙:</label>
           <span class="content">{{calcium != '0'?calcium:""}}</span>
@@ -93,31 +93,31 @@
           <label>首剂 : </label>
           <span class="content">{{anticoagulant_shouji != '0'?anticoagulant_shouji:''}}</span>
           <!--<span class="unit">{{anticoagulant_shouji != '0'?"mg":''}}</span>-->
-          <span class="unit" v-if="this.prescription.anticoagulant == 2">{{anticoagulant_shouji != '0'?"mg":""}}</span>
+          <span class="unit" v-if="this.prescription.anticoagulant == 2">{{anticoagulant_shouji != '0'?"iu":""}}</span>
           <span class="unit" v-if="this.prescription.anticoagulant == 3">{{anticoagulant_shouji != '0'?"iu":""}}</span>
           <span class="unit" v-if="this.prescription.anticoagulant == 1">{{anticoagulant_shouji != '0'?"mg":""}}</span>
           <span class="unit" v-if="this.prescription.anticoagulant == 4">{{anticoagulant_shouji != '0'?"mg":""}}</span>
           <span class="unit" v-if="this.prescription.anticoagulant == 5">{{anticoagulant_shouji != '0'?"mg":""}}</span>
 
         </li>
-        <li v-if="isShow('维持')&&this.prescription.anticoagulant != 5">
+        <li v-if="isShow('维持')">
           <label>维持 : </label>
           <span class="content">{{anticoagulant_weichi != '0'?anticoagulant_weichi:""}}</span>
-          <span class="unit" v-if="this.prescription.anticoagulant == 2">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>
+          <span class="unit" v-if="this.prescription.anticoagulant == 2">{{anticoagulant_weichi != '0'?"iu":""}}</span>
           <span class="unit" v-if="this.prescription.anticoagulant == 3">{{anticoagulant_weichi != '0'?"iu":""}}</span>
-          <span class="unit" v-if="this.prescription.anticoagulant == 1">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>
-          <span class="unit" v-if="this.prescription.anticoagulant == 4">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>
-          <span class="unit" v-if="this.prescription.anticoagulant == 5">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>
+          <span class="unit" v-if="this.prescription.anticoagulant == 1">{{anticoagulant_weichi != '0'?"mg":""}}</span>
+          <span class="unit" v-if="this.prescription.anticoagulant == 4">{{anticoagulant_weichi != '0'?"mg":""}}</span>
+          <span class="unit" v-if="this.prescription.anticoagulant == 5">{{anticoagulant_weichi != '0'?"ml":""}}</span>
         </li>
 
         <li v-if="isShow('总量')&&this.prescription.anticoagulant != 5">
           <label>总量: </label>
           <span class="content">{{anticoagulant_zongliang != '0'?anticoagulant_zongliang:""}}</span>
-          <span class="unit" v-if="this.prescription.anticoagulant == 2">{{anticoagulant_zongliang != '0'?"mg":""}}</span>
+          <span class="unit" v-if="this.prescription.anticoagulant == 2">{{anticoagulant_zongliang != '0'?"iu":""}}</span>
           <span class="unit" v-if="this.prescription.anticoagulant == 3">{{anticoagulant_zongliang != '0'?"iu":""}}</span>
           <span class="unit" v-if="this.prescription.anticoagulant == 1">{{anticoagulant_zongliang != '0'?"mg":""}}</span>
           <span class="unit" v-if="this.prescription.anticoagulant == 4">{{anticoagulant_zongliang != '0'?"mg":""}}</span>
-          <span class="unit" v-if="this.prescription.anticoagulant == 5">{{anticoagulant_zongliang != '0'?"mg":""}}</span>
+          <span class="unit" v-if="this.prescription.anticoagulant == 5">{{anticoagulant_zongliang != '0'?"ml":""}}</span>
         </li>
 
 
@@ -130,7 +130,7 @@
         <li v-if="isShow('钙剂量')&&this.prescription.anticoagulant == 5">
           <label>钙剂量: </label>
           <span class="content">{{this.prescription.anticoagulant_gaijiliang}}</span>
-          <span class="unit" v-if="this.prescription.anticoagulant == 5">{{'ml/h'}}</span>
+          <span class="unit" v-if="this.prescription.anticoagulant == 5">{{'ml'}}</span>
         </li>
 
 

src/pages/monitoring/index.vue

@@ -79,7 +79,7 @@
               <th width="9%">透析号</th>
               <th width="10%">排班时间</th>
               <th width="10%">透析模式</th>
-              <th width="9%">脱水量</th>
+              <th width="9%">目标超滤量</th>
               <th width="10%">体重(透前/透后)</th>
               <th width="28%">监控预警(血压/心率)</th>
             </tr>
@@ -121,8 +121,8 @@
               <td width="10%">{{ item.treatment_mode.name }}</td>
               <td width="9%">
                 {{
-                  item.prescription.dewater_amount
-                    ? item.prescription.dewater_amount
+                  item.prescription.target_ultrafiltration
+                    ? item.prescription.target_ultrafiltration
                     : ""
                 }}
               </td>