Merge branch '20201014_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201014_pc_vue_new_branch

src/api/advice.js

@@ -221,6 +221,7 @@ export function postAdviceTemplate(params, name, advice_type) {
 }
 
 export function CreateGroupAdvice(id, groupno, advices, mode) {
+
   if (advices.remind > 0) {
     return request({
       url:

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

@@ -755,7 +755,8 @@
           execution_frequency: '',
           advice_doctor: '',
           remark: '',
-          parent_id: 0
+          parent_id: 0,
+          drug_name_id:"",
         },
         nameForm: {
           advice_name: '',
@@ -808,7 +809,6 @@
         this.form['dialysis_order_id'] = this.dialysis_order.id
       },
       doctor_advices: function() {
-
         this.handleSpanTempArr()
         this.hoverOrderArr = []
         this.handleStyle()
@@ -980,6 +980,9 @@
               this.doctor_advices[this.currentIndex].advice_doctor =
                 advice.advice_doctor
               this.doctor_advices[this.currentIndex].remark = advice.remark
+              this.doctor_advice[this.currentIndex].drug_id = advice.drug_id
+              this.doctor_advice[this.currentIndex].drug_name_id = advice.drug_name_id
+              this.doctor.advice[this.currentIndex].way = advice.way
               this.currentIndex = -1
               return false
             }
@@ -1134,6 +1137,7 @@
 
             return
           }
+
           this.nameForm = {
             advice_name: this.groupSelectRow.advice_name,
             single_dose: this.groupSelectRow.single_dose,
@@ -1144,9 +1148,11 @@
             prescribing_number_unit: this.groupSelectRow.prescribing_number_unit,
             delivery_way: this.groupSelectRow.delivery_way,
             execution_frequency: this.groupSelectRow.execution_frequency,
+
             isEdit: 1,
             index: this.groupSelectRow.index
           }
+          console.log("88888888",this.nameForm)
         } else {
           this.nameForm = {
             advice_name: '',
@@ -1196,9 +1202,10 @@
           this.form.prescribing_number =
             this.adviceTemplateMaps[key].prescribing_number + ''
           this.form.delivery_way = this.adviceTemplateMaps[key].delivery_way
-          this.form.execution_frequency = this.adviceTemplateMaps[
-            key
-            ].execution_frequency
+          this.form.execution_frequency = this.adviceTemplateMaps[key].execution_frequency
+          this.form.drug_name_id = this.adviceTemplateMaps[key].drug_name_id
+          this.form.drug_id = this.adviceTemplateMaps[key].drug_id
+          this.form.way = this.adviceTemplateMaps[key].way
         }
       }
       ,
@@ -1457,6 +1464,7 @@
           parent_id: row.parent_id,
           drug_id:"",
           way:"",
+          drug_name_id:"",
         }
       }
       ,
@@ -1466,7 +1474,7 @@
           this.$message.error('未选择要修改的医嘱内容')
           return
         }
-
+        console.log("22222",this.groupSelectRow.groupno)
         this.$refs.editGroupForm.open(this.groupSelectRow.groupno)
       }
       ,
@@ -2389,6 +2397,7 @@
             this.src_type = this.drugSpec[i].type
             this.form.drug_id = this.drugSpec[i].id
             this.form.way = this.drugSpec[i].type
+            this.form.drug_name_id = this.drugSpec[i].drug_name_id
           }
         }
       },

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -615,6 +615,7 @@ export default {
         children: [],
         drug_id:"",
         way:"",
+        drug_name_id:"",
       },
       submitGroupForm: {
         advice_type: "",
@@ -635,6 +636,7 @@ export default {
         parent_id: 0,
         drug_id:"",
         way:"",
+        drug_name_id:"",
       },
       selectedTemp: { id: 0, name: "", org_id: 0, list: [], rows: [] },
       selectedTemplate: [],
@@ -645,6 +647,7 @@ export default {
       current_drug_name:"",
       current_drug_spec: "",
       drug_id: 0,
+      drug_name_id:"",
       src_type:"",
       private_drug_config:{},
     };
@@ -719,16 +722,20 @@ export default {
           
           console.log("88888888",submitForm)
           console.log("99999",this.medicals)
+          
           if(this.private_drug_config.drug_start == 1){
            
              for(let index=0;index<submitForm.adviceNames.length;index++){
                 for(let i=0;i<this.medicals.length;i++){
                    if(submitForm.adviceNames[index].drug_id == this.medicals[i].drug_name_id){
                       submitForm.adviceNames[index].way = 2
+                      submitForm.adviceNames[index].drug_name_id = this.medicals[i].drug_name_id
                    }
                 }
              }
           }
+          console.log("2222",submitForm)
+         
           CreateGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -854,6 +861,7 @@ export default {
        if(this.src_type == ""){
           this.nameForm.way = 0
           this.nameForm.drug_id = 0
+          this.nameForm.drug_name_id = 0
        }
 
        if(this.src_type == 2){ //自备药
@@ -888,6 +896,7 @@ export default {
                       _this.groupForm.adviceNames[index].children[j].remark =_this.nameForm.remark;
                       _this.groupForm.adviceNames[index].children[j].drug_id = _this.nameForm.drug_id;
                       _this.groupForm.adviceNames[index].children[j].way = _this.nameForm.way;
+                      _this.groupForm.adviceNames[index].children[j].drug_name_id = _this.nameForm.drug_name_id;
                       _this.$set(_this.groupForm.adviceNames[index].children,j,_this.groupForm.adviceNames[index].children[j]
                      
                       );
@@ -912,6 +921,7 @@ export default {
                   _this.groupForm.adviceNames[index].remark =_this.nameForm.remark;
                   _this.groupForm.adviceNames[index].children[j].drug_id = _this.nameForm.drug_id;
                   _this.groupForm.adviceNames[index].children[j].way = _this.nameForm.way;
+                  _this.groupForm.adviceNames[index].children[j].drug_name_id = _this.nameForm.drug_name_id;
                   _this.$set(
                     _this.groupForm.adviceNames,
                     index,
@@ -1018,7 +1028,10 @@ export default {
           id: this.groupSelectRow.id,
           children: [],
           parent_row: this.groupSelectRow.parent_row,
-          remark: this.groupSelectRow.remark
+          remark: this.groupSelectRow.remark,
+          drug_name_id:this.groupSelectRow.drug_name_id,
+          drug_id:this.groupSelectRow.drug_id,
+          way:this.groupSelectRow.way
           // row_key:this.groupSelectRow.row_key,
         };
         this.nameFormTitle = "修改医嘱内容";
@@ -1151,8 +1164,7 @@ export default {
       if (this.selectedTemp.id in this.adviceTemplateMaps) {
         var mapid = this.selectedTemp.id;
         var thisRowKey = 0;
-        for (const index in this.adviceTemplateMaps[mapid]
-          .DoctorAdviceTemplate) {
+        for (const index in this.adviceTemplateMaps[mapid].DoctorAdviceTemplate) {
           thisRowKey++;
           var item = {
             advice_name: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].advice_name,
@@ -1169,6 +1181,7 @@ export default {
             advice_id: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].id,
             drug_id:this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_id,
             way:this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].way,
+            drug_name_id:this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_name_id,
             isEdit: 0,
             id: 0,
             children: [],
@@ -1201,6 +1214,7 @@ export default {
                 execution_frequency: children[key].execution_frequency,
                 drug_id:children[key].drug_id,
                 way:children[key].way,
+                drug_name_id:children[key].drug_name_id,
                 isEdit: 0,
                 id: 0,
                 children: [],
@@ -1240,6 +1254,7 @@ export default {
               selection: adviceTemplate.DoctorAdviceTemplate[index].selection,
               drug_id: adviceTemplate.DoctorAdviceTemplate[index].drug_id,
               way:adviceTemplate.DoctorAdviceTemplate[index].way,
+              drug_name_id:adviceTemplate.DoctorAdviceTemplate[index].drug_name_id,
               isEdit: 0,
               id: 0,
               children: [],
@@ -1270,6 +1285,7 @@ export default {
                   execution_frequency: children[key].execution_frequency,
                   drug_id:children[key].drug_id,
                   way:children[key].way,
+                  drug_name_id:children[key].drug_name_id,
                   isEdit: 0,
                   id: 0,
                   children: [],
@@ -1318,6 +1334,7 @@ export default {
           execution_frequency: this.allSelectedTemplate[index].execution_frequency,
           drug_id:this.allSelectedTemplate[index].drug_id,
           way:this.allSelectedTemplate[index].way,
+          drug_name_id:this.allSelectedTemplate[index].drug_name_id,
           isEdit: 0,
           id: 0,
           children: [],
@@ -1344,6 +1361,7 @@ export default {
                 execution_frequency: children[key].execution_frequency,
                 drug_id:children[key].drug_id,
                 way:children[key].way,
+                drug_name_id:children[key].drug_name_id,
                 isEdit: 0,
                 id: 0,
                 children: [],
@@ -1579,10 +1597,12 @@ export default {
                 obj.custom_id = this.rand(10000000, 99999999)
                 obj.drug_specs = base_drug_list[i].drug_specs
                 this.all_drug.push(obj)
+
               }
               this.private_drug_config = response.data.data.private_drug_config
               this.medicals = medicalList
             }   
+            console.log("-======",this.all_drug)
         })
        
     },
@@ -1597,6 +1617,7 @@ export default {
        }
     },
     changeDrugDesc(name) {
+      console.log("-----",this.drugSpec)
         this.current_drug_spec = name
         for (let i = 0; i < this.drugSpec.length; i++) {
           if (this.drugSpec[i].drug_spec == name) {
@@ -1609,6 +1630,13 @@ export default {
             this.src_type = this.drugSpec[i].type
             this.nameForm.drug_id = this.drugSpec[i].id
             this.nameForm.way = this.drugSpec[i].type
+            this.drug_name_id = this.drugSpec[i].drug_name_id
+            if(this.drugSpec[i].drug_name_id){
+               this.nameForm.drug_name_id = this.drugSpec[i].drug_name_id
+            }else{
+              this.nameForm.drug_name_id = 0
+            }
+           
           }
         }
       }

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -596,7 +596,10 @@ export default {
         isEdit: 0,
         index: 0,
         id: 0,
-        children: []
+        children: [],
+        drug_id:"",
+        way:"",
+        drug_name_id:"",
       },
       submitGroupForm: {
         advice_type: "",
@@ -605,7 +608,10 @@ export default {
         adviceNames: [],
         advice_doctor: "",
         remark: "",
-        parent_id: 0
+        parent_id: 0,
+        drug_name_id:"",
+        drug_id:"",
+        way:""
       },
       groupForm: {
         advice_type: "",
@@ -614,7 +620,10 @@ export default {
         adviceNames: [],
         advice_doctor: "",
         remark: "",
-        parent_id: 0
+        parent_id: 0,
+        way:"",
+        drug_id:"",
+        drug_name_id:"",
       },
       adminusername: "",
       selectedTemp: { id: 0, name: "", org_id: 0, list: [], rows: [] },
@@ -626,7 +635,8 @@ export default {
       current_drug_name:"",
       current_drug_spec: "",
       drug_id: 0,
-      src_type:""
+      src_type:"",
+      drug_name_id:0,
     };
   },
   props: {
@@ -835,33 +845,18 @@ export default {
         .catch(() => {});
     },
     submitNameForm(formName) {
-       if(typeof(this.nameForm.advice_name) == "string"){
-         
-          this.nameForm.advice_name == this.nameForm.advice_name
-      }
 
-      if(typeof(this.nameForm.advice_name) == "number"){
-          var drug_name = ""
-          var name = ""
-          var way = 0
-          this.nameForm.drug_id = this.nameForm.advice_name
-          for(let i=0;i<this.medicals.length;i++){
-            if(this.nameForm.advice_name == this.medicals[i].id){
-              name = this.medicals[i].drug_name
-              way  = this.medicals[i].way
-            }
-          }
-          if(way == 1){
-            drug_name = name
-          }
-          if(way == 2){
-            var arr = name.split("(自备药)")
-            drug_name = arr[0]
-          }
-          
-          this.nameForm.advice_name = drug_name
-          this.nameForm.way = way
-      }
+        if(this.src_type == ""){
+          this.nameForm.way = 0
+          this.nameForm.drug_id = 0
+          this.nameForm.drug_name_id = 0
+       }
+
+       if(this.src_type == 2){ //自备药
+          var arr = this.nameForm.advice_name.split("(自备药)")
+          this.nameForm.advice_name = arr[0]
+       }
+   
       var _this = this;
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -886,7 +881,11 @@ export default {
               advice_doctor: "",
               remark: _this.groupForm.remark,
               parent_id: _this.groupSelectRow.parent_id,
-              groupno: _this.groupForm.groupno
+              groupno: _this.groupForm.groupno,
+              drug_name_id:_this.groupForm.drug_name_id,
+              drug_id:_this.groupForm.drug_id,
+              way:_this.groupForm.way,
+              
             };
             let mode = "2";
             if (
@@ -895,7 +894,8 @@ export default {
             ) {
               mode = "3";
             }
-
+            console.log("22222",submitForm)
+          
             EditDoctorAdvice(
               this.patientID,
               this.groupSelectRow.id,
@@ -920,6 +920,7 @@ export default {
                     _this.groupSelectRow.id == _this.adviceTableData[index].id
                   ) {
                     var advice = response.data.data.advice;
+
                     _this.adviceTableData[index].drug_spec = advice.drug_spec;
                     _this.adviceTableData[index].drug_spec_unit =
                       advice.drug_spec_unit;
@@ -938,8 +939,10 @@ export default {
                       advice.execution_frequency;
                     _this.adviceTableData[index].prescribing_number =
                       advice.prescribing_number;
-                    _this.adviceTableData[index].prescribing_number_unit =
-                      advice.prescribing_number_unit;
+                    _this.adviceTableData[index].prescribing_number_unit =advice.prescribing_number_unit;
+                    _this.adviceTableData[index].drug_name_id = advice.drug_name_id;
+                    _this.adviceTableData[index].drug_id = advice.drug_id,
+                    _this.adviceTableData[index].way = advice.way
                     break;
                   }
                 }
@@ -984,13 +987,11 @@ export default {
                             j
                           ].prescribing_number_unit =
                             _this.nameForm.prescribing_number_unit;
-                          _this.groupForm.adviceNames[index].children[
-                            j
-                          ].delivery_way = _this.nameForm.delivery_way;
-                          _this.groupForm.adviceNames[index].children[
-                            j
-                          ].execution_frequency =
-                            _this.nameForm.execution_frequency;
+                          _this.groupForm.adviceNames[index].children[j].delivery_way = _this.nameForm.delivery_way;
+                          _this.groupForm.adviceNames[index].children[j].execution_frequency =_this.nameForm.execution_frequency;
+                         _this.groupForm.adviceNames[index].children[j].drug_id =_this.nameForm.drug_id;
+                         _this.groupForm.adviceNames[index].children[j].drug_name_id =_this.nameForm.drug_name_id;
+                         _this.groupForm.adviceNames[index].children[j].way =_this.nameForm.way;
                           _this.$set(
                             _this.groupForm.adviceNames[index].children,
                             j,
@@ -1027,9 +1028,10 @@ export default {
                         _this.nameForm.prescribing_number_unit;
                       _this.groupForm.adviceNames[index].delivery_way =
                         _this.nameForm.delivery_way;
-                      _this.groupForm.adviceNames[index].execution_frequency =
-                        _this.nameForm.execution_frequency;
-
+                      _this.groupForm.adviceNames[index].execution_frequency =_this.nameForm.execution_frequency;
+                      _this.groupForm.adviceNames[index].drug_name_id =_this.nameForm.drug_name_id;
+                       _this.groupForm.adviceNames[index].drug_id =_this.nameForm.drug_id;
+                        _this.groupForm.adviceNames[index].way =_this.nameForm.way;
                       _this.$set(
                         _this.groupForm.adviceNames,
                         index,
@@ -1057,6 +1059,9 @@ export default {
                 prescribing_number_unit: _this.nameForm.prescribing_number_unit,
                 delivery_way: _this.nameForm.delivery_way,
                 execution_frequency: _this.nameForm.execution_frequency,
+                drug_name_id:_this.nameForm.drug_name_id,
+                drug_id:_this.nameForm.drug_id,
+                way:_this.nameForm.way,
                 isEdit: 0,
                 id: 0,
                 advice_doctor: "",
@@ -1153,6 +1158,9 @@ export default {
                       _this.nameForm.prescribing_number_unit,
                     delivery_way: _this.nameForm.delivery_way,
                     execution_frequency: _this.nameForm.execution_frequency,
+                    drug_name_id:_this.nameForm.drug_name_id,
+                    drug_id:_this.nameForm.drug_id,
+                    way:_this.nameForm.way,
                     isEdit: 0,
                     id: 0,
                     children: [],
@@ -1245,6 +1253,9 @@ export default {
                         groups[index].prescribing_number_unit,
                       delivery_way: groups[index].delivery_way,
                       execution_frequency: groups[index].execution_frequency,
+                      drug_name_id:groups[index].drug_name_id,
+                      drug_id:groups[index].drug_id,
+                      way:groups[index].way,
                       isEdit: 0,
                       index: 0,
                       id: groups[index].id,
@@ -1268,8 +1279,10 @@ export default {
                           prescribing_number_unit:
                             childMap[item.id][key].prescribing_number_unit,
                           delivery_way: childMap[item.id][key].delivery_way,
-                          execution_frequency:
-                            childMap[item.id][key].execution_frequency,
+                          execution_frequency:childMap[item.id][key].execution_frequency,
+                           drug_name_id:childMap[item.id][key].drug_name_id,
+                           drug_id:childMap[item.id][key].drug_id,
+                           way:childMap[item.id][key].way,
                           isEdit: 0,
                           index: 0,
                           id: childMap[item.id][key].id,
@@ -1322,7 +1335,10 @@ export default {
         index: 0,
         children: [],
         parent_row: this.groupSelectRow.row_key,
-        id: 0
+        id: 0,
+        drug_name_id:"",
+        way:"",
+        drug_id:"",
       };
       this.isChild = true;
       this.nameFormVisible = true;
@@ -1358,14 +1374,15 @@ export default {
               : "",
           prescribing_number_unit: this.groupSelectRow.prescribing_number_unit,
           delivery_way: this.isChild ? "" : this.groupSelectRow.delivery_way,
-          execution_frequency: this.isChild
-            ? ""
-            : this.groupSelectRow.execution_frequency,
+          execution_frequency: this.isChild? "": this.groupSelectRow.execution_frequency,
+          drug_name_id:this.isChild?"":this.groupSelectRow.drug_name_id,
+          drug_id:this.isChild?"":this.groupSelectRow.drug_id,
+          way:this.isChild?"":this.groupSelectRow.way,
           isEdit: 1,
           index: this.groupSelectRow.index,
           id: this.groupSelectRow.id,
           children: [],
-          parent_row: this.groupSelectRow.parent_row
+          parent_row: this.groupSelectRow.parent_row,
           // row_key:this.groupSelectRow.row_key,
         };
         this.nameFormTitle = "修改医嘱内容";
@@ -1382,6 +1399,9 @@ export default {
           prescribing_number_unit: "",
           delivery_way: "",
           execution_frequency: "",
+          drug_name_id:"",
+          drug_id:"",
+          way:"",
           isEdit: 0,
           index: 0,
           id: 0,
@@ -1549,8 +1569,10 @@ export default {
             delivery_way: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[
               index
             ].delivery_way,
-            execution_frequency: this.adviceTemplateMaps[mapid]
-              .DoctorAdviceTemplate[index].execution_frequency,
+            execution_frequency: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].execution_frequency,
+            drug_name_id: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_name_id,
+             way: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].way,
+             drug_id: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_id,
             advice_id: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[
               index
             ].id,
@@ -1587,6 +1609,9 @@ export default {
                 prescribing_number_unit: children[key].prescribing_number_unit,
                 delivery_way: children[key].delivery_way,
                 execution_frequency: children[key].execution_frequency,
+                drug_name_id:children[key].drug_name_id,
+                drug_id:children[key].drug_id,
+                way:children[key].way,
                 isEdit: 0,
                 id: 0,
                 children: [],
@@ -1632,8 +1657,10 @@ export default {
                   .prescribing_number_unit,
               delivery_way:
                 adviceTemplate.DoctorAdviceTemplate[index].delivery_way,
-              execution_frequency:
-                adviceTemplate.DoctorAdviceTemplate[index].execution_frequency,
+              execution_frequency:adviceTemplate.DoctorAdviceTemplate[index].execution_frequency,
+              drug_name_id:adviceTemplate.DoctorAdviceTemplate[index].drug_name_id,
+              drug_id:adviceTemplate.DoctorAdviceTemplate[index].drug_id,
+              way:adviceTemplate.DoctorAdviceTemplate[index].way,
               advice_id: adviceTemplate.DoctorAdviceTemplate[index].id,
               selection: adviceTemplate.DoctorAdviceTemplate[index].selection,
               isEdit: 0,
@@ -1664,6 +1691,9 @@ export default {
                     children[key].prescribing_number_unit,
                   delivery_way: children[key].delivery_way,
                   execution_frequency: children[key].execution_frequency,
+                   drug_name_id: children[key].drug_name_id,
+                   drug_id:children[key].drug_id,
+                   way:children[key].way,
                   isEdit: 0,
                   id: 0,
                   children: [],
@@ -1720,8 +1750,10 @@ export default {
           prescribing_number_unit: this.allSelectedTemplate[index]
             .prescribing_number_unit,
           delivery_way: this.allSelectedTemplate[index].delivery_way,
-          execution_frequency: this.allSelectedTemplate[index]
-            .execution_frequency,
+          execution_frequency: this.allSelectedTemplate[index].execution_frequency,
+           drug_name_id: this.allSelectedTemplate[index].drug_name_id,
+           way:this.allSelectedTemplate[index].way,
+           drug_id:this.allSelectedTemplate[index].drug_id,
           isEdit: 0,
           id: 0,
           children: [],
@@ -1745,6 +1777,9 @@ export default {
                 prescribing_number_unit: children[key].prescribing_number_unit,
                 delivery_way: children[key].delivery_way,
                 execution_frequency: children[key].execution_frequency,
+                drug_name_id: children[key].drug_name_id,
+                drug_id:children[key].drug_id,
+                way:children[key].way,
                 isEdit: 0,
                 id: 0,
                 children: [],
@@ -1832,6 +1867,9 @@ export default {
               prescribing_number_unit: groups[index].prescribing_number_unit,
               delivery_way: groups[index].delivery_way,
               execution_frequency: groups[index].execution_frequency,
+              drug_name_id: groups[index].drug_name_id,
+              drug_id:groups[index].drug_id,
+              way:groups[index].way,
               isEdit: 0,
               index: 0,
               id: groups[index].id,
@@ -1854,8 +1892,10 @@ export default {
                   prescribing_number_unit:
                     childMap[item.id][key].prescribing_number_unit,
                   delivery_way: childMap[item.id][key].delivery_way,
-                  execution_frequency:
-                    childMap[item.id][key].execution_frequency,
+                  execution_frequency:childMap[item.id][key].execution_frequency,
+                   way:childMap[item.id][key].way,
+                   drug_name_id:childMap[item.id][key].drug_name_id,
+                   drug_id:childMap[item.id][key].drug_id,
                   isEdit: 0,
                   index: 0,
                   id: childMap[item.id][key].id,
@@ -1923,9 +1963,10 @@ export default {
                 delivery_way:
                   _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
                     .delivery_way,
-                execution_frequency:
-                  _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                    .execution_frequency,
+                execution_frequency:_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].execution_frequency,
+                 drug_name_id: _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_name_id,
+                  drug_id: _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_id,
+                  way:_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].way,
                 isEdit: 0,
                 id: 0,
                 children: [],
@@ -1956,6 +1997,9 @@ export default {
                       children[key].prescribing_number_unit,
                     delivery_way: children[key].delivery_way,
                     execution_frequency: children[key].execution_frequency,
+                    drug_name_id: children[key].drug_name_id,
+                    drug_id: children[key].drug_id,
+                    way:children[key].way,
                     isEdit: 0,
                     id: 0,
                     children: [],
@@ -2049,6 +2093,9 @@ export default {
                       groups[index].prescribing_number_unit,
                     delivery_way: groups[index].delivery_way,
                     execution_frequency: groups[index].execution_frequency,
+                    drug_name_id:groups[index].drug_name_id,
+                    drug_id:groups[index].drug_id,
+                    way:groups[index].way,
                     isEdit: 0,
                     index: 0,
                     id: groups[index].id,
@@ -2072,8 +2119,10 @@ export default {
                         prescribing_number_unit:
                           childMap[item.id][key].prescribing_number_unit,
                         delivery_way: childMap[item.id][key].delivery_way,
-                        execution_frequency:
-                          childMap[item.id][key].execution_frequency,
+                        execution_frequency:childMap[item.id][key].execution_frequency,
+                         drug_name_id:childMap[item.id][key].drug_name_id,
+                         drug_id:childMap[item.id][key].drug_id,
+                         way:childMap[item.id][key].way,
                         isEdit: 0,
                         index: 0,
                         id: childMap[item.id][key].id,
@@ -2107,6 +2156,7 @@ export default {
       this.templateFormVisible = true;
     },
     selectGroupAdvice(row) {
+      console.log('row',row)
       this.groupSelectRow = row;
     },
     groupClassName({ row, rowIndex }) {
@@ -2176,6 +2226,9 @@ export default {
           prescribing_number_unit: groups[index].prescribing_number_unit,
           delivery_way: groups[index].delivery_way,
           execution_frequency: groups[index].execution_frequency,
+          drug_name_id:groups[index].drug_name_id,
+          drug_id:groups[index].drug_id,
+          way:groups[index].way,
           isEdit: 0,
           index: 0,
           id: groups[index].id,
@@ -2200,6 +2253,9 @@ export default {
                 childMap[item.id][key].prescribing_number_unit,
               delivery_way: childMap[item.id][key].delivery_way,
               execution_frequency: childMap[item.id][key].execution_frequency,
+               drug_name_id: childMap[item.id][key].drug_name_id,
+               drug_id: childMap[item.id][key].drug_id,
+               way: childMap[item.id][key].way,
               isEdit: 0,
               index: 0,
               id: childMap[item.id][key].id,
@@ -2340,6 +2396,8 @@ export default {
             this.src_type = this.drugSpec[i].type
             this.nameForm.drug_id = this.drugSpec[i].id
             this.nameForm.way = this.drugSpec[i].type
+            this.drug_name_id = this.drugSpec[i].drug_name_id
+            this.nameForm.drug_name_id = this.drugSpec[i].drug_name_id
           }
         }
     },

src/xt_pages/stock/selfPreparedMedicine/components/addMedicine.vue

@@ -111,6 +111,8 @@ export default {
              patient_id:this.patient_id,
              medicineData:this.medicineData
           }
+         console.log("params----",params)
+       
          SaveSelfMedicines(params).then(response=>{
              if(response.data.state == 1){
                 var msg = response.data.data.msg

src/xt_pages/stock/selfPreparedMedicine/index.vue

@@ -34,8 +34,23 @@
                     :value="item.value">
                     </el-option>
                 </el-select> -->
-                <el-input style="width: 180px;margin:0 10px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
-                <el-button class="filter-item" type="primary" icon="el-icon-search" @click="searchAction">搜索</el-button>
+                <!-- <el-input style="width: 180px;margin:0 10px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/> -->
+                <!-- <el-button class="filter-item" type="primary" icon="el-icon-search" @click="searchAction">搜索</el-button> -->
+                 <el-autocomplete
+                  style="margin:16px 5px"
+                  popper-class="my-autocomplete"
+                  v-model.trim="search_input"
+                  :fetch-suggestions="querySearchAsync"
+                  :trigger-on-focus="false"
+                  placeholder="病人名字或者透析号"
+                  @select="handleSelect"
+                >
+                  <i class="el-icon-search el-input__icon" slot="suffix"> </i>
+                  <template slot-scope="{ item }">
+                    <div class="name">{{ item.name }}</div>
+                  </template>
+                </el-autocomplete>
+
             </div>
             <el-container>
                 <div style="width:160px;">
@@ -75,10 +90,10 @@
                             </template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="已使用" width="90">
-                            <template slot-scope="scope">{{getCount(scope.row.patient_id,scope.row.drug_name,scope.row.drug_spec)}}</template>
+                            <template slot-scope="scope">{{getCountTwo(scope.row.patient_id,scope.row.drug_name,scope.row.drug_spec)}}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="剩余" width="90">
-                            <template slot-scope="scope">{{getTotal(scope.row.patient_id,scope.row.id)- getCount(scope.row.patient_id,scope.row.drug_name,scope.row.drug_spec)}}</template>
+                            <template slot-scope="scope">{{getTotal(scope.row.patient_id,scope.row.id)- getCountTwo(scope.row.patient_id,scope.row.drug_name,scope.row.drug_spec)}}</template>
                         </el-table-column>
                         <!-- <el-table-column align="center" prop="name" label="停用" width="90">
                             <template slot-scope="scope">
@@ -170,7 +185,8 @@ export default {
             search_input:"",
             patient_id:0,
             stockList:[],
-            outStocklist:[]
+            outStocklist:[],
+            outList:[]
         }
     },
     methods:{
@@ -241,6 +257,7 @@ export default {
                start_time:this.start_time,
                keyword:this.search_input,
             }
+         
           getStockList(params).then(response=>{
              if(response.data.state == 1){
                 var medicalList = response.data.data.medicalList
@@ -252,7 +269,9 @@ export default {
                 this.stockList = stocklist
                 var outstocklist = response.data.data.outStocklist
                 this.outStocklist = outstocklist
-                console.log("outStockList",outstocklist)
+                var outList =  response.data.data.outList
+                console.log("outList",outList)
+                this.outList = outList
               
               }
           })  
@@ -295,6 +314,16 @@ export default {
            return total
         },
 
+        getCountTwo(patientid,drugname,drugspec){
+           var total = 0
+           for(let i=0;i<this.outList.length;i++){
+             if(patientid == this.outList[i].patient_id && drugname == this.outList[i].drug_name && drugspec == this.outList[i].drug_spec){
+                  total += this.outList[i].outstore_number
+              }
+           }
+           return total
+        },
+
         getDrugSet(){
          getDrugSet().then(response=>{
             if(response.data.state == 1){
@@ -321,6 +350,33 @@ export default {
              }
           }
           return remarks
+        },
+
+        querySearchAsync(keyword, cb) {
+          let key = ''
+          if (keyword != undefined) {
+            key = keyword
+          }
+          let searchArray = []
+          getCurrentPatient(key).then(response => {
+            if (response.data.state == 1) {
+              searchArray = response.data.data.patient
+              cb(searchArray)
+            }
+          })
+          return searchArray
+        },
+        handleSelect(val){
+          console.log("val",val.id)
+          console.log("2222",this.tablePatient)
+          this.search_input = val.name
+          for(let i=0;i<this.tablePatient.length;i++){
+             if(this.tablePatient[i].id == val.id){
+               console.log("建立")
+               this.$refs.monthlyPlanTable.setCurrentRow(this.tablePatient[i])
+             }
+          }
+          this.getlist()
         }
     },
     created(){
@@ -331,6 +387,7 @@ export default {
     watch: {
      tablePatient: function() {
       this.$nextTick(function() {
+         console.log("222222",this.tablePatient[0])
         this.$refs.monthlyPlanTable.setCurrentRow(this.tablePatient[0])
       })
     }

src/xt_pages/stock/selfPreparedMedicine/info.vue

@@ -497,14 +497,6 @@ export default {
               }
            }
            
-          console.log("------",this.form.unit)
-          //  var unit = ""
-          //  for(let i=0;i<this.untis.length;i++){
-          //    if(this.form.unit == this.untis[i].id){
-          //       unit = this.untis[i].name
-          //    }
-          //  }
-          
            const params = {
              drug_spec:drug_spec,
              drug_name_id:this.form.drug_name_id,
@@ -524,7 +516,10 @@ export default {
               this.ruleDialogVisible = false
               this.form.drug_name_id = ""
               this.form.unit = ""
-              this.form.price = ""            
+              this.form.price = ""   
+              this.form.drug_stock_limit = ""         
+            }else{
+              this.$message.error("该药品规格名称已存在!")
             }
          })  
        },
@@ -565,7 +560,10 @@ export default {
               this.$message.success("保存成功")
               this.form.drug_name_id = ""
               this.form.unit = ""
-              this.form.price = ""   
+              this.form.price = ""  
+              this.form.drug_stock_limit = ""     
+            }else{
+              this.$message.error("该药品规格名称已存在!")
             }
          })    
        },

src/xt_pages/stock/selfPreparedMedicine/query.vue

@@ -257,6 +257,8 @@ export default {
                  stocklist[i].Count = 0
               }
               var outStockList =  response.data.data.outStockList
+
+              
               for(let i=0;i<stocklist.length;i++){
                 for(let j=0;j<outStockList.length;j++){
                    if(stocklist[i].patient_id == outStockList[j].patient_id &&stocklist[i].drug_name == outStockList[j].drug_name && stocklist[i].drug_spec == outStockList[j].drug_spec){