xi2122

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.105"
+  "version": "1.0.206"
 }

src/pages/main/dialog/ComputerDialog.vue

@@ -48,7 +48,7 @@
           </div>
         </div>
 
-        
+
 
 
         <div class="perform">
@@ -134,7 +134,7 @@
       }
     },
     created () {
-    
+
       this.template_id = this.$store.getters.user.template_info.template_id;
       var date = this.$route.query && this.$route.query.date
       date *= 1000
@@ -157,7 +157,7 @@
       if (this.puncture_nurse_id == 0) {
         this.puncture_nurse_id = this.$store.getters.user.user.id
       }
-      
+
       // var beds = []
       // for (let index = 0; index < this.device_numbers.length; index++) {
       //   const device_number = this.device_numbers[index]

src/pages/main/dialog/PlaneDialog.vue

@@ -294,7 +294,8 @@
         console.log(this.$store.getters.user.user.id)
 
       }
-
+      // 212m3k12kl3nm123lk12nl3kk123sasasassaasasasdasdsadas
+      //sdsadsadasdasdasdassss
     }
   }
 </script>

src/pages/main/dialog/PrescriptionDialog.vue

@@ -66,7 +66,7 @@
                    :disabled="anticoagulant.shouji==1?false:true"/>
 
             <input v-if="dialysisPrescription.anticoagulant == 1" type="tel" @focus="inputFocus" id="sj" v-model="dialysisPrescription.no_anticoagulant_shouji"
-                   :disabled="anticoagulant.shouji==1?false:true"/>
+                   disabled="true"/>
           </div>
         </div>
         <div class="item" v-if="anticoagulant.weichi != -1&&isShow('维持')">
@@ -77,7 +77,7 @@
                    :disabled="anticoagulant.weichi==1?false:true">
 
             <input v-if="dialysisPrescription.anticoagulant == 1" type="tel" @focus="inputFocus" id="sj" v-model="dialysisPrescription.no_anticoagulant_weichi"
-                   :disabled="anticoagulant.shouji==1?false:true"/>
+                   disabled="true"/>
           </div>
         </div>
         <div class="item" v-if="anticoagulant.zongliang != -1 && isShow('总量')">
@@ -94,12 +94,12 @@
                    :disabled="anticoagulant.zongliang==1?false:true">
 
             <input v-if="dialysisPrescription.anticoagulant == 1" type="tel" @focus="inputFocus" id="sj" v-model="dialysisPrescription.no_anticoagulant_zongliang"
-                   :disabled="anticoagulant.shouji==1?false:true"/>
+                   disabled="true"/>
           </div>
         </div>
 
         <div class="item" v-if="anticoagulant.gaimingcheng != -1 && isShow('钙名称')">
-          <label class="name" for="g">钙名称({{anticoagulant.gaimingcheng_unit}})</label>
+          <label class="name" for="g">钙名称</label>
           <div class="content">
             <input type="text" id="g" class="inputBox" v-model="dialysisPrescription.anticoagulant_gaimingcheng"
                    :disabled="anticoagulant.gaimingcheng==1?false:true">
@@ -107,10 +107,10 @@
         </div>
 
         <div class="item" v-if="anticoagulant.gaijiliang != -1 && isShow('钙剂量')">
-          <label class="name" for="gjl">钙剂量</label>
+          <label class="name" for="gjl">钙剂量({{anticoagulant.gaimingcheng_unit}})</label>
           <div class="content">
-            <input type="text" id="gjl" class="inputBox" v-model="dialysisPrescription.anticoagulant_gaimingcheng"
-                   :disabled="anticoagulant.gaimingcheng==1?false:true">
+            <input type="text" id="gjl" class="inputBox" v-model="dialysisPrescription.anticoagulant_gaijiliang"
+                   :disabled="anticoagulant.gaijiliang==1?false:true">
           </div>
         </div>
         <!-- <div class="item">
@@ -346,6 +346,7 @@
   import CheckBoxSubMenu from './subMenu/checkBoxSubMenu'
   import MultipleSubMenu from './subMenu/multipleSubMenu'
   import {commitDialysisPrescription, CreateGroupAdvice, GetSolution, postSign, postSolution} from '@/api/dialysis'
+  import { calculateAnticoagulantZL} from '@/utils/tools'
 
   import {Toast} from 'vant'
   import {getDataConfig} from '@/utils/data'
@@ -441,6 +442,7 @@
         msgtip_visibility: false,
         time: '03:00',
         timeValue: '',
+        tempTimeValue:'',
         isShowSign: false,
         anticoagulantsConfit: {},
         dialysateFormulationOptions: [],
@@ -606,7 +608,7 @@
         }
         this.timeValue = this.dialysisPrescription.dialysis_duration_hour + '小时' + this.dialysisPrescription.dialysis_duration_minute + '分钟'
 
-        this.dialysisPrescription.dialysis_duration = this.dialysisPrescription.dialysis_duration_hour + '.' + (this.dialysisPrescription.dialysis_duration_minute)
+        this.dialysisPrescription.dialysis_duration = parseFloat(this.dialysisPrescription.dialysis_duration_hour) + parseFloat((this.dialysisPrescription.dialysis_duration_minute / 60).toFixed(2))
 
       },
       inputFocus: function (event) {
@@ -1011,10 +1013,6 @@
                 }
               }
 
-              console.log(this.dialysisPrescription.dialysis_duration_hour)
-              console.log(this.dialysisPrescription.dialysis_duration_minute)
-              console.log(this.dialysisPrescription.dialysis_duration_hour == '')
-              console.log(this.dialysisPrescription.dialysis_duration_minute == 0)
 
 
 
@@ -1958,6 +1956,10 @@
 
       }
 
+
+
+
+
       if (this.dialysisPrescription.dialysis_duration_hour.length == 0 || this.dialysisPrescription.dialysis_duration_minute.length == 0) {
         this.timeValue = ''
         this.time = '03:00'
@@ -2006,6 +2008,19 @@
       this.dialysisPrescription.ultrafiltration = this.getFloat(this.dialysisPrescription.ultrafiltration)
       this.dialysisPrescription.target_ultrafiltration = this.getFloat(this.dialysisPrescription.target_ultrafiltration)
 
+      if(this.dialysisPrescription.anticoagulant_shouji == ''){
+        this.dialysisPrescription.anticoagulant_shouji = '0'
+      }
+
+      if(this.dialysisPrescription.anticoagulant_weichi == ''){
+        this.dialysisPrescription.anticoagulant_weichi = '0'
+      }
+
+      if(this.dialysisPrescription.anticoagulant_zongliang == ''){
+        this.dialysisPrescription.anticoagulant_weichi = '0'
+      }
+
+
     },
 
     components: {
@@ -2016,40 +2031,37 @@
       CheckBoxSubMenu
     },
     watch: {
-      'dialysisPrescription.anticoagulant_shouji': function (val) {
-        if (this.dialysisPrescription.anticoagulant_shouji == '' && this.dialysisPrescription.anticoagulant_weichi == '') {
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(0) + parseInt(0)
-        } else if (this.dialysisPrescription.anticoagulant_shouji != '' && this.dialysisPrescription.anticoagulant_weichi != '') {
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(this.dialysisPrescription.anticoagulant_weichi)
-        } else if (this.dialysisPrescription.anticoagulant_shouji != '' && this.dialysisPrescription.anticoagulant_shouji == '') {
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(0)
-        } else if (this.dialysisPrescription.anticoagulant_shouji == '' && this.dialysisPrescription.anticoagulant_shouji != '') {
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(0) + parseInt(this.dialysisPrescription.anticoagulant_shouji)
-        }
+      "dialysisPrescription.dialysis_duration":function(){
+        console.log(this.dialysisPrescription.dialysis_duration)
+        this.dialysisPrescription.anticoagulant_zongliang=calculateAnticoagulantZL(1,
+          this.dialysisPrescription.anticoagulant_shouji,
+          this.dialysisPrescription.dialysis_duration,
+          this.dialysisPrescription.anticoagulant_weichi
+        );
         if(isNaN(this.dialysisPrescription.anticoagulant_zongliang)){
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
-
-
-      }, 'dialysisPrescription.anticoagulant_weichi': function (val) {
-        console.log(this.dialysisPrescription.anticoagulant_shouji)
-        console.log(this.dialysisPrescription.anticoagulant_weichi)
-        if (this.dialysisPrescription.anticoagulant_shouji == '' && this.dialysisPrescription.anticoagulant_weichi == '') {
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(0) + parseInt(0)
-        } else if (this.dialysisPrescription.anticoagulant_shouji != '' && this.dialysisPrescription.anticoagulant_weichi != '') {
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(this.dialysisPrescription.anticoagulant_weichi)
-        } else if (this.dialysisPrescription.anticoagulant_shouji != '' && this.dialysisPrescription.anticoagulant_shouji == '') {
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(0)
-        } else if (this.dialysisPrescription.anticoagulant_shouji == '' && this.dialysisPrescription.anticoagulant_shouji != '') {
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(0) + parseInt(this.dialysisPrescription.anticoagulant_shouji)
+      },
+      "dialysisPrescription.anticoagulant_shouji":function(){
+        this.dialysisPrescription.anticoagulant_zongliang=calculateAnticoagulantZL(1,
+          this.dialysisPrescription.anticoagulant_shouji,
+          this.dialysisPrescription.dialysis_duration,
+          this.dialysisPrescription.anticoagulant_weichi
+        );
+        if(isNaN(this.dialysisPrescription.anticoagulant_zongliang)){
+          this.dialysisPrescription.anticoagulant_zongliang = ''
         }
-
+      },
+      "dialysisPrescription.anticoagulant_weichi":function(){
+        this.dialysisPrescription.anticoagulant_zongliang=calculateAnticoagulantZL(1,
+          this.dialysisPrescription.anticoagulant_shouji,
+          this.dialysisPrescription.dialysis_duration,
+          this.dialysisPrescription.anticoagulant_weichi
+        );
         if(isNaN(this.dialysisPrescription.anticoagulant_zongliang)){
           this.dialysisPrescription.anticoagulant_zongliang = ''
-
         }
       },
-
       isShowDialog (val) {
         if (val) {
           this.advice_visibility = false

src/pages/main/dialog/modify_order/modify_order_form.vue

@@ -13,12 +13,12 @@
           <div>
             <div class="cell" v-show="order.parent_id == 0">
               <label>开始时间</label>
-              <el-input :value="start_time_str" readonly @focus="selectStartTimeAction"></el-input>
+              <el-input style="width:60%"  :value="start_time_str" readonly @focus="selectStartTimeAction"></el-input>
             </div>
 
             <div class="cell">
               <label>医嘱名称</label>
-              <el-input v-model="order.title"></el-input>
+              <el-input style="width:60%"  v-model="order.title"></el-input>
             </div>
             <div class="cell">
               <label>药品规格</label>
@@ -34,19 +34,6 @@
               >
             </div>
 
-            <div class="cell">
-              <label>单次用量</label>
-              <input type="number" onclick="this.select()" class="inputBox" style="width:62.5%" v-model="order.single_dose">
-              <input
-                type="text"
-                placeholder="单位"
-                readonly
-                class="inputBox"
-                style="width:35%"
-                v-model="order.single_dose_unit"
-                @focus="selectSingleDoseAction"
-              >
-            </div>
             <div class="cell">
               <label>开药数量</label>
               <input
@@ -67,12 +54,18 @@
               >
             </div>
 
-            <div class="cell" v-show="order.parent_id == 0">
-              <label>医嘱嘱托</label>
+
+            <div class="cell">
+              <label>单次用量</label>
+              <input type="number" onclick="this.select()" class="inputBox" style="width:60%" v-model="order.single_dose">
               <input
+                type="text"
+                placeholder="单位"
+                readonly
                 class="inputBox"
-                style="width:100%"
-                v-model="order.remark"
+                style="width:35%"
+                v-model="order.single_dose_unit"
+                @focus="selectSingleDoseAction"
               >
             </div>
 
@@ -86,18 +79,29 @@
                 @focus="selectDeliveryWayAction"
               ></el-input>
             </div>
+            <div>
+
             <div class="cell" v-show="order.parent_id == 0">
               <label>执行频率</label>
               <el-input
                 placeholder="选择执行频率"
                 readonly
+                style="width:50%"
                 :disabled="mode == 3"
                 v-model="order.execution_frequency"
                 @focus="selectExecFrequencyAction"
               ></el-input>
             </div>
 
-
+              <div class="cell" v-show="order.parent_id == 0">
+                <label>医嘱嘱托</label>
+                <input
+                  class="inputBox"
+                  style="width:50%"
+                  v-model="order.remark"
+                >
+              </div>
+            </div>
           </div>
         </div>
       </div>

src/pages/main/dialog/new_order/order_form.vue

@@ -11,16 +11,18 @@
       <div class="DialogContent choose advice-top">
         <div class="content clearfix">
           <div>
+
+
             <div class="cell">
               <label>医嘱名称</label>
-              <input class="inputBox" style="width:100%" v-model="order.title">
+              <input class="inputBox"  v-model="order.title">
               <!-- <el-input v-model="order.title"></el-input> -->
             </div>
             <div class="cell">
               <label>药品规格</label>
               <!--<input class="inputBox" style="width:62.5%" v-model="order.advice_desc">-->
 
-              <input class="inputBox" style="width:62.5%" v-model="order.advice_desc">
+              <input class="inputBox" style="width:60%" v-model="order.advice_desc">
               <input
                 type="text"
                 placeholder="单位"
@@ -32,25 +34,14 @@
               >
             </div>
 
-            <div class="cell">
-              <label>单次用量</label>
-              <input type="number" class="inputBox" style="width:62.5%" v-model="order.single_dose">
-              <input
-                type="text"
-                placeholder="单位"
-                readonly
-                class="inputBox"
-                style="width:35%"
-                v-model="order.single_dose_unit"
-                @focus="selectSingleDoseAction"
-              >
-            </div>
+
+
             <div class="cell">
               <label>开药数量</label>
               <input
                 type="number"
                 class="inputBox"
-                style="width:62.5%"
+                style="width:60%"
                 v-model="order.prescribing_number"
               >
               <input
@@ -66,6 +57,20 @@
 
 
 
+            <div class="cell">
+              <label>单次用量</label>
+              <input type="number" class="inputBox" style="width:62.5%" v-model="order.single_dose">
+              <input
+                type="text"
+                placeholder="单位"
+                readonly
+                class="inputBox"
+                style="width:35%"
+                v-model="order.single_dose_unit"
+                @focus="selectSingleDoseAction"
+              >
+            </div>
+
 
             <div class="cell" v-show="order.parent_id == 0">
               <label>给药途径</label>
@@ -77,6 +82,7 @@
                 @focus="selectDeliveryWayAction"
               ></el-input>
             </div>
+
             <div class="cell" v-show="order.parent_id == 0">
               <label>执行频率</label>
               <el-input
@@ -88,6 +94,7 @@
               ></el-input>
             </div>
 
+
             <div class="cell" v-show="order.parent_id == 0">
               <label>医嘱嘱托</label>
               <input
@@ -97,6 +104,7 @@
               >
             </div>
 
+
           </div>
         </div>
       </div>

src/pages/main/template/DialysisPrintOrderFive.vue

@@ -1296,7 +1296,7 @@
       modeName(mode_id) {
         return typeof (this.modeOptions[mode_id]) !== 'undefined' && typeof (this.modeOptions[mode_id].name) !== 'undefined' ? this.modeOptions[mode_id].name : ''
       },
-      getDialysisRecord() {debugger
+      getDialysisRecord() {
         this.loading = true
 
         // getDialysisRecord(this.queryParams).then(response => {

src/pages/main/template/DialysisPrintOrderTwo.vue

@@ -822,8 +822,8 @@
                 </div>
                 <div class="inline_block">
                   &emsp;实际超滤量：
-                  <div class="under_line" style="width: 70px;text-align: left" v-if="getFloat(prescription.ultrafiltration)">
-                    {{getFloat(prescription.ultrafiltration)}}
+                  <div class="under_line" style="width: 70px;text-align: left" v-if="getFloat(afterdialysis.actual_ultrafiltration)">
+                    {{getFloat(afterdialysis.actual_ultrafiltration)}}
                   </div>
                   <div class="under_line" style="width: 70px;" v-else>
                     {{'/'}}
@@ -1216,7 +1216,7 @@
       modeName(mode_id) {
         return typeof (this.modeOptions[mode_id]) !== 'undefined' && typeof (this.modeOptions[mode_id].name) !== 'undefined' ? this.modeOptions[mode_id].name : ''
       },
-      getDialysisRecord() {debugger
+      getDialysisRecord() {
         this.loading = true
 
         // getDialysisRecord(this.queryParams).then(response => {

src/pages/main/today/TodayTab.vue

@@ -787,7 +787,7 @@ import {parseTime} from '@/utils'
       this.advice_groups = []
       this.doctor_advices = []
 
-      getDialysisRecord(params).then(rs => {debugger
+      getDialysisRecord(params).then(rs => {
         var resp = rs.data
         console.log(resp)
 

src/pages/main/today/statOrder.vue

@@ -22,7 +22,7 @@
 
             <td :class="advice.parent_id == 0 ? 'advice_content' : 'subadvice_content'">
               <span>{{advice.advice_name }}</span>
-              <!-- <span>{{advice.drug_spec}}{{advice.drug_spec_unit}} * {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span> -->
+              <!-- <span>{{advice.drug_spec}}{{advice.drug_spec_unit9}} * {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span> -->
               <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
               <span v-if="advice.prescribing_number">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
               <!--<span v-if="advice.single_dose">单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>-->

src/store/modules/globalConfig.js

@@ -385,9 +385,9 @@ const global_config = {
         zongliang: 1,
         gaimingcheng: -1,
         gaijiliang: -1,
-        shouji_unit: 'lu',
-        weichi_unit: 'lu',
-        zongliang_unit: 'lu',
+        shouji_unit: 'IU',
+        weichi_unit: 'IU',
+        zongliang_unit: 'IU',
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
       },