1

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

@@ -1250,6 +1250,7 @@ export default {
       if(predialysis.id > 0){
         this.form.hypopiesia = predialysis.hypopiesia.toString()
       }
+      
 
 
       this.form.leave_office_method = predialysis.leave_office_method
@@ -1269,6 +1270,12 @@ export default {
             }
           }
         }
+        if(last_after.id > 0){
+         this.form.hypertenison = last_after.hypertenison.toString()
+        }
+        if(last_after.id > 0){
+          this.form.hypopiesia = last_after.hypopiesia.toString()
+        }
       }
 
 

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyEight.vue

@@ -260,7 +260,7 @@
             </span>
           </div>
       </div>
-      <div class="lineHeight">治疗过程中检测记录：血压检测部位：{{ monitors && monitors[0] ? monitors[0].blood_pressure_monitoring_site : '' }}</div>
+      <div class="lineHeight">治疗过程中检测记录：血压检测部位：{{ monitors && monitors[0] ? getBloodPressureMmonitoringSite(monitors[0].blood_pressure_monitoring_site) : '' }}</div>
       <table class="print-table" border="1">
         <tbody>
           <tr>
@@ -572,7 +572,8 @@ export default {
         url: ""
       },
       displaceLiquiPartOptions: [],
-      complicationList:[]
+      complicationList:[],
+      bloodPressureMmonitoringSite:[]
     };
   },
   methods: {
@@ -586,6 +587,15 @@ export default {
       var gm=(ty-oy)*12+(tm-om); //距今月数
       return gm
     },
+    getBloodPressureMmonitoringSite(id){
+      var name = "";
+      for(let i=0;i<this.bloodPressureMmonitoringSite.length;i++){
+         if(id == this.bloodPressureMmonitoringSite[i].id){
+            name = this.bloodPressureMmonitoringSite[i].name
+         }
+      }
+      return name
+    },
     getComplication(id){
       var name = "";
       for(let i=0;i<this.complicationList.length;i++){
@@ -1298,6 +1308,7 @@ export default {
     this.displaceLiquiPartOptions = this.$store.getters.displace_liqui;
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
     this.complicationList = getDataConfig('hemodialysis','complication')
+    this.bloodPressureMmonitoringSite = getDataConfig('hemodialysis','blood_pressure_monitoring_site');
 
     var bloodAccessParOpera = getDataConfig(
       "hemodialysis",

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2179,14 +2179,31 @@
               'prescriptions': this.prescriptions
             }
             isLoading = true
-            createHisPrescription(data, params).then(response => {
-              if (response.data.state == 1) {
-                this.$emit('change', this.patientInfo.id)
-                this.$message.success('保存成功')
-              } else {
-                this.$message.error(response.data.msg)
+            console.log('this.prescriptionsthis.prescriptions',this.prescriptions)
+            let num = 0
+            this.prescriptions.map(item => {
+              if(item.advices.length > 0){
+                item.advices.map(it => {
+                  if(it.drug.total <= 0){
+                    num++
+                    setTimeout(() =>{
+                      this.$message.error(it.drug.drug_name + '库存不足')
+                    },100)
+                  }
+                })
               }
             })
+            if(num == 0){
+              createHisPrescription(data, params).then(response => {
+                if (response.data.state == 1) {
+                  this.$emit('change', this.patientInfo.id)
+                  this.$message.success('保存成功')
+                } else {
+                  this.$message.error(response.data.msg)
+                }
+              })
+            }
+            
           } else if (index == 2) {
             this.$router.push('/outpatientDoctorStation/print')
           } else if (index == 4) {
@@ -2757,7 +2774,20 @@
       }, changeAllGoodInfoTableDataTwo(row) {
         this.teamList = row
       },
-      selectChange(row) {
+      selectChange(selection, row) {
+        if(row.total <= 0){
+          if (selection) {
+            selection.forEach(row => {
+              if(row.total <= 0){
+                this.$refs.tables.toggleRowSelection(row);
+              }
+            });
+          } else {
+            this.$refs.tables.clearSelection();
+          }
+          this.$message.error(row.project_name + '库存不足')
+          return
+        }
         this.teamList = row
       },
       getlist() {

src/xt_pages/outpatientDoctorStation/components/prescriptionTemplateTable.vue

@@ -408,29 +408,29 @@
         if(scope.row.prescribing_number == 0){
           scope.row.prescribing_number = 1
         }
-        if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
-          // scope.row.retail_price = scope.row.drug.min_price * scope.row.prescribing_number
-          if(scope.row.prescribing_number > scope.row.drug.total){
-            this.$message.error(scope.row.drug_name + '库存不足')
-          }
-        }else{
-          if((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total){
-            this.$message.error(scope.row.drug_name + '库存不足')
-          }
-          // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
-        }
+        // if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+        //   // scope.row.retail_price = scope.row.drug.min_price * scope.row.prescribing_number
+        //   if(scope.row.prescribing_number > scope.row.drug.total){
+        //     this.$message.error(scope.row.drug_name + '库存不足')
+        //   }
+        // }else{
+        //   if((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total){
+        //     this.$message.error(scope.row.drug_name + '库存不足')
+        //   }
+        //   // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
+        // }
         
       },
       changePrescribingNumber(scope){
-        if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
-          if(parseInt(scope.row.prescribing_number) > scope.row.drug.total){
-            this.$message.error(scope.row.drug_name + '库存不足')
-          }
-        }else{
-          if((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total){
-            this.$message.error(scope.row.drug_name + '库存不足')
-          }
-        }
+        // if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+        //   if(parseInt(scope.row.prescribing_number) > scope.row.drug.total){
+        //     this.$message.error(scope.row.drug_name + '库存不足')
+        //   }
+        // }else{
+        //   if((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total){
+        //     this.$message.error(scope.row.drug_name + '库存不足')
+        //   }
+        // }
       },
       getSingleDose(scope){
         this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day