自备药

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

@@ -768,6 +768,7 @@
         this.form['dialysis_order_id'] = this.dialysis_order.id
       },
       doctor_advices: function() {
+       
         this.handleSpanTempArr()
         this.hoverOrderArr = []
         this.handleStyle()
@@ -840,6 +841,7 @@
               adviceNames: this.other_doctor_advices,
               remark: ''
             }
+         
             let mode = '1'
             CreateGroupAdvice(this.patientid, 0, submitForm, mode).then(
               response => {
@@ -1176,7 +1178,6 @@
         }
         this.exceLoading = true
         let mode = '6'
-
         ExecDoctorAdvice(this.patient.id, this.currentRow.id, this.execTime, mode).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)

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

@@ -385,7 +385,7 @@
                   v-for="item in medicals"
                   :key="item.id"
                   :label="item.drug_name"
-                  :value="item.drug_name"
+                  :value="item.id"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -568,6 +568,7 @@ import {
 } from "@/api/advice";
 
 import {getSelfMedicalList,getDrugDescByDrugName } from "@/api/drug/drug"
+import { duration } from 'moment';
 export default {
   name: "AddGroupAdvice",
   data() {
@@ -611,7 +612,9 @@ export default {
         isEdit: 0,
         index: 0,
         id: 0,
-        children: []
+        children: [],
+        drug_id:"",
+        way:"",
       },
       submitGroupForm: {
         advice_type: "",
@@ -629,13 +632,15 @@ export default {
         adviceNames: [],
         advice_doctor: "",
         remark: "",
-        parent_id: 0
+        parent_id: 0,
+        drug_id:"",
+        way:"",
       },
       selectedTemp: { id: 0, name: "", org_id: 0, list: [], rows: [] },
       selectedTemplate: [],
       allSelectedTemplate: [],
       medicals:[],
-      drugSpec:[],
+      drugSpec:[]
     };
   },
   props: {
@@ -686,6 +691,7 @@ export default {
   },
   methods: {
     submitgroupAdvice(formName) {
+      
       this.$refs[formName].validate(valid => {
         if (valid) {
           var submitForm = {
@@ -697,7 +703,8 @@ export default {
             remark: this.groupForm.remark,
             parent_id: this.groupForm.parent_id
           };
-
+          
+          console.log("888888",this.groupForm.adviceNames)
           var adviceNames = [];
           for (const index in this.groupForm.adviceNames) {
             adviceNames.unshift(this.groupForm.adviceNames[index]);
@@ -705,7 +712,9 @@ export default {
           submitForm.adviceNames = adviceNames;
           let mode = "1";
           
-        
+     
+          console.log("88888888",submitForm)
+ 
           CreateGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -827,16 +836,40 @@ export default {
         .catch(() => {});
     },
     submitNameForm(formName) {
-      //截取自备药名称
-      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
+      }
+      
       var _this = this;
       this.$refs[formName].validate(valid => {
         if (valid) {
           if (_this.nameForm.isEdit) {
-            var ale = _this.groupForm.adviceNames.length;
-            console.log("进来诶呦")
+            var ale = _this.groupForm.adviceNames.length; 
             if (_this.isChild) {
               for (let index = 0; index < ale; index++) {
                 if (_this.groupSelectRow.parent_row ==_this.groupForm.adviceNames[index].row_key) {
@@ -856,7 +889,10 @@ export default {
                       _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].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.$set(_this.groupForm.adviceNames[index].children,j,_this.groupForm.adviceNames[index].children[j]
+                     
                       );
                       break;
                     }
@@ -877,7 +913,8 @@ export default {
                   _this.groupForm.adviceNames[index].delivery_way =_this.nameForm.delivery_way;
                   _this.groupForm.adviceNames[index].execution_frequency =_this.nameForm.execution_frequency;
                   _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.$set(
                     _this.groupForm.adviceNames,
                     index,
@@ -1271,8 +1308,6 @@ export default {
               }
               this.$set(item, "children", item.children);
             }
-            console.log("11122333")
-            console.log(item)
             this.allSelectedTemplate.unshift(item);
             adviceTemplate.DoctorAdviceTemplate[index].selection = false;
           }
@@ -1359,40 +1394,16 @@ export default {
             for (const index in _this.adviceTemplateMaps[mapid]
               .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,
+              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,
                 isEdit: 0,
                 id: 0,
                 children: [],
@@ -1516,25 +1527,82 @@ export default {
       getSelfMedicalList(params).then(response=>{
           if(response.data.state == 1){
             var medicalList =  response.data.data.medicalList
+            //way字段区分数据源:1代表来自基础库  2代表来自药品库
+            for(let i=0;i<medicalList.length;i++){
+               medicalList[i].way = 2
+            }
             for(let i=0;i<medicalList.length;i++){
                medicalList[i].drug_name = medicalList[i].drug_name+"(自备药)"
             }
-            this.medicals = medicalList
+            var drugname = response.data.data.drugName
+            for(let i=0;i<drugname.length;i++){
+               drugname[i].way = 1
+            }
+
+            drugname.push(...medicalList)
+            
+            this.medicals = drugname
           }
       })
     },
-    changeDrugName(name){
-       console.log("name",name)
-      var arr = name.split("(自备药)");
+    changeDrugName(id){
+      var drug_name = ""
+      var name = ""
+      var way = 0
+      for(let i=0;i<this.medicals.length;i++){
+        if(id == 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]
+      }
         const params = {
-          drug_name:arr[0],
-          patient_id:this.$route.query.patient_id
+          drug_name:drug_name,
+          patient_id:this.$route.query.patient_id,
+          way:way,
+          id:id,
         }
-        console.log("params",params)
       getDrugDescByDrugName(params).then(response=>{
           if(response.data.state == 1){
              var drugspec = response.data.data.drugspec
-             console.log("drugspec",drugspec)
+          
+             if(drugspec[0].drug_spec !=0){
+                this.nameForm.advice_desc = drugspec[0].drug_spec
+             }
+             if(drugspec[0].min_unit!=0){
+                 this.nameForm.drug_spec_unit = drugspec[0].min_unit
+             }
+             if(drugspec[0].delivery_way!=0){
+                 this.nameForm.delivery_way = drugspec[0].delivery_way
+             }
+             if(drugspec[0].execution_frequency!=0){
+                this.nameForm.execution_frequency = drugspec[0].execution_frequency
+             }
+             if(drugspec[0].single_dose !=0){
+                this.nameForm.single_dose = drugspec[0].single_dose.toString()
+             } 
+             if(drugspec[0].min_unit !=0){
+               this.nameForm.single_dose_unit = drugspec[0].min_unit
+             }
+             if(drugspec[0].min_unit!=0){
+               this.nameForm.prescribing_number_unit = drugspec[0].min_unit
+             }
+              
+             if( drugspec[0].prescribing_number!=0){
+                this.nameForm.prescribing_number = drugspec[0].prescribing_number.toString()
+             }
+             var countInfo = response.data.data.countInfo
+             console.log("countInfo",countInfo)
+             var countOut = response.data.data.countout
+             console.log("countout",countOut)
+             var arr = countInfo[0].Count - countOut[0].Count
+             console.log("arr222",arr)
              this.drugSpec = drugspec
           }
       })

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

@@ -358,30 +358,63 @@
     <el-dialog
       :title="nameFormTitle"
       :visible.sync="nameFormVisible"
-      width="700px"
+      width="800px"
     >
       <el-form
         ref="nameForm"
         :rules="nameRules"
         :model="nameForm"
-        label-width="90px"
+        label-width="120px"
       >
         <el-row>
-          <el-col :span="12">
+          <el-col :span="10">
             <el-form-item label="医嘱内容 :" required prop="advice_name">
-              <el-input v-model="nameForm.advice_name"></el-input>
+              <!-- <el-input v-model="nameForm.advice_name"></el-input> -->
+               <el-select
+                v-model="nameForm.advice_name"
+                filterable
+                clearable
+                allow-create
+                :disabled="isChild"
+                placeholder="请选择(输入可搜索)"
+                style="width:200px"
+                @change="changeDrugName"
+              >
+                <el-option
+                  v-for="item in medicals"
+                  :key="item.id"
+                  :label="item.drug_name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="14">
             <!--<el-form-item label="规格 :" prop="advice_desc">-->
             <!--<el-input v-model="nameForm.advice_desc"></el-input>-->
             <!--</el-form-item>-->
             <el-form-item label="药品规格 :" prop="advice_desc">
-              <el-col :span="8">
-                <el-input v-model="nameForm.advice_desc"></el-input>
+              <el-col :span="10">
+                <!-- <el-input v-model="nameForm.advice_desc"></el-input> -->
+                 <el-select
+                  v-model="nameForm.advice_desc"
+                  filterable
+                  clearable
+                  allow-create
+                  :disabled="isChild"
+                  placeholder="请选择(输入可搜索)"
+                  style="width:150px"
+                >
+                  <el-option
+                    v-for="item in drugSpec"
+                    :key="item.id"
+                    :label="item.drug_spec"
+                    :value="item.drug_spec"
+                  ></el-option>
+                 </el-select>
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
-              <el-col :span="14">
+              <el-col :span="10">
                 <el-select
                   v-model="nameForm.drug_spec_unit"
                   filterable
@@ -520,7 +553,7 @@ import {
   SaveEditAdvices
 } from "@/api/advice";
 import { jsGetAge, uParseTime } from "@/utils/tools";
-
+import { getSelfMedicalList,getDrugDescByDrugName } from "@/api/drug/drug"
 export default {
   name: "AddGroupAdvice",
   data() {
@@ -585,7 +618,9 @@ export default {
       adminusername: "",
       selectedTemp: { id: 0, name: "", org_id: 0, list: [], rows: [] },
       selectedTemplate: [],
-      allSelectedTemplate: []
+      allSelectedTemplate: [],
+      medicals:[],
+      drugSpec:[]
     };
   },
   props: {
@@ -794,6 +829,33 @@ 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
+      }
       var _this = this;
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -2161,12 +2223,106 @@ export default {
           this.groupEditFormVisible = false;
         }
       });
+    },
+   getSelfMedicalList(){
+        const params = {
+          patient_id:this.$route.query.patient_id
+        }
+      getSelfMedicalList(params).then(response=>{
+          if(response.data.state == 1){
+            var medicalList =  response.data.data.medicalList
+            //way字段区分数据源:1代表来自基础库  2代表来自药品库
+            for(let i=0;i<medicalList.length;i++){
+               medicalList[i].way = 2
+            }
+            for(let i=0;i<medicalList.length;i++){
+               medicalList[i].drug_name = medicalList[i].drug_name+"(自备药)"
+            }
+            var drugname = response.data.data.drugName
+            for(let i=0;i<drugname.length;i++){
+               drugname[i].way = 1
+            }
+
+            drugname.push(...medicalList)
+            console.log("222222222我的",drugname)
+            this.medicals = drugname
+          }
+      })
+    },
+  changeDrugName(id){
+      var drug_name = ""
+      var name = ""
+      var way = 0
+      for(let i=0;i<this.medicals.length;i++){
+        if(id == 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]
+      }
+        const params = {
+          drug_name:drug_name,
+          patient_id:this.$route.query.patient_id,
+          way:way,
+        }
+      getDrugDescByDrugName(params).then(response=>{
+          if(response.data.state == 1){
+             var drugspec = response.data.data.drugspec
+             console.log("drugspec999",drugspec)
+             if(drugspec[0].drug_spec !=0){
+                this.nameForm.advice_desc = ""
+                this.nameForm.advice_desc = drugspec[0].drug_spec
+             }
+             if(drugspec[0].min_unit!=0){
+                 this.nameForm.drug_spec_unit = ""
+                 this.nameForm.drug_spec_unit = drugspec[0].min_unit
+             }
+             if(drugspec[0].delivery_way!=0){
+                 this.nameForm.delivery_way = ""
+                 this.nameForm.delivery_way = drugspec[0].delivery_way
+             }
+             if(drugspec[0].execution_frequency!=0){
+                this.nameForm.execution_frequency = ""
+                this.nameForm.execution_frequency = drugspec[0].execution_frequency
+             }
+             if(drugspec[0].single_dose !=0){
+                this.nameForm.single_dose = ""
+                this.nameForm.single_dose = drugspec[0].single_dose.toString()
+             } 
+             if(drugspec[0].min_unit !=0){
+              this.nameForm.single_dose_unit = ""
+               this.nameForm.single_dose_unit = drugspec[0].min_unit
+             }
+             if(drugspec[0].min_unit!=0){
+               this.nameForm.prescribing_number_unit = ""
+               this.nameForm.prescribing_number_unit = drugspec[0].min_unit
+             }
+              
+             if( drugspec[0].prescribing_number!=0){
+               this.nameForm.prescribing_number = ""
+                this.nameForm.prescribing_number = drugspec[0].prescribing_number.toString()
+             }
+          
+             this.drugSpec = drugspec
+          }
+      })
+    
     }
   },
   watch: {
     "selectedTemp.list": function() {
       this.calcselectedTemp();
     }
+  },
+  created(){
+     //获取自备药
+    this.getSelfMedicalList()
   }
 };
 </script>

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

@@ -1370,7 +1370,7 @@
       },
       setLastRecord: function(schedual,lastAssessmentAfterDislysis,lastPredialysisEvaluation,lastDialysisPrescribe,lastDryWeightDislysis,system_prescribe) {
         
-        console.log("德玛西亚22222",schedual)
+       
         this.treatment_mode = this.$store.getters.treatment_mode
         console.log("99999",this.treatment_mode)
         this.perfusion_apparatus = getDataConfig(

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -371,30 +371,65 @@
     <el-dialog
       :title="nameFormTitle"
       :visible.sync="nameFormVisible"
-      width="700px"
+      width="800px"
     >
       <el-form
         ref="nameForm"
         :rules="nameRules"
         :model="nameForm"
-        label-width="90px"
+        label-width="120px"
       >
         <el-row>
-          <el-col :span="12">
+          <el-col :span="10">
             <el-form-item label="医嘱内容 :" required prop="advice_name">
-              <el-input v-model="nameForm.advice_name"></el-input>
+              <!-- <el-input v-model="nameForm.advice_name"></el-input> -->
+
+              <el-select
+                v-model="nameForm.advice_name"
+                filterable
+                clearable
+                allow-create
+                :disabled="isChild"
+                placeholder="请选择(输入可搜索)"
+                style="width:200px"
+                @change="changeDrugName"
+              >
+                <el-option
+                  v-for="item in medicals"
+                  :key="item.id"
+                  :label="item.drug_name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="14">
             <!--<el-form-item label="规格 :" prop="advice_desc">-->
             <!--<el-input v-model="nameForm.advice_desc"></el-input>-->
             <!--</el-form-item>-->
             <el-form-item label="药品规格 :" prop="advice_desc">
-              <el-col :span="8">
-                <el-input v-model="nameForm.advice_desc"></el-input>
+              <el-col :span="10">
+                <!-- <el-input v-model="nameForm.advice_desc"></el-input> -->
+
+                <el-select
+                  v-model="nameForm.advice_desc"
+                  filterable
+                  clearable
+                  allow-create
+                  :disabled="isChild"
+                  placeholder="请选择(输入可搜索)"
+                  style="width:150px"
+                >
+                  <el-option
+                    v-for="item in drugSpec"
+                    :key="item.id"
+                    :label="item.drug_spec"
+                    :value="item.drug_spec"
+                  ></el-option>
+                 </el-select>
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
-              <el-col :span="14">
+              <el-col :span="10">
                 <el-select
                   v-model="nameForm.drug_spec_unit"
                   filterable
@@ -564,7 +599,7 @@ import {
   getDoctorAdviceList,
   StopDoctorAdvice
 } from "@/api/advice";
-
+import { getSelfMedicalList,getDrugDescByDrugName } from "@/api/drug/drug"
 export default {
   name: "EditGroupAdvice",
   data() {
@@ -607,7 +642,9 @@ export default {
         isEdit: 0,
         index: 0,
         id: 0,
-        children: []
+        children: [],
+        way:"",
+        drug_id:""
       },
 
       drugOptions: [],
@@ -626,7 +663,9 @@ export default {
       selectedTemp: { id: 0, name: "", org_id: 0, list: [], rows: [] },
       selectedTemplate: [],
       allSelectedTemplate: [],
-      adviceTemplateMaps: {}
+      adviceTemplateMaps: {},
+      medicals:[],
+      drugSpec:[]
     };
   },
   props: {
@@ -813,6 +852,33 @@ 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
+      }
       var _this = this;
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -2319,6 +2385,89 @@ export default {
           }
         }
       });
+    },
+
+     getSelfMedicalList(){
+        const params = {
+          patient_id:this.patientID
+        }
+      getSelfMedicalList(params).then(response=>{
+          if(response.data.state == 1){
+            var medicalList =  response.data.data.medicalList
+            //way字段区分数据源:1代表来自基础库  2代表来自药品库
+            for(let i=0;i<medicalList.length;i++){
+               medicalList[i].way = 2
+            }
+            for(let i=0;i<medicalList.length;i++){
+               medicalList[i].drug_name = medicalList[i].drug_name+"(自备药)"
+            }
+            var drugname = response.data.data.drugName
+            for(let i=0;i<drugname.length;i++){
+               drugname[i].way = 1
+            }
+
+            drugname.push(...medicalList)
+          
+            this.medicals = drugname
+          }
+      })
+    },
+    changeDrugName(id){
+      var drug_name = ""
+      var name = ""
+      var way = 0
+      for(let i=0;i<this.medicals.length;i++){
+        if(id == 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]
+      }
+        const params = {
+          drug_name:drug_name,
+          patient_id:this.$route.query.patient_id,
+          way:way,
+        }
+      getDrugDescByDrugName(params).then(response=>{
+          if(response.data.state == 1){
+             var drugspec = response.data.data.drugspec
+          
+             if(drugspec[0].drug_spec !=0){
+                this.nameForm.advice_desc = drugspec[0].drug_spec
+             }
+             if(drugspec[0].min_unit!=0){
+                 this.nameForm.drug_spec_unit = drugspec[0].min_unit
+             }
+             if(drugspec[0].delivery_way!=0){
+                 this.nameForm.delivery_way = drugspec[0].delivery_way
+             }
+             if(drugspec[0].execution_frequency!=0){
+                this.nameForm.execution_frequency = drugspec[0].execution_frequency
+             }
+             if(drugspec[0].single_dose !=0){
+                this.nameForm.single_dose = drugspec[0].single_dose.toString()
+             } 
+             if(drugspec[0].min_unit !=0){
+               this.nameForm.single_dose_unit = drugspec[0].min_unit
+             }
+             if(drugspec[0].min_unit!=0){
+               this.nameForm.prescribing_number_unit = drugspec[0].min_unit
+             }
+              
+             if( drugspec[0].prescribing_number!=0){
+                this.nameForm.prescribing_number = drugspec[0].prescribing_number.toString()
+             }
+          
+             this.drugSpec = drugspec
+          }
+      })
+    
     }
   },
   watch: {
@@ -2328,6 +2477,10 @@ export default {
     "selectedTemp.list": function() {
       this.calcselectedTemp();
     }
+  },
+  created(){
+    //获取自备药
+    this.getSelfMedicalList()
   }
 };
 </script>

src/xt_pages/user/doctorAdvice.vue

@@ -961,7 +961,7 @@
                   v-for="item in medicals"
                   :key="item.id"
                   :label="item.drug_name"
-                  :value="item.drug_name"
+                  :value="item.id"
                 ></el-option>
               </el-select>
               </el-form-item>
@@ -2610,6 +2610,8 @@ export default {
           drug_spec_unit: this.groupSelectRow.drug_spec_unit,
           prescribing_number: this.groupSelectRow.prescribing_number,
           prescribing_number_unit: this.groupSelectRow.prescribing_number_unit,
+          way:this.groupSelectRow.way,
+          drug_id:this.groupSelectRow.drug_id,
           delivery_way: this.isChild ? "" : this.groupSelectRow.delivery_way,
           execution_frequency: this.isChild
             ? ""
@@ -2650,7 +2652,9 @@ export default {
           index: 0,
           id: 0,
           children: [],
-          parent_row: 0
+          parent_row: 0,
+          way:"",
+          drug_id:''
         };
         this.nameFormTitle = "新增医嘱内容";
       }
@@ -3964,8 +3968,26 @@ export default {
       });
     },
     submitNameForm(formName) {
-      var arr = this.nameForm.advice_name.split("(自备药)")
-      this.nameForm.advice_name = arr[0]
+      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
       var _this = this;
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -3980,40 +4002,18 @@ export default {
                   var cle = _this.groupForm.adviceNames[index].children.length;
                   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].drug_id = _this.nameForm.drug_id;
+                      _this.groupForm.adviceNames[index].children[j].way = this.nameForm.way;
                       _this.$set(
                         _this.groupForm.adviceNames[index].children,
                         j,
@@ -4348,25 +4348,80 @@ export default {
         const params = {
           patient_id:id
         }
+      console.log("params9999999999",params)
       getSelfMedicalList(params).then(response=>{
          if(response.data.state == 1){
+
             var medicalList =  response.data.data.medicalList
+            //way字段区分数据源:1代表来自基础库  2代表来自药品库
+            for(let i=0;i<medicalList.length;i++){
+               medicalList[i].way = 2
+            }
             for(let i=0;i<medicalList.length;i++){
                medicalList[i].drug_name = medicalList[i].drug_name+"(自备药)"
             }
-            this.medicals = medicalList
+            var drugname = response.data.data.drugName
+            for(let i=0;i<drugname.length;i++){
+               drugname[i].way = 1
+            }
+
+            drugname.push(...medicalList)
+            this.medicals = drugname
          }
       })
     },
-    changeDrugName(name){
-      var arr = name.split("(自备药)");
+    changeDrugName(id){
+      var drug_name = ""
+      var name = ""
+      var way = 0
+      for(let i=0;i<this.medicals.length;i++){
+        if(id == 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]
+      }
         const params = {
-          drug_name:arr[0],
-          patient_id:this.$route.params && this.$route.params.id
+          drug_name:drug_name,
+          patient_id:this.$route.query.patient_id,
+          way:way,
         }
       getDrugDescByDrugName(params).then(response=>{
           if(response.data.state == 1){
-             var drugspec = response.data.data.drugspec
+            var drugspec = response.data.data.drugspec
+          
+             if(drugspec[0].drug_spec !=0){
+                this.nameForm.advice_desc = drugspec[0].drug_spec
+             }
+             if(drugspec[0].min_unit!=0){
+                 this.nameForm.drug_spec_unit = drugspec[0].min_unit
+             }
+             if(drugspec[0].delivery_way!=0){
+                 this.nameForm.delivery_way = drugspec[0].delivery_way
+             }
+             if(drugspec[0].execution_frequency!=0){
+                this.nameForm.execution_frequency = drugspec[0].execution_frequency
+             }
+             if(drugspec[0].single_dose !=0){
+                this.nameForm.single_dose = drugspec[0].single_dose
+             } 
+             if(drugspec[0].min_unit !=0){
+               this.nameForm.single_dose_unit = drugspec[0].min_unit
+             }
+             if(drugspec[0].min_unit!=0){
+               this.nameForm.prescribing_number_unit = drugspec[0].min_unit
+             }
+              
+             if( drugspec[0].prescribing_number!=0){
+                this.nameForm.prescribing_number = drugspec[0].prescribing_number
+             }
+          
              this.drugSpec = drugspec
           }
       })

src/xt_pages/user/patients.vue

@@ -1267,7 +1267,7 @@
             return false
           } else {
             this.tableData = response.data.data.patients
-           console.log('病人是', this.tableData)
+          //  console.log('病人是', this.tableData)
             this.pageTotal = this.tableData.length
             this.total = response.data.data.total
           }