自备药

src/api/drug/drug.js

@@ -130,7 +130,6 @@ export function saveOutStock(data,startime,adminuserid,patientid){
 }
 
 export function DeleteDrugById(params){
-  
    return request({
       url:"/api/drug/deletedrugbyid",
       method:"get",
@@ -147,10 +146,13 @@ export function saveRadio(params){
    })
 }
 
-export function DeleteDrugStand(id,params){
-   
+export function DeleteDrugStand(id,name){
+    const params = {
+      id:id,
+      name:name
+    }
    return request({
-      url:"/api/drug/deletedrugstand?id="+id,
+      url:"/api/drug/deletedrugstand",
       method:"get",
       params:params
    })
@@ -227,3 +229,29 @@ export function getDrugSet(params){
    })
 }
 
+export function getAllMedicalList(params){
+  
+   return request({
+      url:"/api/drug/getallmedicallist",
+      methods:"get",
+      params:params,
+   })
+}
+
+export function getStandName(params){
+  
+   return request({
+     url:"/api/drug/getstandname",
+     methods:"get",
+     params:params
+   })
+}
+
+export function getRullerList(params){
+  
+   return request({
+      url:"/api/drug/getrullerlist",
+      methods:"get",
+      params:params
+   })
+}

src/xt_pages/data/components/addDrugs.vue

@@ -460,7 +460,8 @@
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
 
-      },getDataConfig(module, filed_name){
+      },
+      getDataConfig(module, filed_name){
         return getDataConfig(module, filed_name)
 
       },

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

@@ -438,28 +438,61 @@
 
           <el-col :span="8">
             <el-form-item label="医嘱名称：">
-              <el-input v-model="form.advice_name"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="药品规格：">
-              <el-input v-model="form.advice_desc" style="width: 40%;"></el-input>
+              <!-- <el-input v-model="form.advice_name"></el-input> -->
               <el-select
-                v-model="form.drug_spec_unit"
-                style="width: 56%;"
+                v-model="form.advice_name"
                 filterable
-                placeholder="选择"
+                clearable
+                allow-create
+                placeholder="请选择(输入可搜索)"
+                style="width:200px"
+                @change="changeDrugName"
               >
                 <el-option
-                  v-for="item in unitsOption"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.name"
+                  v-for="(item,index) in all_drug"
+                  :key="index"
+                  :label="item.drug_name"
+                  :value="item.drug_name"
                 ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="药品规格：">
+              <!-- <el-input v-model="form.advice_desc" style="width: 40%;"></el-input> -->
+
+               <el-select
+                  v-model="form.advice_desc"
+                  filterable
+                  clearable
+                  allow-create
+                  placeholder="请选择(输入可搜索)"
+                  style="width:150px"
+                  @change="changeDrugDesc"
+                >
+                  <el-option
+                    v-for="item in drugSpec"
+                    :key="item.id"
+                    :label="item.drug_spec"
+                    :value="item.drug_spec"
+                  ></el-option>
+                 </el-select>
+                <el-select
+                  v-model="form.drug_spec_unit"
+                  style="width: 56%;"
+                  filterable
+                  placeholder="选择"
+                >
+                  <el-option
+                    v-for="item in unitsOption"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.name"
+                  ></el-option>
+                </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row :gutter="20">
@@ -621,7 +654,7 @@
 
   import request from '@/utils/request'
   import { getDialysisScheduleDetail } from '@/api/dialysis_record'
-
+  import { getSelfMedicalList } from "@/api/drug/drug"
   export default {
     name: 'DoctorAdviceDialog',
     props: {
@@ -753,7 +786,14 @@
 
         templateForm: { id: '' },
         doctorAdvices: [],
-        patientid: ''
+        patientid: '',
+        drugSpec:[],
+        medicals:[],
+        all_drug:[],
+        current_drug_name:"",
+        current_drug_spec: "",
+        drug_id: 0,
+        src_type:""
       }
     },
     watch: {
@@ -882,6 +922,7 @@
         }
       },
       submitEditAdvice() {
+        console.log("this.form",this.form)
         if (this.form.advice_name.length == 0) {
           this.$message.error('请填写医嘱名称')
           return
@@ -1242,7 +1283,7 @@
           return false
         }
         let mode = '1'
-
+       
         CreateDoctorAdvice(this.patient.id, this.form, mode)
           .then(response => {
             this.loading = false
@@ -1413,7 +1454,9 @@
           execution_frequency: row.execution_frequency,
           advice_doctor: row.advice_doctor,
           remark: row.remark,
-          parent_id: row.parent_id
+          parent_id: row.parent_id,
+          drug_id:"",
+          way:"",
         }
       }
       ,
@@ -2235,7 +2278,123 @@
           this.GetLastOrNextDoctorAdvice(params)
 
         }
-      }
+      },
+
+    getSelfMedicalList(){
+        const params = {
+          patient_id:this.$route.query.patient_id
+        }
+      getSelfMedicalList(params).then(response=>{
+         if (response.data.state == 1) {
+            this.arr_drug = []
+            var medicalList = response.data.data.private_drug_list
+            var base_drug_list = response.data.data.base_drug_list
+            var base_drug_cofig = response.data.data.base_drug_config
+            var private_drug_cofig = response.data.data.private_drug_config
+
+
+            if(private_drug_cofig != null&&private_drug_cofig.drug_start == 1) {
+
+              for (let i = 0; i < medicalList.length; i++) {
+                if(medicalList[i].drug_specs != null) {
+                  for (let a = 0; a < medicalList[i].drug_specs.length; a++) {
+                    medicalList[i].drug_specs[a]['type'] = 2
+                  }
+                }
+                let obj = {
+                  drug_name: "",
+                  drug_desc: "",
+                  delivery_way: "",
+                  execution_frequency: "",
+                  single_dose: "",
+                  single_dose_unit: "",
+                  prescribing_number: "",
+                  prescribing_number_unit: "",
+                  type_id: "",
+                  type: "",
+                  custom_id: "",
+                  drug_specs: [],
+                }
+
+                medicalList[i].drug_name = medicalList[i].drug_name + "(自备药)"
+                obj.drug_name = medicalList[i].drug_name
+                obj.delivery_way = medicalList[i].delivery_way
+                obj.execution_frequency = medicalList[i].execution_frequency
+                obj.single_dose = medicalList[i].single_dose
+                obj.prescribing_number = medicalList[i].prescribing_number
+                obj.type_id = medicalList[i].id
+                obj.type = 2
+                obj.custom_id = this.rand(10000000, 99999999)
+                obj.drug_specs = medicalList[i].drug_specs
+                this.all_drug.push(obj)
+              }
+            }
+
+
+            for (let i = 0; i < base_drug_list.length; i++) {
+              if(base_drug_list[i].drug_specs != null) {
+                for (let a = 0; a < base_drug_list[i].drug_specs.length; a++) {
+                  base_drug_list[i].drug_specs[a]['type'] = 1
+                }
+              }
+                let obj = {
+                  drug_name: "",
+                  drug_desc: "",
+                  delivery_way: "",
+                  execution_frequency: "",
+                  single_dose: "",
+                  single_dose_unit: "",
+                  prescribing_number: "",
+                  prescribing_number_unit: "",
+                  type_id: "",
+                  type: "",
+                  custom_id: "",
+                  drug_specs: [],
+                }
+
+                obj.drug_name = base_drug_list[i].drug_name
+                obj.delivery_way = base_drug_list[i].delivery_way
+                obj.execution_frequency = base_drug_list[i].execution_frequency
+                obj.single_dose = base_drug_list[i].single_dose
+                obj.prescribing_number = base_drug_list[i].prescribing_number
+                obj.type_id = base_drug_list[i].id
+                obj.type = 1
+                obj.custom_id = this.rand(10000000, 99999999)
+                obj.drug_specs = base_drug_list[i].drug_specs
+                this.all_drug.push(obj)
+              }
+            }
+        })
+     },
+    changeDrugName(name){
+      this.current_drug_name = name
+      this.form.advice_desc = ''
+      this.drugSpec = []
+      for (let i = 0; i < this.all_drug.length; i++) {
+        if (this.all_drug[i].drug_name == name) {
+            this.drugSpec = this.all_drug[i].drug_specs
+          }
+       }
+    },
+    changeDrugDesc(name) {
+        this.current_drug_spec = name
+        for (let i = 0; i < this.drugSpec.length; i++) {
+          if (this.drugSpec[i].drug_spec == name) {
+            this.form.advice_desc = this.drugSpec[i].drug_spec
+            this.form.prescribing_number = this.drugSpec[i].prescribing_number.toString()
+            this.form.single_dose = this.drugSpec[i].single_dose.toString()
+            this.form.delivery_way = this.drugSpec[i].delivery_way.toString()
+            this.form.execution_frequency = this.drugSpec[i].execution_frequency.toString()
+            this.form.drug_id = this.drugSpec[i].id
+            this.src_type = this.drugSpec[i].type
+            this.form.drug_id = this.drugSpec[i].id
+            this.form.way = this.drugSpec[i].type
+          }
+        }
+      },
+      rand(min, max) {
+        return Math.floor(Math.random() * (max - min)) + min;
+      },
     },
     created() {
       var date = this.$route.query && this.$route.query.date
@@ -2248,6 +2407,8 @@
       this.request_record_date = this.record_date
 
       this.getDialysisScheduleDetail()
+       //获取自备药
+      this.getSelfMedicalList()
     },
     components: {
       AddGroupAdvice,

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

@@ -370,7 +370,6 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="医嘱内容 :" required prop="advice_name">
-              <!-- <el-input v-model="nameForm.advice_name"></el-input> -->
                <el-select
                 v-model="nameForm.advice_name"
                 filterable
@@ -382,10 +381,10 @@
                 @change="changeDrugName"
               >
                 <el-option
-                  v-for="item in medicals"
-                  :key="item.id"
+                  v-for="(item,index) in all_drug"
+                  :key="index"
                   :label="item.drug_name"
-                  :value="item.id"
+                  :value="item.drug_name"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -412,6 +411,7 @@
                   :disabled="isChild"
                   placeholder="请选择(输入可搜索)"
                   style="width:150px"
+                  @change="changeDrugDesc"
                 >
                   <el-option
                     v-for="item in drugSpec"
@@ -642,7 +642,12 @@ export default {
       selectedTemplate: [],
       allSelectedTemplate: [],
       medicals:[],
-      drugSpec:[]
+      drugSpec:[],
+      all_drug:[],
+      current_drug_name:"",
+      current_drug_spec: "",
+      drug_id: 0,
+      src_type:""
     };
   },
   props: {
@@ -689,7 +694,8 @@ export default {
       default: function() {
         return [];
       }
-    }
+    },
+   
   },
   methods: {
     submitgroupAdvice(formName) {
@@ -716,7 +722,7 @@ export default {
           
      
           console.log("88888888",submitForm)
- 
+          
           CreateGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -838,34 +844,43 @@ export default {
         .catch(() => {});
     },
     submitNameForm(formName) {
-      
-      if(typeof(this.nameForm.advice_name) == "string"){
+      console.log("=====",this.src_type)
+       if(this.src_type == ""){
+          this.nameForm.way = 0
+          this.nameForm.drug_id = 0
+       }
+
+       if(this.src_type == 2){ //自备药
+          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
-      }
+      //     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]
-          }
+      // 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
-      }
+      //     this.nameForm.advice_name = drug_name
+      //     this.nameForm.way = way
+      // }
       
       var _this = this;
       this.$refs[formName].validate(valid => {
@@ -892,7 +907,7 @@ export default {
                       _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.groupForm.adviceNames[index].children[j].way = _this.nameForm.way;
                       _this.$set(_this.groupForm.adviceNames[index].children,j,_this.groupForm.adviceNames[index].children[j]
                      
                       );
@@ -916,7 +931,7 @@ export default {
                   _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.groupForm.adviceNames[index].children[j].way = _this.nameForm.way;
                   _this.$set(
                     _this.groupForm.adviceNames,
                     index,
@@ -1520,96 +1535,123 @@ export default {
         }
       }
     },
-
+    rand(min, max) {
+        return Math.floor(Math.random() * (max - min)) + min;
+     },
     //
     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
+         if (response.data.state == 1) {
+            this.arr_drug = []
+            var medicalList = response.data.data.private_drug_list
+            var base_drug_list = response.data.data.base_drug_list
+            var base_drug_cofig = response.data.data.base_drug_config
+            var private_drug_cofig = response.data.data.private_drug_config
+
+
+            if(private_drug_cofig != null&&private_drug_cofig.drug_start == 1) {
+
+              for (let i = 0; i < medicalList.length; i++) {
+                if(medicalList[i].drug_specs != null) {
+                  for (let a = 0; a < medicalList[i].drug_specs.length; a++) {
+                    medicalList[i].drug_specs[a]['type'] = 2
+                  }
+                }
+                let obj = {
+                  drug_name: "",
+                  drug_desc: "",
+                  delivery_way: "",
+                  execution_frequency: "",
+                  single_dose: "",
+                  single_dose_unit: "",
+                  prescribing_number: "",
+                  prescribing_number_unit: "",
+                  type_id: "",
+                  type: "",
+                  custom_id: "",
+                  drug_specs: [],
+                }
+
+                medicalList[i].drug_name = medicalList[i].drug_name + "(自备药)"
+                obj.drug_name = medicalList[i].drug_name
+                obj.delivery_way = medicalList[i].delivery_way
+                obj.execution_frequency = medicalList[i].execution_frequency
+                obj.single_dose = medicalList[i].single_dose
+                obj.prescribing_number = medicalList[i].prescribing_number
+                obj.type_id = medicalList[i].id
+                obj.type = 2
+                obj.custom_id = this.rand(10000000, 99999999)
+                obj.drug_specs = medicalList[i].drug_specs
+                this.all_drug.push(obj)
+              }
             }
 
-            drugname.push(...medicalList)
-            
-            this.medicals = drugname
+
+            for (let i = 0; i < base_drug_list.length; i++) {
+              if(base_drug_list[i].drug_specs != null) {
+                for (let a = 0; a < base_drug_list[i].drug_specs.length; a++) {
+                  base_drug_list[i].drug_specs[a]['type'] = 1
+                }
+              }
+                let obj = {
+                  drug_name: "",
+                  drug_desc: "",
+                  delivery_way: "",
+                  execution_frequency: "",
+                  single_dose: "",
+                  single_dose_unit: "",
+                  prescribing_number: "",
+                  prescribing_number_unit: "",
+                  type_id: "",
+                  type: "",
+                  custom_id: "",
+                  drug_specs: [],
+                }
+
+                obj.drug_name = base_drug_list[i].drug_name
+                obj.delivery_way = base_drug_list[i].delivery_way
+                obj.execution_frequency = base_drug_list[i].execution_frequency
+                obj.single_dose = base_drug_list[i].single_dose
+                obj.prescribing_number = base_drug_list[i].prescribing_number
+                obj.type_id = base_drug_list[i].id
+                obj.type = 1
+                obj.custom_id = this.rand(10000000, 99999999)
+                obj.drug_specs = base_drug_list[i].drug_specs
+                this.all_drug.push(obj)
+              }
+            }   
+        })
+       
+    },
+    changeDrugName(name){
+       this.current_drug_name = name
+       this.nameForm.advice_desc = ''
+      this.drugSpec = []
+      for (let i = 0; i < this.all_drug.length; i++) {
+        if (this.all_drug[i].drug_name == name) {
+            this.drugSpec = this.all_drug[i].drug_specs
           }
-      })
+       }
     },
-    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
+    changeDrugDesc(name) {
+        this.current_drug_spec = name
+        for (let i = 0; i < this.drugSpec.length; i++) {
+          if (this.drugSpec[i].drug_spec == name) {
+            this.nameForm.advice_desc = this.drugSpec[i].drug_spec
+            this.nameForm.prescribing_number = this.drugSpec[i].prescribing_number.toString()
+            this.nameForm.single_dose = this.drugSpec[i].single_dose.toString()
+            this.nameForm.delivery_way = this.drugSpec[i].delivery_way.toString()
+            this.nameForm.execution_frequency = this.drugSpec[i].execution_frequency.toString()
+            this.drug_id = this.drugSpec[i].id
+            this.src_type = this.drugSpec[i].type
+            this.nameForm.drug_id = this.drugSpec[i].id
+            this.nameForm.way = this.drugSpec[i].type
+          }
         }
       }
-      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,
-          id:id,
-        }
-      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()
-             }
-             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
-          }
-      })
-    
-    }
   },
   watch: {
     "selectedTemp.list": function() {

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

@@ -381,10 +381,10 @@
                 @change="changeDrugName"
               >
                 <el-option
-                  v-for="item in medicals"
-                  :key="item.id"
+                  v-for="(item,index) in all_drug"
+                  :key="index"
                   :label="item.drug_name"
-                  :value="item.id"
+                  :value="item.drug_name"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -396,7 +396,7 @@
             <el-form-item label="药品规格 :" prop="advice_desc">
               <el-col :span="10">
                 <!-- <el-input v-model="nameForm.advice_desc"></el-input> -->
-                 <el-select
+                <el-select
                   v-model="nameForm.advice_desc"
                   filterable
                   clearable
@@ -404,6 +404,7 @@
                   :disabled="isChild"
                   placeholder="请选择(输入可搜索)"
                   style="width:150px"
+                  @change="changeDrugDesc"
                 >
                   <el-option
                     v-for="item in drugSpec"
@@ -620,7 +621,12 @@ export default {
       selectedTemplate: [],
       allSelectedTemplate: [],
       medicals:[],
-      drugSpec:[]
+      drugSpec:[],
+      all_drug:[],
+      current_drug_name:"",
+      current_drug_spec: "",
+      drug_id: 0,
+      src_type:""
     };
   },
   props: {
@@ -2229,91 +2235,117 @@ export default {
           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
+         if (response.data.state == 1) {
+            this.arr_drug = []
+            var medicalList = response.data.data.private_drug_list
+            var base_drug_list = response.data.data.base_drug_list
+            var base_drug_cofig = response.data.data.base_drug_config
+            var private_drug_cofig = response.data.data.private_drug_config
+
+
+            if(private_drug_cofig != null&&private_drug_cofig.drug_start == 1) {
+
+              for (let i = 0; i < medicalList.length; i++) {
+                if(medicalList[i].drug_specs != null) {
+                  for (let a = 0; a < medicalList[i].drug_specs.length; a++) {
+                    medicalList[i].drug_specs[a]['type'] = 2
+                  }
+                }
+                let obj = {
+                  drug_name: "",
+                  drug_desc: "",
+                  delivery_way: "",
+                  execution_frequency: "",
+                  single_dose: "",
+                  single_dose_unit: "",
+                  prescribing_number: "",
+                  prescribing_number_unit: "",
+                  type_id: "",
+                  type: "",
+                  custom_id: "",
+                  drug_specs: [],
+                }
+
+                medicalList[i].drug_name = medicalList[i].drug_name + "(自备药)"
+                obj.drug_name = medicalList[i].drug_name
+                obj.delivery_way = medicalList[i].delivery_way
+                obj.execution_frequency = medicalList[i].execution_frequency
+                obj.single_dose = medicalList[i].single_dose
+                obj.prescribing_number = medicalList[i].prescribing_number
+                obj.type_id = medicalList[i].id
+                obj.type = 2
+                obj.custom_id = this.rand(10000000, 99999999)
+                obj.drug_specs = medicalList[i].drug_specs
+                this.all_drug.push(obj)
+              }
             }
 
-            drugname.push(...medicalList)
-            console.log("222222222我的",drugname)
-            this.medicals = drugname
+
+            for (let i = 0; i < base_drug_list.length; i++) {
+              if(base_drug_list[i].drug_specs != null) {
+                for (let a = 0; a < base_drug_list[i].drug_specs.length; a++) {
+                  base_drug_list[i].drug_specs[a]['type'] = 1
+                }
+              }
+                let obj = {
+                  drug_name: "",
+                  drug_desc: "",
+                  delivery_way: "",
+                  execution_frequency: "",
+                  single_dose: "",
+                  single_dose_unit: "",
+                  prescribing_number: "",
+                  prescribing_number_unit: "",
+                  type_id: "",
+                  type: "",
+                  custom_id: "",
+                  drug_specs: [],
+                }
+
+                obj.drug_name = base_drug_list[i].drug_name
+                obj.delivery_way = base_drug_list[i].delivery_way
+                obj.execution_frequency = base_drug_list[i].execution_frequency
+                obj.single_dose = base_drug_list[i].single_dose
+                obj.prescribing_number = base_drug_list[i].prescribing_number
+                obj.type_id = base_drug_list[i].id
+                obj.type = 1
+                obj.custom_id = this.rand(10000000, 99999999)
+                obj.drug_specs = base_drug_list[i].drug_specs
+                this.all_drug.push(obj)
+              }
+            }   
+        })
+       
+    },
+    changeDrugName(name){
+       this.current_drug_name = name
+       this.nameForm.advice_desc = ''
+      this.drugSpec = []
+      for (let i = 0; i < this.all_drug.length; i++) {
+        if (this.all_drug[i].drug_name == name) {
+            this.drugSpec = this.all_drug[i].drug_specs
           }
-      })
+       }
     },
-  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
+    changeDrugDesc(name) {
+        this.current_drug_spec = name
+        for (let i = 0; i < this.drugSpec.length; i++) {
+          if (this.drugSpec[i].drug_spec == name) {
+            this.nameForm.advice_desc = this.drugSpec[i].drug_spec
+            this.nameForm.prescribing_number = this.drugSpec[i].prescribing_number.toString()
+            this.nameForm.single_dose = this.drugSpec[i].single_dose.toString()
+            this.nameForm.delivery_way = this.drugSpec[i].delivery_way.toString()
+            this.nameForm.execution_frequency = this.drugSpec[i].execution_frequency.toString()
+            this.drug_id = this.drugSpec[i].id
+            this.src_type = this.drugSpec[i].type
+            this.nameForm.drug_id = this.drugSpec[i].id
+            this.nameForm.way = this.drugSpec[i].type
           }
-      })
-    
-    }
+        }
+    },
+    rand(min, max) {
+        return Math.floor(Math.random() * (max - min)) + min;
+     },
   },
   watch: {
     "selectedTemp.list": function() {

src/xt_pages/stock/selfPreparedMedicine/info.vue

@@ -74,7 +74,7 @@
                         <el-table-column align="center" prop="name" label="操作" width="180">
                             <template slot-scope="scope">
                                 <el-button size="mini" type="primary" @click="toDetail(scope.row.id)">编辑</el-button>
-                                <el-button size="mini" type="danger" @click="DeleteDrugStand(scope.row.id,scope.$index)">删除</el-button>
+                                <el-button size="mini" type="danger" @click="DeleteDrugStand(scope.row.id,scope.row.drug_name,scope.$index)">删除</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -153,7 +153,14 @@
                  </el-col>
                   <el-col :span="6">
                     <el-form-item label="单位:">
-                       <el-input v-model="form.unit" style="width:150px"></el-input>
+                       <el-select v-model="form.unit" style="width:160px;" placeholder="请选择">
+                        <el-option
+                          v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.id">
+                        </el-option>
+                     </el-select>
                     </el-form-item>
                  </el-col>
                   <el-col :span="6">
@@ -187,7 +194,8 @@
               <el-row :span="24">
                 <el-col :span="6">
                     <el-form-item label="规格名称:">
-                        <el-select v-model="editform.drug_name_id" filterable placeholder="请选择"
+                      <el-select v-model="editform.drug_name_id" filterable placeholder="请选择"
+                        style="width:150px" 
                         @change="changeRuleNameTwo">
                             <el-option
                             v-for="item in ruleName"
@@ -200,17 +208,24 @@
                  </el-col>
                   <el-col :span="6">
                     <el-form-item label="单位:">
-                       <el-input v-model="form.unit"></el-input>
+                       <el-select v-model="form.unit" style="width:160px;" placeholder="请选择">
+                        <el-option
+                          v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.id">
+                        </el-option>
+                     </el-select>
                     </el-form-item>
                  </el-col>
                   <el-col :span="6">
                     <el-form-item label="价格:">
-                       <el-input v-model="form.price"></el-input>
+                       <el-input v-model="form.price" style="width:150px"></el-input>
                     </el-form-item>
                  </el-col>
                  <el-col :span="6">
                     <el-form-item label="库存警戒:">
-                       <el-input v-model="form.drug_stock_limit"></el-input>
+                       <el-input v-model="form.drug_stock_limit" style="width:150px"></el-input>
                     </el-form-item>
                  </el-col>
              </el-row> 
@@ -218,7 +233,7 @@
         </span>
         <span slot="footer" class="dialog-footer">
             <el-button @click="editRuleDialogVisible = false">取 消</el-button>
-            <el-button  @click="updatedRulleName">保 存</el-button>
+            <el-button  @click="updatedRulleName" type="primary">保 存</el-button>
         </span>
         </el-dialog>
 
@@ -236,7 +251,8 @@ import addMedicine from "./components/addMedicine"
 import medicineDetail from "./components/medicineDetail"
 import warehousing from "./components/warehousing"
 import warehouseOut from "./components/warehouseOut"
-import { getAllDrugName,saveDrugName,getdrugNameList,getRulleName,getUnitByBaseId,saveRulleName,EditRullerName,updatedRulleName,DeleteDrugById,DeleteDrugStand,saveRadio,getDrugSet }  from "@/api/drug/drug"
+import { getAllDrugName,saveDrugName,getdrugNameList,getStandName,getUnitByBaseId,saveRulleName,EditRullerName,updatedRulleName,DeleteDrugById,DeleteDrugStand,saveRadio,getDrugSet,getRullerList }  from "@/api/drug/drug"
+ import {getDataConfig } from "@/utils/data";
 export default {
     components:{
         BreadCrumb,
@@ -290,9 +306,11 @@ export default {
             },
             editform:{
               drug_name_id:"",
+              drug_id:""
             },
             rullerList:[],
             editRuleDialogVisible:false,
+            untis:[]
         }
     },
     methods:{
@@ -317,9 +335,17 @@ export default {
           EditRullerName(params).then(response=>{
             if(response.data.state == 1){
               var rullerdetail =  response.data.data.rullerDetail
+              console.log("rullerdetail222",rullerdetail)
               this.form.id = rullerdetail.id
-              this.editform.drug_name_id = rullerdetail.drug_spec
-              this.form.unit = rullerdetail.min_unit
+              this.editform.drug_name_id = rullerdetail.drug_name_id
+              this.editform.drug_id = rullerdetail.drug_id
+              var id = 0
+              for(let i=0;i<this.untis.length;i++){
+                 if(rullerdetail.min_unit == this.untis[i].name){
+                   id = this.untis[i].id
+                 }
+              }
+              this.form.unit = id
               this.form.price = rullerdetail.price
               this.form.drug_stock_limit = rullerdetail.drug_stock_limit
             }
@@ -341,9 +367,11 @@ export default {
           })  
         },
         handleCurrentChange(val){
+          console.log("val===",val)
           this.form.drug_id = val.id
           //获取药品规格名称
-          this.getRulleName(val.drug_name)
+          this.getStandName(val.drug_name)
+          this.getRullerList(val.id)
 
         },
        handleClose(){
@@ -407,6 +435,7 @@ export default {
          getdrugNameList().then(response=>{
            if(response.data.state == 1){
               var list =  response.data.data.list
+              console.log("lsit",list)
               this.tableData = list
             }
          })    
@@ -418,18 +447,15 @@ export default {
 
 
       //获取药品库的规格名称
-       getRulleName(name){
+       getStandName(name){
           const params = {
              name:name
           }
-         getRulleName(params).then(response=>{
+         getStandName(params).then(response=>{
             if(response.data.state == 1){
-              var rulleName = response.data.data.rulleName
-              this.ruleName = rulleName
-             
-              var rullerlist =  response.data.data.rullerList
-             
-              this.rullerList  = rullerlist
+              var ruleName =  response.data.data.rullerlist
+              console.log("ruleName22222",ruleName)
+              this.ruleName  = ruleName
             }
          }) 
        },
@@ -448,7 +474,7 @@ export default {
          getUnitByBaseId(params).then(response=>{
             if(response.data.state == 1){
               var baseList =  response.data.data.baseList
-              this.form.unit = baseList.min_unit
+              this.form.unit = parseInt(baseList.min_unit)
               this.form.drug_stock_limit = baseList.drug_stock_limit,
               this.form.price = baseList.retail_price
               
@@ -468,21 +494,26 @@ export default {
                 drug_name = this.ruleName[i].drug_name
               }
            }
+           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,
              drug_id:this.form.drug_id,
-             unit:this.form.unit,
+             unit:unit,
              price:this.form.price,
              drug_stock_limit:this.form.drug_stock_limit, 
              drug_name:drug_name
            }
-      
          saveRulleName(params).then(response=>{
             if(response.data.state == 1){
               var standName =  response.data.data.RullerName
               this.$message.success("保存成功")
-              this.getRulleName(standName.drug_name)
+              this.getRullerList(standName.drug_id)
               this.ruleDialogVisible = false
               this.form.drug_name_id = ""
               this.form.unit = ""
@@ -504,19 +535,26 @@ export default {
                 drug_name = this.ruleName[i].drug_name
               }
            }
+           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,
-             unit:this.form.unit,
+             unit:unit,
              price:this.form.price,
              drug_stock_limit:this.form.drug_stock_limit, 
              drug_name:drug_name,
              drug_id:this.form.drug_id,
            }
+           
          saveRulleName(params).then(response=>{
             if(response.data.state == 1){
               var RullerName =  response.data.data.RullerName
-              this.getRulleName(RullerName.drug_name)
+              this.getRullerList(RullerName.drug_id)
               this.$message.success("保存成功")
               this.form.drug_name_id = ""
               this.form.unit = ""
@@ -534,23 +572,31 @@ export default {
                 drug_name = this.ruleName[i].drug_name
               }
            }
-
+           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 = {
              id:this.form.id,
              drug_name_id:this.editform.drug_name_id,
              drug_spec:drug_spec,
-             unit:this.form.unit,
+             unit:unit,
              price:this.form.price,
              drug_stock_limit:this.form.drug_stock_limit, 
-             drug_name:drug_name
+             drug_name:drug_name,
+             drug_id:this.editform.drug_id
            }
-         
          updatedRulleName(params).then(response=>{
             if(response.data.state == 1){
                var rullername = response.data.data.RullerName
+               console.log("rullername",rullername)
                this.$message.success("保存成功")
-               this.getRulleName(rullername.drug_name)
+               this.getRullerList(rullername.drug_id)
                this.editRuleDialogVisible = false
+            }else {
+               this.$message.error("药品规格名称已存在")
             }
          })
        },
@@ -566,6 +612,7 @@ export default {
                 id:id,
                 drug_name:drugname
               }
+           
             DeleteDrugById(params).then(response => {
               if (response.data.state == 1) {
                   var msg = response.data.data.msg
@@ -580,20 +627,19 @@ export default {
           })
        },
 
-       DeleteDrugStand(id,index){
+       DeleteDrugStand(id,drug_name,index){
           this.$confirm('确认删除吗?', '删除', {
           confirmButtonText: '确 定',
           cancelButtonText: '取 消',
           type: 'warning'
-        })
-          .then(() => {
-            DeleteDrugStand(id,index).then(response => {
+        }).then(() => {
+            DeleteDrugStand(id,drug_name,index).then(response => {
               if (response.data.state == 1) {
                   var msg = response.data.data.msg
                   this.rullerList.splice(index, 1);
                   this.$message.success("删除成功")
               } else {
-                  this.$message.error("删除失败")
+                  this.$message.error("该药品信息已经为患者添加自备药不能删除")
               }
             })
           })
@@ -621,7 +667,20 @@ export default {
               this.radio  = drugset.drug_start.toString()
             }
          })
-        }
+        },
+        getRullerList(id){
+           const params = {
+             id:id
+           }
+           getRullerList(params).then(response=>{
+             if(response.data.state == 1){
+              this.rullerList =  response.data.data.rullerlist
+             }
+           })
+        },
+      getDataConfig(module, filed_name){
+        return getDataConfig(module, filed_name)
+      },
     },
     created(){
        //获取药品库所有药品名称
@@ -630,7 +689,8 @@ export default {
 
        //获取设置
        this.getDrugSet()
-      
+       this.untis =  getDataConfig('hemodialysis','units')
+       console.log("this.untis2222",this.untis)
      
     },
     watch: {

src/xt_pages/stock/selfPreparedMedicine/query.vue

@@ -103,7 +103,7 @@
 <script>
 import BreadCrumb from "../../components/bread-crumb";
 import { parseTime } from '@/utils'
-import { getAllDrugName,getRulleName,getAllPatientStockList } from "@/api/drug/drug"
+import { getAllMedicalList,getRulleName,getAllPatientStockList } from "@/api/drug/drug"
 const moment = require('moment')
 export default {
     components:{
@@ -162,8 +162,8 @@ export default {
         this.getlist()
       },
 
-      getAllDrugName(){
-        getAllDrugName().then(response=>{
+      getAllMedicalList(){
+        getAllMedicalList().then(response=>{
           if(response.data.state == 1){
              var drugName =  response.data.data.drugName  
              var obj = {
@@ -180,14 +180,22 @@ export default {
           }
         })
       },
-      getRulleName(name){
+      getRulleName(id){
           const params = {
-             name:name
+             id:id
           }
         getRulleName(params).then(response=>{
            if(response.data.state == 1){
-             var rulleName = response.data.data.rulleName
-             this.rulleName = rulleName
+             var rulleName = response.data.data.rullerList
+             var obj = {
+               id:0,
+               drug_spec:"全部"
+             }
+             var arr = []
+             arr.push(obj)
+             arr.push(...rulleName)
+             console.log("rulleName",arr)
+             this.rulleName = arr
            }
         })  
       },
@@ -197,28 +205,32 @@ export default {
       changeDrugName(id){
         var drug_name = ""
         for(let i=0;i<this.drugName.length;i++){
-           if(id == this.drugName[i].id){
+          if(id == this.drugName[i].id){
              drug_name = this.drugName[i].drug_name
-           }
+          }
         }
         this.drug_name = drug_name
-        this.getRulleName(drug_name)
+        this.getRulleName(id)
         this.getlist()
       },
       changeRullName(id){
-        var drug_desc = ""
+        var drug_spec = ""
         for(let i=0;i<this.rulleName.length;i++){
            if(id == this.rulleName[i].id){
-             drug_desc = this.rulleName[i].drug_desc
-           }
+              drug_spec = this.rulleName[i].drug_spec
+            }
         }
-        this.drug_desc = drug_desc
+
+        this.drug_spec = drug_spec
         this.getlist()
       },
       getlist(){
           if(this.drug_name == "全部"){
             this.drug_name = ""
           }
+          if(this.drug_spec == "全部"){
+            this.drug_spec = ""
+          }
           const params = {
             start_time:this.start_time,
             end_time:this.end_time,
@@ -226,10 +238,11 @@ export default {
             drug_spec:this.drug_spec,
             search_input:this.search_input
           }
+         
         getAllPatientStockList(params).then(response=>{
             if(response.data.state == 1){
               var stocklist = response.data.data.stocklist
-              console.log("stocklist3333",stocklist)
+              
               for(let i=0;i<stocklist.length;i++){
                  stocklist[i].index = i+1
                  stocklist[i].Count = 0
@@ -250,7 +263,7 @@ export default {
     },
     created(){
       //获取所有药品名称
-      this.getAllDrugName()
+      this.getAllMedicalList()
 
 
 

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -382,8 +382,6 @@
         <el-row>
           <el-col :span="10">
             <el-form-item label="医嘱内容 :" required prop="advice_name">
-              <!-- <el-input v-model="nameForm.advice_name"></el-input> -->
-
               <el-select
                 v-model="nameForm.advice_name"
                 filterable
@@ -395,10 +393,10 @@
                 @change="changeDrugName"
               >
                 <el-option
-                  v-for="item in medicals"
-                  :key="item.id"
+                  v-for="(item,index) in all_drug"
+                  :key="index"
                   :label="item.drug_name"
-                  :value="item.id"
+                  :value="item.drug_name"
                 ></el-option>
               </el-select>
               
@@ -410,9 +408,7 @@
             <!--</el-form-item>-->
             <el-form-item label="药品规格 :" prop="advice_desc">
               <el-col :span="10">
-                <!-- <el-input v-model="nameForm.advice_desc"></el-input> -->
-
-                <el-select
+                 <el-select
                   v-model="nameForm.advice_desc"
                   filterable
                   clearable
@@ -420,6 +416,7 @@
                   :disabled="isChild"
                   placeholder="请选择(输入可搜索)"
                   style="width:150px"
+                  @change="changeDrugDesc"
                 >
                   <el-option
                     v-for="item in drugSpec"
@@ -645,7 +642,8 @@ export default {
         id: 0,
         children: [],
         way:"",
-        drug_id:""
+        drug_id:"",
+        src_type:""
       },
 
       drugOptions: [],
@@ -666,7 +664,12 @@ export default {
       allSelectedTemplate: [],
       adviceTemplateMaps: {},
       medicals:[],
-      drugSpec:[]
+      drugSpec:[],
+      all_drug:[],
+      current_drug_name:"",
+      current_drug_spec: "",
+      drug_id: 0,
+      src_type:""
     };
   },
   props: {
@@ -853,33 +856,44 @@ export default {
         .catch(() => {});
     },
     submitNameForm(formName) {
-       if(typeof(this.nameForm.advice_name) == "string"){
+     
+      if(this.src_type == ""){
+          this.nameForm.way = 0
+          this.nameForm.drug_id = 0
+       }
+
+       if(this.src_type == 2){ //自备药
+          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 == 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
-      }
+      //     this.nameForm.advice_name = drug_name
+      //     this.nameForm.way = way
+      // }
       var _this = this;
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -2388,88 +2402,123 @@ export default {
       });
     },
 
-     getSelfMedicalList(){
+    rand(min, max) {
+        return Math.floor(Math.random() * (max - min)) + min;
+     },
+    //
+    getSelfMedicalList(){
         const params = {
-          patient_id:this.patientID
+          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
+         if (response.data.state == 1) {
+            this.arr_drug = []
+            var medicalList = response.data.data.private_drug_list
+            var base_drug_list = response.data.data.base_drug_list
+            var base_drug_cofig = response.data.data.base_drug_config
+            var private_drug_cofig = response.data.data.private_drug_config
+
+
+            if(private_drug_cofig != null&&private_drug_cofig.drug_start == 1) {
+
+              for (let i = 0; i < medicalList.length; i++) {
+                if(medicalList[i].drug_specs != null) {
+                  for (let a = 0; a < medicalList[i].drug_specs.length; a++) {
+                    medicalList[i].drug_specs[a]['type'] = 2
+                  }
+                }
+                let obj = {
+                  drug_name: "",
+                  drug_desc: "",
+                  delivery_way: "",
+                  execution_frequency: "",
+                  single_dose: "",
+                  single_dose_unit: "",
+                  prescribing_number: "",
+                  prescribing_number_unit: "",
+                  type_id: "",
+                  type: "",
+                  custom_id: "",
+                  drug_specs: [],
+                }
+
+                medicalList[i].drug_name = medicalList[i].drug_name + "(自备药)"
+                obj.drug_name = medicalList[i].drug_name
+                obj.delivery_way = medicalList[i].delivery_way
+                obj.execution_frequency = medicalList[i].execution_frequency
+                obj.single_dose = medicalList[i].single_dose
+                obj.prescribing_number = medicalList[i].prescribing_number
+                obj.type_id = medicalList[i].id
+                obj.type = 2
+                obj.custom_id = this.rand(10000000, 99999999)
+                obj.drug_specs = medicalList[i].drug_specs
+                this.all_drug.push(obj)
+              }
             }
 
-            drugname.push(...medicalList)
-          
-            this.medicals = drugname
+
+            for (let i = 0; i < base_drug_list.length; i++) {
+              if(base_drug_list[i].drug_specs != null) {
+                for (let a = 0; a < base_drug_list[i].drug_specs.length; a++) {
+                  base_drug_list[i].drug_specs[a]['type'] = 1
+                }
+              }
+                let obj = {
+                  drug_name: "",
+                  drug_desc: "",
+                  delivery_way: "",
+                  execution_frequency: "",
+                  single_dose: "",
+                  single_dose_unit: "",
+                  prescribing_number: "",
+                  prescribing_number_unit: "",
+                  type_id: "",
+                  type: "",
+                  custom_id: "",
+                  drug_specs: [],
+                }
+
+                obj.drug_name = base_drug_list[i].drug_name
+                obj.delivery_way = base_drug_list[i].delivery_way
+                obj.execution_frequency = base_drug_list[i].execution_frequency
+                obj.single_dose = base_drug_list[i].single_dose
+                obj.prescribing_number = base_drug_list[i].prescribing_number
+                obj.type_id = base_drug_list[i].id
+                obj.type = 1
+                obj.custom_id = this.rand(10000000, 99999999)
+                obj.drug_specs = base_drug_list[i].drug_specs
+                this.all_drug.push(obj)
+              }
+            }   
+        })
+       
+    },
+    changeDrugName(name){
+       this.current_drug_name = name
+       this.nameForm.advice_desc = ''
+      this.drugSpec = []
+      for (let i = 0; i < this.all_drug.length; i++) {
+        if (this.all_drug[i].drug_name == name) {
+            this.drugSpec = this.all_drug[i].drug_specs
           }
-      })
+       }
     },
-    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
+    changeDrugDesc(name) {
+        this.current_drug_spec = name
+        for (let i = 0; i < this.drugSpec.length; i++) {
+          if (this.drugSpec[i].drug_spec == name) {
+            this.nameForm.advice_desc = this.drugSpec[i].drug_spec
+            this.nameForm.prescribing_number = this.drugSpec[i].prescribing_number.toString()
+            this.nameForm.single_dose = this.drugSpec[i].single_dose.toString()
+            this.nameForm.delivery_way = this.drugSpec[i].delivery_way.toString()
+            this.nameForm.execution_frequency = this.drugSpec[i].execution_frequency.toString()
+            this.drug_id = this.drugSpec[i].id
+            this.src_type = this.drugSpec[i].type
+            this.nameForm.drug_id = this.drugSpec[i].id
+            this.nameForm.way = this.drugSpec[i].type
+          }
         }
       }
-      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: {
     rowKey: function() {
@@ -2481,7 +2530,7 @@ export default {
   },
   created(){
     //获取自备药
-    this.getSelfMedicalList()
+     this.getSelfMedicalList()
   }
 };
 </script>

src/xt_pages/user/doctorAdvice.vue

@@ -944,26 +944,26 @@
         >
           <el-row>
             <el-col :span="10">
-              <el-form-item label="医嘱内容 :" required prop="advice_name">
+              <el-form-item label="医嘱内容:" required prop="advice_name">
                 <!-- <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>
+                  v-model="nameForm.advice_name"
+                  filterable
+                  clearable
+                  allow-create
+                  :disabled="isChild"
+                  placeholder="请选择(输入可搜索)"
+                  style="width:200px"
+                  @change="changeDrugName"
+                >
+                  <el-option
+                    v-for="(item,index) in all_drug"
+                    :key="index"
+                    :label="item.drug_name"
+                    :value="item.drug_name"
+                  ></el-option>
+                </el-select>
               <!-- <div style="color:red;font-size:12px;">
                 库存不足50
               </div> -->
@@ -975,21 +975,23 @@
                 <el-col :span="12">
                   <!-- <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:190px"
-                  >
+                    v-model="nameForm.advice_desc"
+                    filterable
+                    clearable
+                    allow-create
+                    :disabled="isChild"
+                    placeholder="请选择(输入可搜索)"
+                    style="width:150px"
+                    @change="changeDrugDesc"
+                >
                   <el-option
                     v-for="item in drugSpec"
                     :key="item.id"
                     :label="item.drug_spec"
                     :value="item.drug_spec"
                   ></el-option>
-                 </el-select>  
+                 </el-select>
+
                 </el-col>
                 <el-col class="line" :span="2">&nbsp;</el-col>
                 <el-col :span="6">
@@ -2187,7 +2189,12 @@ export default {
       dataAdvice: [],
       medicals:[],
       patient_id:"",
-      drugSpec:[]
+      drugSpec:[],
+      all_drug:[],
+      current_drug_name:"",
+      current_drug_spec: "",
+      drug_id: 0,
+      src_type:""
     };
   },
   methods: {
@@ -3972,26 +3979,36 @@ export default {
       });
     },
     submitNameForm(formName) {
-      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]
-      }
+
+       if(this.src_type == ""){
+          this.nameForm.way = 0
+          this.nameForm.drug_id = 0
+       }
+
+       if(this.src_type == 2){ //自备药
+          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
+      // this.nameForm.advice_name = drug_name
+      // this.nameForm.way = way
       var _this = this;
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -4352,84 +4369,123 @@ export default {
         const params = {
           patient_id:id
         }
-      console.log("params9999999999",params)
+    
       getSelfMedicalList(params).then(response=>{
-         if(response.data.state == 1){
+         if (response.data.state == 1) {
+            this.arr_drug = []
+            var medicalList = response.data.data.private_drug_list
+            var base_drug_list = response.data.data.base_drug_list
+            var base_drug_cofig = response.data.data.base_drug_config
+            var private_drug_cofig = response.data.data.private_drug_config
 
-            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
+
+            if(private_drug_cofig != null&&private_drug_cofig.drug_start == 1) {
+
+              for (let i = 0; i < medicalList.length; i++) {
+                if(medicalList[i].drug_specs != null) {
+                  for (let a = 0; a < medicalList[i].drug_specs.length; a++) {
+                    medicalList[i].drug_specs[a]['type'] = 2
+                  }
+                }
+                let obj = {
+                  drug_name: "",
+                  drug_desc: "",
+                  delivery_way: "",
+                  execution_frequency: "",
+                  single_dose: "",
+                  single_dose_unit: "",
+                  prescribing_number: "",
+                  prescribing_number_unit: "",
+                  type_id: "",
+                  type: "",
+                  custom_id: "",
+                  drug_specs: [],
+                }
+
+                medicalList[i].drug_name = medicalList[i].drug_name + "(自备药)"
+                obj.drug_name = medicalList[i].drug_name
+                obj.delivery_way = medicalList[i].delivery_way
+                obj.execution_frequency = medicalList[i].execution_frequency
+                obj.single_dose = medicalList[i].single_dose
+                obj.prescribing_number = medicalList[i].prescribing_number
+                obj.type_id = medicalList[i].id
+                obj.type = 2
+                obj.custom_id = this.rand(10000000, 99999999)
+                obj.drug_specs = medicalList[i].drug_specs
+                this.all_drug.push(obj)
+              }
             }
 
-            drugname.push(...medicalList)
-            this.medicals = drugname
-         }
+
+            for (let i = 0; i < base_drug_list.length; i++) {
+              if(base_drug_list[i].drug_specs != null) {
+                for (let a = 0; a < base_drug_list[i].drug_specs.length; a++) {
+                  base_drug_list[i].drug_specs[a]['type'] = 1
+                }
+              }
+                let obj = {
+                  drug_name: "",
+                  drug_desc: "",
+                  delivery_way: "",
+                  execution_frequency: "",
+                  single_dose: "",
+                  single_dose_unit: "",
+                  prescribing_number: "",
+                  prescribing_number_unit: "",
+                  type_id: "",
+                  type: "",
+                  custom_id: "",
+                  drug_specs: [],
+                }
+
+                obj.drug_name = base_drug_list[i].drug_name
+                obj.delivery_way = base_drug_list[i].delivery_way
+                obj.execution_frequency = base_drug_list[i].execution_frequency
+                obj.single_dose = base_drug_list[i].single_dose
+                obj.prescribing_number = base_drug_list[i].prescribing_number
+                obj.type_id = base_drug_list[i].id
+                obj.type = 1
+                obj.custom_id = this.rand(10000000, 99999999)
+                obj.drug_specs = base_drug_list[i].drug_specs
+                this.all_drug.push(obj)
+              }
+            }
+            console.log("999999999",this.all_drug)
+            console.log("medicalist",this.medicalList)
+            console.log("base_drug_list",base_drug_list)
+            console.log("private_drug_config",private_drug_cofig)
+            console.log("base",base_drug_cofig)
       })
     },
-    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
-             } 
-             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
+   changeDrugName(name){
+       this.current_drug_name = name
+       this.nameForm.advice_desc = ''
+      this.drugSpec = []
+      for (let i = 0; i < this.all_drug.length; i++) {
+        if (this.all_drug[i].drug_name == name) {
+            this.drugSpec = this.all_drug[i].drug_specs
           }
-      })
-    }
+       }
+    },
+    changeDrugDesc(name) {
+        this.current_drug_spec = name
+        for (let i = 0; i < this.drugSpec.length; i++) {
+          if (this.drugSpec[i].drug_spec == name) {
+            this.nameForm.advice_desc = this.drugSpec[i].drug_spec
+            this.nameForm.prescribing_number = this.drugSpec[i].prescribing_number.toString()
+            this.nameForm.single_dose = this.drugSpec[i].single_dose.toString()
+            this.nameForm.delivery_way = this.drugSpec[i].delivery_way.toString()
+            this.nameForm.execution_frequency = this.drugSpec[i].execution_frequency.toString()
+            this.drug_id = this.drugSpec[i].id
+            this.src_type = this.drugSpec[i].type
+            this.nameForm.drug_id = this.drugSpec[i].id
+            this.nameForm.way = this.drugSpec[i].type
+          }
+        }
+    },
+    rand(min, max) {
+        return Math.floor(Math.random() * (max - min)) + min;
+    },
   },
   watch: {
     adviceTableData: function() {