Merge remote-tracking branch 'origin/20230223_pad_vue_new_branch' into 20230223_pad_vue_new_branch

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "2999.999.13784"
+  "version": "2999.999.13800"
 }

src/pages/main/newActionBar/assessmentAfter.vue

@@ -22,7 +22,7 @@
                 <van-field v-model="timeValue" readonly @click="openPicker" @focus="inputFocus" v-if="isShow('实际治疗时长')" :required="isShow_title('实际治疗时长')" label="实际治疗时长" input-align="right"/>
                 <van-field v-model="formValue.actual_ultrafiltration" @focus="inputFocus" v-if="isShow('实际超滤量')" :required="isShow_title('实际超滤量')" type="number" input-align="right">
                     <template #label>
-                        <span v-if="(template_id == 6 && $store.getters.user.template_info.org_id !=10447 && $store.getters.user.template_info.org_id !=10471 && $store.getters.user.template_info.org_id !=10624) || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 17 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 28 || template_id == 27 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 36 || template_id == 38 || template_id == 40 || template_id == 43 || template_id == 44 || template_id == 47 || template_id == 56 || template_id == 60 || $store.getters.user.template_info.org_id == 9555 || $store.getters.user.template_info.org_id == 10307 || $store.getters.user.template_info.org_id == 10340 || $store.getters.user.template_info.org_id == 10387 || $store.getters.user.template_info.org_id == 10430 || $store.getters.user.template_info.org_id == 10432 || $store.getters.user.template_info.org_id == 10441 || $store.getters.user.template_info.org_id == 10445 || $store.getters.user.template_info.org_id == 10495 || $store.getters.user.template_info.org_id == 10375  || $store.getters.user.template_info.org_id == 10551 || $store.getters.user.template_info.org_id == 10597 || $store.getters.user.template_info.org_id == 10599 || $store.getters.user.template_info.org_id == 10580 || $store.getters.user.template_info.org_id == 10629 || $store.getters.user.template_info.org_id == 10617 || $store.getters.user.template_info.org_id == 10677 || $store.getters.user.template_info.org_id == 10667 || $store.getters.user.template_info.org_id == 10480 || $store.getters.user.template_info.org_id == 10693 || $store.getters.user.template_info.org_id == 10702 || $store.getters.user.template_info.org_id == 10697 || $store.getters.user.template_info.org_id == 10635 ||  $store.getters.user.template_info.org_id == 10723 ||  $store.getters.user.template_info.org_id == 10721 ||  $store.getters.user.template_info.org_id == 10727">实际超滤量(ml)</span>
+                        <span v-if="(template_id == 6 && $store.getters.user.template_info.org_id !=10447 && $store.getters.user.template_info.org_id !=10471 && $store.getters.user.template_info.org_id !=10624) || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 17 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 28 || template_id == 27 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 36 || template_id == 38 || template_id == 40 || template_id == 43 || template_id == 44 || template_id == 47 || template_id == 56 || template_id == 60 || $store.getters.user.template_info.org_id == 9555 || $store.getters.user.template_info.org_id == 10307 || $store.getters.user.template_info.org_id == 10340 || $store.getters.user.template_info.org_id == 10387 || $store.getters.user.template_info.org_id == 10430 || $store.getters.user.template_info.org_id == 10432 || $store.getters.user.template_info.org_id == 10441 || $store.getters.user.template_info.org_id == 10445 || $store.getters.user.template_info.org_id == 10495 || $store.getters.user.template_info.org_id == 10375  || $store.getters.user.template_info.org_id == 10551 || $store.getters.user.template_info.org_id == 10597 || $store.getters.user.template_info.org_id == 10599 || $store.getters.user.template_info.org_id == 10580 || $store.getters.user.template_info.org_id == 10629 || $store.getters.user.template_info.org_id == 10617 || $store.getters.user.template_info.org_id == 10677 || $store.getters.user.template_info.org_id == 10667 || $store.getters.user.template_info.org_id == 10480 || $store.getters.user.template_info.org_id == 10693 || $store.getters.user.template_info.org_id == 10702 || $store.getters.user.template_info.org_id == 10697 || $store.getters.user.template_info.org_id == 10635 ||  $store.getters.user.template_info.org_id == 10723 ||  $store.getters.user.template_info.org_id == 10721 ||  $store.getters.user.template_info.org_id == 10727 || $store.getters.user.template_info.org_id == 10742">实际超滤量(ml)</span>
                         <span v-else>实际超滤量(L)</span>
                     </template>
                 </van-field>

src/pages/main/newActionBar/dialysisPrescription.vue

@@ -2217,7 +2217,7 @@ export default {
 
 
       //针对揭阳
-      if(this.$store.getters.user.template_info.org_id == 10597 || this.$store.getters.user.template_info.org_id == 10679 || this.$store.getters.user.template_info.org_id == 10702 || this.$store.getters.user.template_info.org_id == 10635 || this.$store.getters.user.template_info.org_id == 10721){
+      if(this.$store.getters.user.template_info.org_id == 10597 || this.$store.getters.user.template_info.org_id == 10679 || this.$store.getters.user.template_info.org_id == 10702 || this.$store.getters.user.template_info.org_id == 10635 || this.$store.getters.user.template_info.org_id == 10721|| this.$store.getters.user.template_info.org_id == 10742){
         if(this.predialysis!=undefined){
           if(this.$store.getters.user.template_info.org_id == 10702){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
@@ -2252,6 +2252,13 @@ export default {
             if(this.dialysisPrescription.target_ultrafiltration<=0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight)*1000
             }
+          }else if(this.$store.getters.user.template_info.org_id == 10742){
+            if(this.dialysisPrescription.target_ultrafiltration<=0 || this.dialysisPrescription.target_ultrafiltration==""){
+              this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight)
+            }
+            if(this.dialysisPrescription.prescription_water<=0 || this.dialysisPrescription.prescription_water==""){
+              this.dialysisPrescription.prescription_water = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
+            }
           }else{
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = this.predialysis.weight_before - this.predialysis.dry_weight
@@ -2276,7 +2283,7 @@ export default {
         }
       }
 
-      if(this.$store.getters.user.template_info.org_id == 10579 || this.$store.getters.user.template_info.org_id == 10587 ||  this.$store.getters.user.template_info.org_id == 10740 || this.$store.getters.user.template_info.org_id == 10742 || this.$store.getters.user.template_info.org_id == 10745){
+      if(this.$store.getters.user.template_info.org_id == 10579 || this.$store.getters.user.template_info.org_id == 10587 ||  this.$store.getters.user.template_info.org_id == 10740 || this.$store.getters.user.template_info.org_id == 10742 || this.$store.getters.user.template_info.org_id == 10745 || this.$store.getters.user.template_info.org_id == 10742){
         console.log("进来2噢噢噢哦",this.lastDialysisPrescription.blood_access_part_id)
         if(this.lastDialysisPrescription!=undefined){
 

src/pages/main/today/assessmentAfter.vue

@@ -32,7 +32,7 @@
         <li v-if="isShow('实际超滤量')">
           <label for="sjcll">实际超滤量: </label>
           <span class="content" id="sjcll">{{actual_ultrafiltration?actual_ultrafiltration:''}}</span>
-          <span v-if="(template_id == 6&& $store.getters.user.template_info.org_id !=10447 && $store.getters.user.template_info.org_id !=10471) || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 17 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 36 || template_id == 38 || template_id == 40 || template_id == 43 || template_id == 44 || template_id == 60 || this.$store.getters.user.template_info.org_id == 9555 || template_id == 27  || this.$store.getters.user.template_info.org_id == 10340 || this.$store.getters.user.template_info.org_id == 10387 ||  $store.getters.user.template_info.org_id == 10430 ||  $store.getters.user.template_info.org_id == 10432 ||  $store.getters.user.template_info.org_id == 10441  ||  $store.getters.user.template_info.org_id == 10445 ||  $store.getters.user.template_info.org_id == 10410 ||  $store.getters.user.template_info.org_id == 10495 || $store.getters.user.template_info.org_id == 10375 || $store.getters.user.template_info.org_id == 10551 || $store.getters.user.template_info.org_id == 10597 || $store.getters.user.template_info.org_id == 10599 || $store.getters.user.template_info.org_id == 10629 || $store.getters.user.template_info.org_id == 10677 || $store.getters.user.template_info.org_id == 10667 || $store.getters.user.template_info.org_id == 10480 || $store.getters.user.template_info.org_id == 10693 || $store.getters.user.template_info.org_id == 10702  || $store.getters.user.template_info.org_id == 10697 || $store.getters.user.template_info.org_id == 10635 || $store.getters.user.template_info.org_id == 10723 || $store.getters.user.template_info.org_id == 10721  || $store.getters.user.template_info.org_id == 10727" class="unit">{{actual_ultrafiltration?'ml':''}}</span>
+          <span v-if="(template_id == 6&& $store.getters.user.template_info.org_id !=10447 && $store.getters.user.template_info.org_id !=10471) || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 17 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 36 || template_id == 38 || template_id == 40 || template_id == 43 || template_id == 44 || template_id == 60 || this.$store.getters.user.template_info.org_id == 9555 || template_id == 27  || this.$store.getters.user.template_info.org_id == 10340 || this.$store.getters.user.template_info.org_id == 10387 ||  $store.getters.user.template_info.org_id == 10430 ||  $store.getters.user.template_info.org_id == 10432 ||  $store.getters.user.template_info.org_id == 10441  ||  $store.getters.user.template_info.org_id == 10445 ||  $store.getters.user.template_info.org_id == 10410 ||  $store.getters.user.template_info.org_id == 10495 || $store.getters.user.template_info.org_id == 10375 || $store.getters.user.template_info.org_id == 10551 || $store.getters.user.template_info.org_id == 10597 || $store.getters.user.template_info.org_id == 10599 || $store.getters.user.template_info.org_id == 10629 || $store.getters.user.template_info.org_id == 10677 || $store.getters.user.template_info.org_id == 10667 || $store.getters.user.template_info.org_id == 10480 || $store.getters.user.template_info.org_id == 10693 || $store.getters.user.template_info.org_id == 10702  || $store.getters.user.template_info.org_id == 10697 || $store.getters.user.template_info.org_id == 10635 || $store.getters.user.template_info.org_id == 10723 || $store.getters.user.template_info.org_id == 10721  || $store.getters.user.template_info.org_id == 10727 || $store.getters.user.template_info.org_id == 10742" class="unit">{{actual_ultrafiltration?'ml':''}}</span>
           <span v-else class="unit">{{actual_ultrafiltration?'L':''}}</span>
         </li>
         <li v-if="isShow('透析器')">

src/pages/patients/editPatient.vue

@@ -628,7 +628,7 @@ export default {
       this.show3 = false
     },
     onChange2 (picker, value, index) {
-      if (value == '死亡') {
+      if (value == '死亡' || value=='转出') {
         this.showDeath = true
       } else {
         this.showDeath = false
@@ -1320,6 +1320,14 @@ export default {
         }
       }
 
+      if(this.patientForm.lapseto ==2 || this.patientForm.lapseto == 3){
+         if(this.patientForm.death_time == ""){
+          this.$toast('请填写正确的转出或死亡日期!,否则可能会清空排班!')
+          return false
+         }
+      }
+    
+
       const params = {
         id: this.patientForm.id,
         name: this.patientForm.name,
@@ -1354,6 +1362,7 @@ export default {
         patient_type:parseInt(this.patient_type),
       }
 
+      console.log("params-----------",params)
       updatedPatient(params).then(response => {
         if (response.data.state === 1) {
           var msg = response.data.data.msg

src/utils/tools.js

@@ -186,6 +186,10 @@ export function uParseTimeThree (time, cFormat) {
 }
 
 export function uParseTimeOne (time, cFormat) {
+ 
+  if (time < 0) {
+    return ""
+  }
   if (arguments.length === 0) {
     return null
   }