Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -202,6 +202,8 @@
       </el-form>
     </el-dialog>
 
+
+   <!-- 编辑选则医嘱模版 -->
     <el-dialog
       title="选择医嘱模板"
       :visible.sync="templateFormVisible"
@@ -331,6 +333,8 @@
         </el-button>
       </div>
     </el-dialog>
+
+
     <el-dialog
       title="选择医嘱模板"
       :visible.sync="oldTemplateFormVisible"
@@ -407,7 +411,6 @@
                   v-model="nameForm.advice_desc"
                   :fetch-suggestions="querySearch1"
                   placeholder="请输入内容"
-                  @select="handleSelect1"
                   @input="changeDrugDesc"
                 ></el-autocomplete>
               </el-col>
@@ -626,9 +629,10 @@ export default {
         index: 0,
         id: 0,
         children: [],
-        way:"",
-        drug_id:"",
-        src_type:""
+        way:0,
+        drug_id:0,
+        src_type:"",
+        drug_name_id:0
       },
 
       drugOptions: [],
@@ -841,7 +845,7 @@ export default {
         .catch(() => {});
     },
     submitNameForm(formName) {
-     
+       console.log("888888",this.nameForm)
       if(this.src_type == ""){
           this.nameForm.way = 0
           this.nameForm.drug_id = 0
@@ -851,40 +855,14 @@ export default {
           var arr = this.nameForm.advice_name.split("(自备药)")
           this.nameForm.advice_name = arr[0]
        }
-
-      //  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
-      // }
+      console.log("新增医嘱内容")
       var _this = this;
       this.$refs[formName].validate(valid => {
         if (valid) {
           if (_this.nameForm.isEdit) {
             var submitForm = null;
             if (!this.isChild) {
+              console.log("进来了吗")
               submitForm = {
                 advice_type: _this.groupForm.advice_type,
                 advice_date: _this.groupForm.advice_date,
@@ -899,6 +877,9 @@ export default {
                 prescribing_number_unit: _this.nameForm.prescribing_number_unit,
                 delivery_way: _this.nameForm.delivery_way,
                 execution_frequency: _this.nameForm.execution_frequency,
+                way:_this.nameForm.way,
+                drug_name_id:_this.nameForm.drug_name_id,
+                drug_id:_this.nameForm.drug_id,
                 isEdit: 0,
                 id: 0,
                 advice_doctor: "",
@@ -928,6 +909,9 @@ export default {
                 prescribing_number_unit: _this.nameForm.prescribing_number_unit,
                 delivery_way: _this.nameForm.delivery_way,
                 execution_frequency: _this.nameForm.execution_frequency,
+                way:_this.nameForm.way,
+                drug_name_id:_this.nameForm.drug_name_id,
+                drug_id:_this.nameForm.drug_id,
                 isEdit: 0,
                 id: 0,
                 advice_doctor: "",
@@ -936,13 +920,14 @@ export default {
                 groupno: _this.groupForm.groupno,
                 frequency_type: 0,
                 day_count: "0",
-                week_days: ""
+                week_days: "",
+              
               };
             }
             let mode = "";
 
             if (_this.groupForm.advice_type == 1) {
-              // if(_this.nameForm.)
+            
               mode = "1-3";
               if (
                 _this.groupForm.doctor != _this.$store.getters.xt_user.user.id
@@ -957,7 +942,7 @@ export default {
                 mode = "3-1";
               }
             }
-
+            console.log("编辑",submitForm)
             EditNewDoctorAdvice(
               this.patientID,
               this.groupSelectRow.id,
@@ -983,31 +968,22 @@ export default {
                   ) {
                     var advice = response.data.data.advice;
                     _this.adviceTableData[index].drug_spec = advice.drug_spec;
-                    _this.adviceTableData[index].drug_spec_unit =
-                      advice.drug_spec_unit;
+                    _this.adviceTableData[index].drug_spec_unit = advice.drug_spec_unit;
                     _this.adviceTableData[index].start_time = advice.start_time;
-                    _this.adviceTableData[index].advice_name =
-                      advice.advice_name;
-                    _this.adviceTableData[index].advice_desc =
-                      advice.advice_desc;
-                    _this.adviceTableData[index].single_dose =
-                      advice.single_dose;
-                    _this.adviceTableData[index].single_dose_unit =
-                      advice.single_dose_unit;
-                    _this.adviceTableData[index].delivery_way =
-                      advice.delivery_way;
-                    _this.adviceTableData[index].execution_frequency =
-                      advice.execution_frequency;
-                    _this.adviceTableData[index].prescribing_number =
-                      advice.prescribing_number;
-                    _this.adviceTableData[index].prescribing_number_unit =
-                      advice.prescribing_number_unit;
-
-                    _this.adviceTableData[index].frequency_type =
-                      advice.frequency_type;
+                    _this.adviceTableData[index].advice_name =advice.advice_name;
+                    _this.adviceTableData[index].advice_desc = advice.advice_desc;
+                    _this.adviceTableData[index].single_dose = advice.single_dose;
+                    _this.adviceTableData[index].single_dose_unit = advice.single_dose_unit;
+                    _this.adviceTableData[index].delivery_way = advice.delivery_way;
+                    _this.adviceTableData[index].execution_frequency = advice.execution_frequency;
+                    _this.adviceTableData[index].prescribing_number = advice.prescribing_number;
+                    _this.adviceTableData[index].prescribing_number_unit = advice.prescribing_number_unit;
+                    _this.adviceTableData[index].frequency_type = advice.frequency_type;
                     _this.adviceTableData[index].day_count = advice.day_count;
                     _this.adviceTableData[index].week_day = advice.week_day;
-
+                    _this.adviceTableData[index].way = advice.way,
+                    _this.adviceTableData[index].drug_id = advice.drug_id,
+                    _this.adviceTableData[index].drug_name_id = advice.drug_name_id
                     break;
                   }
                 }
@@ -1023,42 +999,21 @@ export default {
                       var children =
                         _this.groupForm.adviceNames[index].children;
                       for (let j = 0; j < ale; j++) {
-                        if (
-                          _this.groupSelectRow.row_key == children[j].row_key
-                        ) {
-                          _this.groupForm.adviceNames[index].children[
-                            j
-                          ].advice_name = _this.nameForm.advice_name;
-                          _this.groupForm.adviceNames[index].children[
-                            j
-                          ].advice_desc = _this.nameForm.advice_desc;
-                          _this.groupForm.adviceNames[index].children[
-                            j
-                          ].single_dose = "" + _this.nameForm.single_dose;
-                          _this.groupForm.adviceNames[index].children[
-                            j
-                          ].single_dose_unit = _this.nameForm.single_dose_unit;
-                          _this.groupForm.adviceNames[index].children[
-                            j
-                          ].drug_spec = "" + _this.nameForm.drug_spec;
-                          _this.groupForm.adviceNames[index].children[
-                            j
-                          ].drug_spec_unit = _this.nameForm.drug_spec_unit;
-                          _this.groupForm.adviceNames[index].children[
-                            j
-                          ].prescribing_number =
-                            "" + _this.nameForm.prescribing_number;
-                          _this.groupForm.adviceNames[index].children[
-                            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;
+                        if (_this.groupSelectRow.row_key == children[j].row_key) {
+                          _this.groupForm.adviceNames[index].children[j].advice_name = _this.nameForm.advice_name;
+                          _this.groupForm.adviceNames[index].children[j].advice_desc = _this.nameForm.advice_desc;
+                          _this.groupForm.adviceNames[index].children[j].single_dose = "" + _this.nameForm.single_dose;
+                          _this.groupForm.adviceNames[index].children[j].single_dose_unit = _this.nameForm.single_dose_unit;
+                          _this.groupForm.adviceNames[index].children[j].drug_spec = "" + _this.nameForm.drug_spec;
+                          _this.groupForm.adviceNames[index].children[j].drug_spec_unit = _this.nameForm.drug_spec_unit;
+                          _this.groupForm.adviceNames[index].children[j].prescribing_number ="" + _this.nameForm.prescribing_number;
+                          _this.groupForm.adviceNames[index].children[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].way = _this.nameForm.way
+                          _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.$set(
                             _this.groupForm.adviceNames[index].children,
                             j,
@@ -1071,40 +1026,23 @@ export default {
                   }
                 } else {
                   for (let index = 0; index < ale; index++) {
-                    if (
-                      _this.groupSelectRow.row_key ==
-                      _this.groupForm.adviceNames[index].row_key
-                    ) {
-                      _this.groupForm.adviceNames[index].advice_name =
-                        _this.nameForm.advice_name;
-                      _this.groupForm.adviceNames[index].advice_desc =
-                        "" + _this.nameForm.advice_desc;
-                      _this.groupForm.adviceNames[index].single_dose =
-                        "" + _this.nameForm.single_dose;
-                      _this.groupForm.adviceNames[index].single_dose_unit =
-                        _this.nameForm.single_dose_unit;
-                      _this.groupForm.adviceNames[index].drug_spec =
-                        "" + _this.nameForm.drug_spec;
-                      _this.groupForm.adviceNames[index].drug_spec_unit =
-                        _this.nameForm.drug_spec_unit;
-                      _this.groupForm.adviceNames[index].prescribing_number =
-                        "" + _this.nameForm.prescribing_number;
-                      _this.groupForm.adviceNames[
-                        index
-                      ].prescribing_number_unit =
-                        _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].frequency_type =
-                        _this.nameForm.frequency_type;
-                      _this.groupForm.adviceNames[index].day_count =
-                        _this.nameForm.day_count;
-                      _this.groupForm.adviceNames[
-                        index
-                      ].week_day = _this.weeks.join(",");
+                    if ( _this.groupSelectRow.row_key ==_this.groupForm.adviceNames[index].row_key) {
+                      _this.groupForm.adviceNames[index].advice_name =_this.nameForm.advice_name;
+                      _this.groupForm.adviceNames[index].advice_desc = "" + _this.nameForm.advice_desc;
+                      _this.groupForm.adviceNames[index].single_dose ="" + _this.nameForm.single_dose;
+                      _this.groupForm.adviceNames[index].single_dose_unit =_this.nameForm.single_dose_unit;
+                      _this.groupForm.adviceNames[index].drug_spec ="" + _this.nameForm.drug_spec;
+                      _this.groupForm.adviceNames[index].drug_spec_unit =_this.nameForm.drug_spec_unit;
+                      _this.groupForm.adviceNames[index].prescribing_number ="" + _this.nameForm.prescribing_number;
+                      _this.groupForm.adviceNames[index].prescribing_number_unit =_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].frequency_type =_this.nameForm.frequency_type;
+                      _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.groupForm.adviceNames[index].day_count = _this.nameForm.day_count;
+                      _this.groupForm.adviceNames[index].week_day = _this.weeks.join(",");
                       console.log(_this.weeks);
                       _this.$set(
                         _this.groupForm.adviceNames,
@@ -1134,12 +1072,16 @@ export default {
                 prescribing_number_unit: _this.nameForm.prescribing_number_unit,
                 delivery_way: _this.nameForm.delivery_way,
                 execution_frequency: _this.nameForm.execution_frequency,
+                way:_this.nameForm.way,
+                drug_id:_this.nameForm.drug_id,
+                drug_name_id:_this.nameForm.drug_name_id,
                 isEdit: 0,
                 id: 0,
                 advice_doctor: "",
                 remark: _this.groupForm.remark,
                 parent_id: _this.groupSelectRow.id,
-                groupno: _this.groupForm.groupno
+                groupno: _this.groupForm.groupno,
+               
               };
 
               let mode = "";
@@ -1148,7 +1090,7 @@ export default {
               } else {
                 mode = "1-1";
               }
-
+              console.log("submitFort",submitForm)
               CreateNewDoctorAdvice(this.patientID, submitForm, mode).then(
                 response => {
                   if (response.data.state == 0) {
@@ -1242,17 +1184,16 @@ export default {
                     drug_spec: "" + _this.nameForm.drug_spec,
                     drug_spec_unit: _this.nameForm.drug_spec_unit,
                     prescribing_number: "" + _this.nameForm.prescribing_number,
-                    prescribing_number_unit:
-                      _this.nameForm.prescribing_number_unit,
+                    prescribing_number_unit: _this.nameForm.prescribing_number_unit,
                     delivery_way: _this.nameForm.delivery_way,
                     execution_frequency: _this.nameForm.execution_frequency,
-                    template_id:
-                      "D" + new Date().getTime() + this.getRandValue(),
-
+                    template_id:"D" + new Date().getTime() + this.getRandValue(),
                     frequency_type: _this.nameForm.frequency_type,
                     day_count: _this.nameForm.day_count.toString(),
                     week_days: _this.nameForm.week_days,
-
+                    drug_id:_this.nameForm.drug_id,
+                    way:_this.nameForm.way,
+                    drug_name_id:_this.nameForm.drug_name_id,
                     isEdit: 0,
                     id: 0,
                     children: [],
@@ -1271,13 +1212,9 @@ export default {
               } else {
                 mode = "1-1";
               }
+              console.log("触发了吗",_this.patientID,_this.submitGroupForm)
+              CreateNewGroupAdvice(_this.patientID, _this.groupForm.groupno,_this.submitGroupForm, mode).then(response => {
 
-              CreateNewGroupAdvice(
-                _this.patientID,
-                _this.groupForm.groupno,
-                _this.submitGroupForm,
-                mode
-              ).then(response => {
                 if (response.data.state == 0) {
                   _this.$message.error(response.data.msg);
                   return false;
@@ -1362,7 +1299,9 @@ export default {
                         frequency_type: groups[index].frequency_type,
                         day_count: groups[index].day_count,
                         week_day: groups[index].week_day,
-
+                        drug_name_id:0,
+                        way:0,
+                        drug_id:0,
                         isEdit: 0,
                         index: 0,
                         id: groups[index].id,
@@ -1492,7 +1431,10 @@ export default {
 
           day_count: this.groupSelectRow.day_count,
           week_days: this.groupSelectRow.week_day,
-          frequency_type: this.groupSelectRow.frequency_type
+          frequency_type: this.groupSelectRow.frequency_type,
+          drug_id:0,
+          drug_name_id:0,
+          way:0,
         };
 
         if (!this.isChild) {
@@ -1513,6 +1455,9 @@ export default {
           delivery_way: "",
           execution_frequency: "",
           template_id: "",
+          way:0,
+          drug_id:0,
+          drug_name_id:0,
           isEdit: 0,
           index: 0,
           id: 0,
@@ -1718,7 +1663,10 @@ export default {
         }
       }
     },
+
+
     newAddTempForm() {
+      console.log("9999888")
       this.allSelectedTemplate = [];
       var thisRowKey = 0;
       for (const indexs in this.adviceTemplateMaps) {
@@ -1727,36 +1675,25 @@ export default {
           if (adviceTemplate.DoctorAdviceTemplate[index].selection) {
             thisRowKey++;
             var item = {
-              advice_name:
-                adviceTemplate.DoctorAdviceTemplate[index].advice_name,
-              advice_desc:
-                adviceTemplate.DoctorAdviceTemplate[index].advice_desc,
-              single_dose:
-                "" + adviceTemplate.DoctorAdviceTemplate[index].single_dose,
-              single_dose_unit:
-                adviceTemplate.DoctorAdviceTemplate[index].single_dose_unit,
-              drug_spec:
-                "" + adviceTemplate.DoctorAdviceTemplate[index].drug_spec,
-              drug_spec_unit:
-                adviceTemplate.DoctorAdviceTemplate[index].drug_spec_unit,
-              prescribing_number:
-                "" +
-                adviceTemplate.DoctorAdviceTemplate[index].prescribing_number,
-              prescribing_number_unit:
-                adviceTemplate.DoctorAdviceTemplate[index]
-                  .prescribing_number_unit,
-              delivery_way:
-                adviceTemplate.DoctorAdviceTemplate[index].delivery_way,
-              execution_frequency:
-                adviceTemplate.DoctorAdviceTemplate[index].execution_frequency,
+              advice_name:adviceTemplate.DoctorAdviceTemplate[index].advice_name,
+              advice_desc:adviceTemplate.DoctorAdviceTemplate[index].advice_desc,
+              single_dose:"" + adviceTemplate.DoctorAdviceTemplate[index].single_dose,
+              single_dose_unit:adviceTemplate.DoctorAdviceTemplate[index].single_dose_unit,
+              drug_spec:"" + adviceTemplate.DoctorAdviceTemplate[index].drug_spec,
+              drug_spec_unit:adviceTemplate.DoctorAdviceTemplate[index].drug_spec_unit,
+              prescribing_number:"" +adviceTemplate.DoctorAdviceTemplate[index].prescribing_number,
+              prescribing_number_unit:adviceTemplate.DoctorAdviceTemplate[index].prescribing_number_unit,
+              delivery_way:adviceTemplate.DoctorAdviceTemplate[index].delivery_way,
+              execution_frequency:adviceTemplate.DoctorAdviceTemplate[index].execution_frequency,
               advice_id: adviceTemplate.DoctorAdviceTemplate[index].id,
               selection: adviceTemplate.DoctorAdviceTemplate[index].selection,
               day_count: adviceTemplate.DoctorAdviceTemplate[index].day_count,
-              frequency_type:
-                adviceTemplate.DoctorAdviceTemplate[index].frequency_type,
+              frequency_type:adviceTemplate.DoctorAdviceTemplate[index].frequency_type,
               week_days: adviceTemplate.DoctorAdviceTemplate[index].week_days,
               template_id: "T" + adviceTemplate.DoctorAdviceTemplate[index].id,
-
+              way:adviceTemplate.DoctorAdviceTemplate[index].way,
+              drug_id:adviceTemplate.DoctorAdviceTemplate[index].drug_id,
+              drug_name_id:adviceTemplate.DoctorAdviceTemplate[index].drug_name_id,
               isEdit: 0,
               id: 0,
               children: [],
@@ -1785,6 +1722,9 @@ export default {
                     children[key].prescribing_number_unit,
                   delivery_way: children[key].delivery_way,
                   execution_frequency: children[key].execution_frequency,
+                  way:children[key].way,
+                  drug_id:children[key].drug_id,
+                  drug_name_id:children[key].drug_name_id,
                   isEdit: 0,
                   id: 0,
                   children: [],
@@ -1836,19 +1776,17 @@ export default {
           single_dose_unit: this.allSelectedTemplate[index].single_dose_unit,
           drug_spec: "" + this.allSelectedTemplate[index].drug_spec,
           drug_spec_unit: this.allSelectedTemplate[index].drug_spec_unit,
-          prescribing_number:
-            "" + this.allSelectedTemplate[index].prescribing_number,
-          prescribing_number_unit: this.allSelectedTemplate[index]
-            .prescribing_number_unit,
+          prescribing_number:"" + this.allSelectedTemplate[index].prescribing_number,
+          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,
           day_count: this.allSelectedTemplate[index].day_count.toString(),
           frequency_type: this.allSelectedTemplate[index].frequency_type,
           week_days: this.allSelectedTemplate[index].week_days,
           template_id: this.allSelectedTemplate[index].template_id,
-
+          way:this.allSelectedTemplate[index].way,
+          drug_id:this.allSelectedTemplate[index].drug_id,
+          drug_name_id:this.allSelectedTemplate[index].drug_name_id,
           isEdit: 0,
           id: 0,
           children: [],
@@ -1872,6 +1810,9 @@ export default {
                 prescribing_number_unit: children[key].prescribing_number_unit,
                 delivery_way: children[key].delivery_way,
                 execution_frequency: children[key].execution_frequency,
+                way:children[key].way,
+                drug_id:children[key].drug_id,
+                drug_name_id:children[key].drug_name_id,
                 isEdit: 0,
                 id: 0,
                 children: [],
@@ -1972,7 +1913,9 @@ export default {
               frequency_type: groups[index].frequency_type,
               week_day: groups[index].week_day,
               template_id: groups[index].template_id,
-
+              way:groups[index].way,
+              drug_id:groups[index].drug_id,
+              drug_name_id:groups[index].drug_name_id,
               isEdit: 0,
               index: 0,
               id: groups[index].id,
@@ -2000,6 +1943,9 @@ export default {
                   isEdit: 0,
                   index: 0,
                   id: childMap[item.id][key].id,
+                  drug_id:childMap[item.id][key].drug_id,
+                  way:childMap[item.id][key].way,
+                  drug_name_id:childMap[item.id][key].drug_name_id,
                   children: [],
                   parent_row: item.row_key,
                   row_key: this.editRowKey
@@ -2036,39 +1982,19 @@ export default {
               .DoctorAdviceTemplate) {
               _this.editRowKey++;
               var item = {
-                advice_name:
-                  _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                    .advice_name,
-                advice_desc:
-                  _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                    .advice_desc,
-                single_dose:
-                  "" +
-                  _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                    .single_dose,
-                single_dose_unit:
-                  _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                    .single_dose_unit,
-                drug_spec:
-                  "" +
-                  _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                    .drug_spec,
-                drug_spec_unit:
-                  _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                    .drug_spec_unit,
-                prescribing_number:
-                  "" +
-                  _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                    .prescribing_number,
-                prescribing_number_unit:
-                  _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                    .prescribing_number_unit,
-                delivery_way:
-                  _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                    .delivery_way,
-                execution_frequency:
-                  _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                    .execution_frequency,
+                advice_name:_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].advice_name,
+                advice_desc:_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].advice_desc,
+                single_dose:"" +_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].single_dose,
+                single_dose_unit:_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].single_dose_unit,
+                drug_spec:"" +_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_spec,
+                drug_spec_unit:_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_spec_unit,
+                prescribing_number:"" +_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].prescribing_number,
+                prescribing_number_unit:_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].prescribing_number_unit,
+                delivery_way:_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].delivery_way,
+                execution_frequency:_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].execution_frequency,
+                way:_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].way,
+                drug_id:_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_id,
+                drug_name_id:_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_name_id,
                 isEdit: 0,
                 id: 0,
                 children: [],
@@ -2095,10 +2021,12 @@ export default {
                     drug_spec: "" + children[key].drug_spec,
                     drug_spec_unit: children[key].drug_spec_unit,
                     prescribing_number: "" + children[key].prescribing_number,
-                    prescribing_number_unit:
-                      children[key].prescribing_number_unit,
+                    prescribing_number_unit:children[key].prescribing_number_unit,
                     delivery_way: children[key].delivery_way,
                     execution_frequency: children[key].execution_frequency,
+                    way:children[key].way,
+                    drug_id:children[key].drug_id,
+                    drug_name_id:children[key].drug_name_id,
                     isEdit: 0,
                     id: 0,
                     children: [],
@@ -2323,18 +2251,13 @@ export default {
       }
     },
     getAdviceConfig(type) {
+       console.log("type",type)
       getAdviceConfig(type).then(response => {
         if (response.data.state == 1) {
-          this.deliveryWayOptions =
-            response.data.data.drugways === null
-              ? []
-              : response.data.data.drugways;
-          this.executionFrequencyOptions =
-            response.data.data.efs === null ? [] : response.data.data.efs;
-          this.adviceTemplates =
-            response.data.data.advice_templates === null
-              ? []
-              : response.data.data.advice_templates;
+          this.deliveryWayOptions =response.data.data.drugways === null? []: response.data.data.drugways;
+          console.log("给药途径",this.deliveryWayOptions)
+          this.executionFrequencyOptions = response.data.data.efs === null ? [] : response.data.data.efs;
+          this.adviceTemplates = response.data.data.advice_templates === null? []: response.data.data.advice_templates;
 
           var templateLen = this.adviceTemplates.length;
           for (let index = 0; index < templateLen; index++) {
@@ -2342,8 +2265,7 @@ export default {
               continue;
             }
 
-            var DoctorAdviceTemplate = this.adviceTemplates[index]
-              .DoctorAdviceTemplate;
+            var DoctorAdviceTemplate = this.adviceTemplates[index].DoctorAdviceTemplate;
             for (let i = 0; i < DoctorAdviceTemplate.length; i++) {
               DoctorAdviceTemplate[i].selection = false;
             }
@@ -2503,11 +2425,23 @@ 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.nameForm.single_dose_unit = this.drugSpec[i].min_unit
+            this.nameForm.prescribing_number_unit = this.drugSpec[i].min_unit
+            this.nameForm.drug_spec_unit = this.drugSpec[i].min_unit
+
+            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
+            }
           }
         }
       },
       handleSelect1(){
         
+      },
+      handleSelect(){
+
       },
 
        querySearch(queryString, cb) {

src/xt_pages/user/doctorAdvice.vue

@@ -963,7 +963,7 @@
             <el-col :span="14">
               <el-form-item label="药品规格 :" prop="advice_desc">
                 <el-col :span="6">
-
+               
                 <el-autocomplete
                   style="width:100px;"
                   class="inline-input"
@@ -1044,7 +1044,7 @@
                     >
                     </el-option>
                   </el-select>
-
+                
                 </el-col>
               </el-form-item>
             </el-col>
@@ -2239,7 +2239,7 @@ export default {
               this.adviceForm.advice_name = arr[0]
           }
 
-
+       
           EditNewDoctorAdvice(
             this.patientID,
             this.adviceForm.id,
@@ -2293,7 +2293,7 @@ export default {
       });
     },
     submitgroupAdvice(formName) {
-
+     
       this.addLoading = true;
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -2306,12 +2306,8 @@ export default {
             remark: this.groupForm.remark,
             parent_id: this.groupForm.parent_id,
           };
-          console.log("22222",submitForm)
-          console.log("33333",this.private_drug_config.drug_start)
-          console.log("44444",this.medicals)
-
-
-
+        
+         
           var adviceNames = [];
           for (const index in this.groupForm.adviceNames) {
             this.groupForm.adviceNames[
@@ -2323,9 +2319,6 @@ export default {
           }
           submitForm.adviceNames = adviceNames;
 
-
-
-
           let mode = "";
           if (this.groupForm.advice_type == 1) {
             mode = "1-2";
@@ -2334,7 +2327,7 @@ export default {
           }
         console.log("长期医嘱2222",this.medicals)
         console.log("长期医嘱3333",submitForm)
-
+       
         if(this.private_drug_config != null&&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++){
@@ -2346,7 +2339,7 @@ export default {
               }
           }
           console.log("模板数据",submitForm)
-
+        
           CreateNewGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -2439,7 +2432,7 @@ export default {
               this.adviceForm.advice_name = arr[0]
           }
           console.log("222222",this.adviceForm)
-
+         
           CreateNewDoctorAdvice(this.patientID, this.adviceForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -2976,7 +2969,7 @@ export default {
     },
     openConfig() {},
     openEditGroupAdvice(groupno) {
-
+      console.log("groupno",groupno)
       var groups = [];
       this.rowKey = 0;
       for(let i=0;i<this.adviceTableData.length;i++){
@@ -3004,7 +2997,7 @@ export default {
         remark: groups[0].remark,
         groupno: groupno
       };
-      console.log("2222",groups[0]);
+      console.log("到了",groups[0]);
 
       var childMap = {};
       for (const index in groups) {
@@ -3048,7 +3041,7 @@ export default {
           row_key: this.rowKey,
           table: []
         };
-
+      
         if (item.id in childMap) {
           for (const key in childMap[item.id]) {
             this.rowKey++;
@@ -3088,6 +3081,7 @@ export default {
     },
 
     openEdit(index, row) {
+      
       this.currentIndex = index;
       (this.dialogTitle = "修改医嘱"), (this.isEdit = true);
 
@@ -4055,7 +4049,7 @@ export default {
       });
     },
     submitNameForm(formName) {
-
+       
        if(this.src_type == ""){
           this.nameForm.way = 0
           this.nameForm.drug_id = 0
@@ -4514,7 +4508,7 @@ export default {
             this.private_drug_config = response.data.data.private_drug_config
             console.log("medicals",medicalList)
             this.medicals = medicalList
-
+          
       })
     },
     changeDrugNameTwo(name){
@@ -4525,7 +4519,7 @@ export default {
         if (this.all_drug[i].drug_name == name) {
             this.drugSpec = this.all_drug[i].drug_specs
           }
-       }
+       }   
     },
    changeDrugDescTwo(name){
       this.current_drug_spec = name