1

src/App.vue

@@ -19,14 +19,15 @@ export default {
   },
   
   created(){
-    getOrgs().then(response => {
-      if (response.data.state === 1) {
-        var creator = response.data.data.creator;
-        console.log("creator", creator);
-        
-        // this.getToken(creator.org_id,creator.admin_user_id)
-      }
-    });
+    // getOrgs().then(response => {
+    //   if (response.data.state === 1) {
+    //     var creator = response.data.data.creator;
+    //     console.log("creator", creator);
+    //     sessionStorage.setItem("org_id",creator.org_id);
+    //     sessionStorage.setItem("admin_user_id",creator.admin_user_id);
+    //     this.getToken(creator.org_id,creator.admin_user_id)
+    //   }
+    // });
     
   },
   methods: {

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

@@ -439,7 +439,7 @@
           <el-col :span="8">
             <el-form-item label="医嘱名称：">
               <!-- <el-input v-model="form.advice_name"></el-input> -->
-              <el-select
+              <!-- <el-select
                 v-model="form.advice_name"
                 filterable
                 clearable
@@ -454,7 +454,17 @@
                   :label="item.drug_name"
                   :value="item.drug_name"
                 ></el-option>
-              </el-select>
+              </el-select> -->
+
+              <el-autocomplete
+                style="width:100%;"
+                class="inline-input"
+                v-model="form.advice_name"
+                :fetch-suggestions="querySearch"
+                placeholder="请输入内容"
+                @select="handleSelect"
+                @input="changeDrugName"
+              ></el-autocomplete>
             </el-form-item>
           </el-col>
 
@@ -462,7 +472,7 @@
             <el-form-item label="药品规格：">
               <!-- <el-input v-model="form.advice_desc" style="width: 40%;"></el-input> -->
 
-               <el-select
+               <!-- <el-select
                   v-model="form.advice_desc"
                   filterable
                   clearable
@@ -477,7 +487,17 @@
                     :label="item.drug_spec"
                     :value="item.drug_spec"
                   ></el-option>
-                 </el-select>
+                 </el-select> -->
+                <el-autocomplete
+                  style="width:100px;"
+                  class="inline-input"
+                  v-model="form.advice_desc"
+                  :fetch-suggestions="querySearch1"
+                  placeholder="请输入内容"
+                  @select="handleSelect1"
+                  @input="changeDrugDesc"
+                ></el-autocomplete>
+                 
                 <el-select
                   v-model="form.drug_spec_unit"
                   style="width: 56%;"
@@ -1093,9 +1113,10 @@
           this.groupForm.adviceNames[
             this.nameForm.index
             ].delivery_way = this.nameForm.delivery_way
-          this.groupForm.adviceNames[
-            this.nameForm.index
-            ].execution_frequency = this.nameForm.execution_frequency
+          this.groupForm.adviceNames[this.nameForm.index].execution_frequency = this.nameForm.execution_frequency
+          this.groupForm.adviceNames[this.nameForm.index].drug_name_id = this.nameForm.drug_name_id
+          this.groupForm.adviceNames[this.nameForm.index].way = this.nameForm.way
+          this.groupForm.adviceNames[this.nameForm.index].drug_id = this.nameForm.drug_id
         } else {
           this.groupForm.adviceNames.push(this.nameForm)
         }
@@ -2397,13 +2418,50 @@
             this.src_type = this.drugSpec[i].type
             this.form.drug_id = this.drugSpec[i].id
             this.form.way = this.drugSpec[i].type
-            this.form.drug_name_id = this.drugSpec[i].drug_name_id
+            if(this.drugSpec[i].drug_name_id){
+              console.log("22222",this.drugSpec[i].drug_name_id)
+               this.form.drug_name_id = this.drugSpec[i].drug_name_id
+            }else{
+              this.form.drug_name_id = 0
+            }
+           
           }
         }
       },
       rand(min, max) {
         return Math.floor(Math.random() * (max - min)) + min;
       },
+
+     querySearch(queryString, cb) {
+        console.log('queryString',queryString)
+        var restaurants = this.all_drug;
+        restaurants.map(item => {
+          item.value = item.drug_name
+        })
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+        // 调用 callback 返回建议列表的数据
+        console.log('results',results)
+        cb(results);
+     },
+
+     createFilter(queryString) {
+        return (restaurant) => {
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+        };
+     },
+
+     querySearch1(queryString, cb) {
+        console.log('queryString',queryString)
+        var restaurants = this.drugSpec;
+         console.log(restaurants)
+        restaurants.map(item => {
+          item.value = item.drug_spec
+        })
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+        // 调用 callback 返回建议列表的数据
+        console.log('results',results)
+        cb(results);
+      },
     },
     created() {
       var date = this.$route.query && this.$route.query.date

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

@@ -370,7 +370,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="医嘱内容 :" required prop="advice_name">
-               <el-select
+               <!-- <el-select
                 v-model="nameForm.advice_name"
                 filterable
                 clearable
@@ -386,7 +386,17 @@
                   :label="item.drug_name"
                   :value="item.drug_name"
                 ></el-option>
-              </el-select>
+              </el-select> -->
+
+             <el-autocomplete
+                style="width:100%;"
+                class="inline-input"
+                v-model="nameForm.advice_name"
+                :fetch-suggestions="querySearch"
+                placeholder="请输入内容"
+                @select="handleSelect"
+                @input="changeDrugName"
+              ></el-autocomplete>
             </el-form-item>
             <!-- <div style="margin-left:120px;margin-top:-20px;font-size:12px;color:red">
                库存不足50
@@ -403,7 +413,7 @@
             <el-form-item label="药品规格 :" prop="advice_desc">
               <el-col :span="8">
                 <!-- <el-input v-model="nameForm.advice_desc"></el-input> -->
-                 <el-select
+                 <!-- <el-select
                   v-model="nameForm.advice_desc"
                   filterable
                   clearable
@@ -418,7 +428,18 @@
                     :label="item.drug_spec"
                     :value="item.drug_spec"
                   ></el-option>
-                 </el-select>
+                 </el-select> -->
+
+
+                <el-autocomplete
+                  style="width:100px;"
+                  class="inline-input"
+                  v-model="nameForm.advice_desc"
+                  :fetch-suggestions="querySearch1"
+                  placeholder="请输入内容"
+                  @select="handleSelect1"
+                  @input="changeDrugDesc"
+                ></el-autocomplete>
 
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
@@ -613,9 +634,9 @@ export default {
         index: 0,
         id: 0,
         children: [],
-        drug_id:"",
-        way:"",
-        drug_name_id:"",
+        drug_id:0,
+        way:0,
+        drug_name_id:0,
       },
       submitGroupForm: {
         advice_type: "",
@@ -636,7 +657,7 @@ export default {
         parent_id: 0,
         drug_id:"",
         way:"",
-        drug_name_id:"",
+        drug_name_id:0,
       },
       selectedTemp: { id: 0, name: "", org_id: 0, list: [], rows: [] },
       selectedTemplate: [],
@@ -894,9 +915,9 @@ 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.groupForm.adviceNames[index].children[j].drug_name_id = _this.nameForm.drug_name_id;
+                      // _this.groupForm.adviceNames[index].children[j].drug_id = _this.nameForm.drug_id;
+                      // _this.groupForm.adviceNames[index].children[j].way = _this.nameForm.way;
+                      // _this.groupForm.adviceNames[index].children[j].drug_name_id = _this.nameForm.drug_name_id;
                       _this.$set(_this.groupForm.adviceNames[index].children,j,_this.groupForm.adviceNames[index].children[j]
                      
                       );
@@ -919,9 +940,9 @@ 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.groupForm.adviceNames[index].children[j].drug_name_id = _this.nameForm.drug_name_id;
+                  // _this.groupForm.adviceNames[index].children[j].drug_id = _this.nameForm.drug_id;
+                  // _this.groupForm.adviceNames[index].children[j].way = _this.nameForm.way;
+                  // _this.groupForm.adviceNames[index].children[j].drug_name_id = _this.nameForm.drug_name_id;
                   _this.$set(
                     _this.groupForm.adviceNames,
                     index,
@@ -1063,9 +1084,8 @@ export default {
       this.selectedTemplate = selection;
     },
     selectAdvice(selection, row) {
-      // this.selectedTemplate = [];
-
-      // console.log(selection);
+     
+     console.log("row",row)
 
       var adviceArray = this.adviceTemplateMaps[this.selectedTemp.id]
         .DoctorAdviceTemplate;
@@ -1455,6 +1475,7 @@ export default {
       this.templateFormVisible = true;
     },
     selectGroupAdvice(row) {
+      console.log("row-----",row)
       this.groupSelectRow = row;
     },
     groupClassName({ row, rowIndex }) {
@@ -1487,8 +1508,8 @@ export default {
       this.adminusername = xtuser.user.user_name;
     },
     selectAllTemplateAdvice(selection) {
-      var adviceArray = this.adviceTemplateMaps[this.selectedTemp.id]
-        .DoctorAdviceTemplate;
+      console.log("params",selection)
+      var adviceArray = this.adviceTemplateMaps[this.selectedTemp.id].DoctorAdviceTemplate;
       for (let y = 0; y < adviceArray.length; y++) {
         adviceArray[y].selection = false;
       }
@@ -1639,7 +1660,38 @@ export default {
            
           }
         }
-      }
+      },
+
+     querySearch(queryString, cb) {
+        console.log('queryString',queryString)
+        var restaurants = this.all_drug;
+        restaurants.map(item => {
+          item.value = item.drug_name
+        })
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+        // 调用 callback 返回建议列表的数据
+        console.log('results',results)
+        cb(results);
+     },
+
+     createFilter(queryString) {
+        return (restaurant) => {
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+        };
+     },
+
+     querySearch1(queryString, cb) {
+        console.log('queryString',queryString)
+        var restaurants = this.drugSpec;
+         console.log(restaurants)
+        restaurants.map(item => {
+          item.value = item.drug_spec
+        })
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+        // 调用 callback 返回建议列表的数据
+        console.log('results',results)
+        cb(results);
+      },
   },
   watch: {
     "selectedTemp.list": function() {

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

@@ -370,7 +370,7 @@
           <el-col :span="10">
             <el-form-item label="医嘱内容 :" required prop="advice_name">
               <!-- <el-input v-model="nameForm.advice_name"></el-input> -->
-               <el-select
+               <!-- <el-select
                 v-model="nameForm.advice_name"
                 filterable
                 clearable
@@ -386,8 +386,19 @@
                   :label="item.drug_name"
                   :value="item.drug_name"
                 ></el-option>
-              </el-select>
+              </el-select> -->
+
+              <el-autocomplete
+                style="width:100%;"
+                class="inline-input"
+                v-model="nameForm.advice_name"
+                :fetch-suggestions="querySearch"
+                placeholder="请输入内容"
+                @select="handleSelect"
+                @input="changeDrugName"
+              ></el-autocomplete>
             </el-form-item>
+           
           </el-col>
           <el-col :span="14">
             <!--<el-form-item label="规格 :" prop="advice_desc">-->
@@ -396,7 +407,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
@@ -412,7 +423,17 @@
                     :label="item.drug_spec"
                     :value="item.drug_spec"
                   ></el-option>
-                 </el-select>
+                 </el-select> -->
+
+                 <el-autocomplete
+                  style="width:100px;"
+                  class="inline-input"
+                  v-model="nameForm.advice_desc"
+                  :fetch-suggestions="querySearch1"
+                  placeholder="请输入内容"
+                  @select="handleSelect1"
+                  @input="changeDrugDesc"
+                ></el-autocomplete>
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
               <el-col :span="10">
@@ -2271,6 +2292,7 @@ export default {
       }
     },
     SaveEditAdvices() {
+      console.log("aaa")
       const params = {
         start_time: this.groupForm.start_time,
         groupno: this.groupForm.groupno,
@@ -2404,6 +2426,36 @@ export default {
     rand(min, max) {
         return Math.floor(Math.random() * (max - min)) + min;
      },
+     querySearch(queryString, cb) {
+       
+        var restaurants = this.all_drug;
+        restaurants.map(item => {
+          item.value = item.drug_name
+        })
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+        // 调用 callback 返回建议列表的数据
+     
+        cb(results);
+     },
+
+     createFilter(queryString) {
+        return (restaurant) => {
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+        };
+     },
+
+     querySearch1(queryString, cb) {
+        console.log('queryString',queryString)
+        var restaurants = this.drugSpec;
+         console.log(restaurants)
+        restaurants.map(item => {
+          item.value = item.drug_spec
+        })
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+        // 调用 callback 返回建议列表的数据
+        console.log('results',results)
+        cb(results);
+      },
   },
   watch: {
     "selectedTemp.list": function() {

src/xt_pages/outpatientDoctorStation/components/advice.vue

@@ -13,7 +13,7 @@
                 <el-form-item class="width50" label="开嘱时间 : " prop="name">
                     张三
                 </el-form-item>
-                <el-form-item label="医嘱内容 : " prop="name" style="width:100%;">
+                <el-form-item label="医嘱内容: " prop="name" style="width:100%;">
                     <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="textarea"></el-input>
                 </el-form-item>
                 <el-form-item class="width50" label="药品规格 : " prop="name">

src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue

@@ -70,7 +70,7 @@
       </div>
       <div style="padding-left:10px;flex:1">
         <div class="tableTitle">统计表</div>
-        <el-table :data="DialysisData" style="width: 100%" border :row-style="{ color: '#303133' }"
+        <el-table :data="DialysisData" style="width: 100%" border :row-style="{ color: '#303133' }" 
         :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
         >
           <el-table-column prop="name" label="姓名" width="140">
@@ -84,7 +84,8 @@
           </el-table-column>
           <el-table-column prop="mode_id" label="透析模式">
               <template slot-scope="scope">
-                <span>{{ scope.row.mode_id.join("、")}}</span>
+                <!-- <span>{{ scope.row.mode_id.join("、") }}</span> -->
+                <span>{{getModeIdCount(scope.row.patient_id)}}</span>
               </template>
            </el-table-column>
           <el-table-column prop="address" label="透析总次数" width="140">
@@ -140,7 +141,7 @@ export default {
           let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
           return time.getTime() > Date.now() || time.getTime() < threeMonths;;
         }
-      },
+      }, 
       patient_id:0,
       modeIdCount:[],
     };
@@ -154,7 +155,7 @@ export default {
       } else {
         this.getDialysisList()
       }
-
+      
     },
     changeEndTime(val) {
       var time =
@@ -194,13 +195,13 @@ export default {
          if(response.data.state === 1){
           var list = response.data.data.list
           var totallist  =  response.data.data.totallist
-          this.total = totallist
+          this.total = totallist  
           var prescriptionList = response.data.data.prescriptionList
-
+         
           this.getModeId(prescriptionList)
           var count = response.data.data.count
           this.DialysisCount = count
-
+          
           var modeIdCount = response.data.data.modeIdCount
           console.log("modeidcount=====",modeIdCount)
           for(let i=0;i<modeIdCount.length;i++){
@@ -279,7 +280,7 @@ export default {
             }
           })
           let list = Object.values(dataInfo)
-          // console.log("arr",list)
+          // console.log("arr",list)    
           list.map(item => {
             for (let i = 0; i < prescriptionList.length; i++) {
               if (item.patient_id === prescriptionList[i].patient_id) {
@@ -346,7 +347,7 @@ export default {
          }
        })
       }
-
+    
     },
     unique(arr) {
         const res = new Map();
@@ -380,7 +381,7 @@ export default {
             // console.log("total",total)
           }
        })
-
+     
     },
     getModeId(patients){
       for(let i=0;i<patients.length;i++){
@@ -456,10 +457,10 @@ export default {
         }
         let str = ''
         arr.map(item => {
-          str += item.mode_id + '(' + item.Count + '次) 、'
+          str += item.mode_id + '(' + item.Count + '次) 、' 
         })
         var strs = str.substring(0, str.length - 1)
-
+       
         return strs
       }
   },
@@ -484,7 +485,7 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-
+    
      //获取该机构下的所有患者
      this.getCurrentOrgPatients()
      //统计列表

src/xt_pages/stock/selfPreparedMedicine/index.vue

@@ -26,16 +26,6 @@
                 value-format="yyyy-MM-dd"
                 @change="changeStartime"
                 ></el-date-picker>
-                <!-- <el-select v-model="value" placeholder="请选择">
-                    <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select> -->
-                <!-- <el-input style="width: 180px;margin:0 10px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/> -->
-                <!-- <el-button class="filter-item" type="primary" icon="el-icon-search" @click="searchAction">搜索</el-button> -->
                  <el-autocomplete
                   style="margin:16px 5px"
                   popper-class="my-autocomplete"
@@ -146,6 +136,7 @@ import medicineDetail from "./components/medicineDetail"
 import warehousing from "./components/warehousing"
 import warehouseOut from "./components/warehouseOut"
 const moment = require('moment')
+import { PostSearch } from '@/api/patient'
 import { getCurrentPatient,saveRadio,getStockList,DeleteDrugNameById,getDrugSet } from "@/api/drug/drug"
 export default {
     components:{
@@ -358,21 +349,21 @@ export default {
             key = keyword
           }
           let searchArray = []
-          getCurrentPatient(key).then(response => {
+          PostSearch(key).then(response => {
             if (response.data.state == 1) {
               searchArray = response.data.data.patient
+              console.log("searchArray",searchArray)
+           
               cb(searchArray)
             }
           })
           return searchArray
         },
         handleSelect(val){
-          console.log("val",val.id)
-          console.log("2222",this.tablePatient)
+          console.log("val",val)
           this.search_input = val.name
           for(let i=0;i<this.tablePatient.length;i++){
              if(this.tablePatient[i].id == val.id){
-               console.log("建立")
                this.$refs.monthlyPlanTable.setCurrentRow(this.tablePatient[i])
              }
           }

src/xt_pages/stock/selfPreparedMedicine/query.vue

@@ -83,17 +83,17 @@
                 <el-table-column align="center" prop="name" label="规格名称">
                     <template slot-scope="scope">{{ scope.row.drug_spec }}</template>
                 </el-table-column>
-                <el-table-column align="center" prop="name" label="单位" width="80">
+                <!-- <el-table-column align="center" prop="name" label="单位" width="80">
                     <template slot-scope="scope">{{ scope.row.min_unit }}</template>
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column align="center" prop="name" label="自备量" width="80">
-                    <template slot-scope="scope">{{ scope.row.Total }}</template>
+                    <template slot-scope="scope">{{ scope.row.Total?scope.row.Total:0 }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="已使用" width="80">
                     <template slot-scope="scope">{{ scope.row.Count }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="剩余" width="80">
-                    <template slot-scope="scope">{{ scope.row.Total - scope.row.Count }}</template>
+                    <template slot-scope="scope">{{ scope.row.Total?scope.row.Total:0 - scope.row.Count }}</template>
                 </el-table-column>
             </el-table>
         </div>
@@ -121,11 +121,11 @@ export default {
             search_input:"",
             options:[],
             value:"",
-            // start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
-            // end_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
-            start_time:"",
-            end_time:"",
-            drug_name:0,
+            start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+            end_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+            // start_time:"",
+            // end_time:"",
+            drug_name:"",
             drug_spec:"",
             drugName:[],
             rulleName:[]
@@ -137,8 +137,8 @@ export default {
         },
         exportList(){
          import('@/vendor/Export2Excel').then(excel => {
-         const tHeader = ['序号', '透析号', '姓名','药品名称','规格名称','单位','自备量','已使用','剩余']
-         const filterVal = ['index', 'dialysis_no', 'name','drug_name','drug_spec','min_unit','Total','Count','margin']
+         const tHeader = ['序号', '透析号', '姓名','药品名称','规格名称','自备量','已使用','剩余']
+         const filterVal = ['index', 'dialysis_no', 'name','drug_name','drug_spec','Total','Count','margin']
          for(let i=0;i<this.tableData.length;i++){
             this.tableData[i].margin = this.tableData[i].Total - this.tableData[i].Count
          }
@@ -258,16 +258,24 @@ export default {
               }
               var outStockList =  response.data.data.outStockList
 
-              
-              for(let i=0;i<stocklist.length;i++){
-                for(let j=0;j<outStockList.length;j++){
-                   if(stocklist[i].patient_id == outStockList[j].patient_id &&stocklist[i].drug_name == outStockList[j].drug_name && stocklist[i].drug_spec == outStockList[j].drug_spec){
-                       stocklist[i].Count = outStockList[j].Count
-                   }
-                }
+              // for(let i=0;i<stocklist.length;i++){
+              //   for(let j=0;j<outStockList.length;j++){
+              //      if(stocklist[i].patient_id == outStockList[j].patient_id &&stocklist[i].drug_name == outStockList[j].drug_name && stocklist[i].drug_spec == outStockList[j].drug_spec){
+              //          stocklist[i].Count = outStockList[j].Count
+              //      }
+              //   }
+              // }
+
+             for(let i=0;i<outStockList.length;i++){
+                 for(let j=0;j<stocklist.length;j++){
+                     if(outStockList[i].patient_id == stocklist[j].patient_id &&outStockList[i].drug_name == stocklist[j].drug_name && outStockList[i].drug_spec == stocklist[j].drug_spec){
+                      outStockList[i].Total = stocklist[j].Total
+                   } 
+                 }
               }
 
-              this.tableData = stocklist
+
+              this.tableData = outStockList
             }
         })   
       }

src/xt_pages/stock/selfPreparedMedicine/queryPrint.vue

@@ -26,7 +26,7 @@
                                     <td width="80">姓名</td>
                                     <td>药品名称</td>
                                     <td>规格名称</td>
-                                    <td width="70">单位</td>
+                                    <!-- <td width="70">单位</td> -->
                                     <td width="70">自备量</td>
                                     <td width="70">已使用</td>
                                     <td width="70">剩余</td>
@@ -39,10 +39,10 @@
                                     <td>{{item.name}}</td>
                                     <td>{{item.drug_name}}</td>
                                     <td>{{item.drug_spec}}</td>
-                                    <td>{{item.min_unit}}</td>
-                                    <td>{{item.store_number}}</td>
+                                    <!-- <td>{{item.min_unit}}</td> -->
+                                    <td>{{item.Total?item.Total:0}}</td>
                                     <td>{{item.Count}}</td>
-                                    <td>{{item.store_number - item.Count}}</td>
+                                    <td>{{item.Total?item.Total:0 - item.Count}}</td>
                                 </tr>
                             </tbody>
                         </table>
@@ -97,6 +97,7 @@ export default {
             drug_spec:this.drug_spec,
             search_input:this.keyword
           }
+        console.log("params------",params)
         getAllPatientStockList(params).then(response=>{
             if(response.data.state == 1){
               var stocklist = response.data.data.stocklist
@@ -105,15 +106,23 @@ export default {
                  stocklist[i].Count = 0
               }
               var outStockList =  response.data.data.outStockList
-              for(let i=0;i<stocklist.length;i++){
-                for(let j=0;j<outStockList.length;j++){
-                   if(stocklist[i].patient_id == outStockList[j].patient_id &&stocklist[i].drug_name == outStockList[j].drug_name && stocklist[i].drug_spec == outStockList[j].drug_spec){
-                       stocklist[i].Count = outStockList[j].Count
-                   }
-                }
+              // for(let i=0;i<stocklist.length;i++){
+              //   for(let j=0;j<outStockList.length;j++){
+              //      if(stocklist[i].patient_id == outStockList[j].patient_id &&stocklist[i].drug_name == outStockList[j].drug_name && stocklist[i].drug_spec == outStockList[j].drug_spec){
+              //          stocklist[i].Count = outStockList[j].Count
+              //      }
+              //   }
+              // }
+
+            for(let i=0;i<outStockList.length;i++){
+                 for(let j=0;j<stocklist.length;j++){
+                     if(outStockList[i].patient_id == stocklist[j].patient_id &&outStockList[i].drug_name == stocklist[j].drug_name && outStockList[i].drug_spec == stocklist[j].drug_spec){
+                      outStockList[i].Total = stocklist[j].Total
+                   } 
+                 }
               }
-              console.log("stocklist99999",stocklist)
-              this.tableData = stocklist
+              console.log("stocklist99999",outStockList)
+              this.tableData = outStockList
             }
         })   
       }

src/xt_pages/user/components/PatientSidebar.1.vue

@@ -155,7 +155,8 @@ export default {
             break
         }
         return sex
-      }, querySearchAsync(keyword, cb) {
+      },
+       querySearchAsync(keyword, cb) {
         let key = ''
         if (keyword != undefined) {
           key = keyword
@@ -170,7 +171,8 @@ export default {
             cb([])
           }
         })
-      }, handleSelect(val) {
+      },
+       handleSelect(val) {
         this.$router.push('/patients/patient/' + val.id)
       }
 

src/xt_pages/user/doctorAdvice.vue

@@ -2299,7 +2299,7 @@ export default {
             adviceNames: [],
             advice_doctor: this.groupForm.advice_doctor,
             remark: this.groupForm.remark,
-            parent_id: this.groupForm.parent_id
+            parent_id: this.groupForm.parent_id,
           };
           console.log("22222",submitForm)
           console.log("33333",this.private_drug_config.drug_start)
@@ -2325,17 +2325,21 @@ export default {
           } else if (this.groupForm.advice_type == 3) {
             mode = "1-1";
           }
-          
+        console.log("22222222",this.medicals)
+        console.log("3333333",submitForm)
+      
         if(this.private_drug_config.drug_start == 1){
               for(let index=0;index<submitForm.adviceNames.length;index++){
                   for(let i=0;i<this.medicals.length;i++){
                     if(submitForm.adviceNames[index].drug_id == this.medicals[i].drug_name_id){
                         submitForm.adviceNames[index].way = 2
+                        submitForm.adviceNames[index].drug_name_id = this.medicals[i].drug_name_id
                     }
                   }
               }
           }
-          console.log("this.===",submitForm)
+          console.log("模板数据",submitForm)
+        
           CreateNewGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -2642,6 +2646,7 @@ export default {
           prescribing_number_unit: this.groupSelectRow.prescribing_number_unit,
           way:this.groupSelectRow.way,
           drug_id:this.groupSelectRow.drug_id,
+          drug_name_id:this.groupSelectRow.drug_name_id,
           delivery_way: this.isChild ? "" : this.groupSelectRow.delivery_way,
           execution_frequency: this.isChild
             ? ""
@@ -2684,7 +2689,8 @@ export default {
           children: [],
           parent_row: 0,
           way:"",
-          drug_id:''
+          drug_id:'',
+          drug_name_id:0,
         };
         this.nameFormTitle = "新增医嘱内容";
       }
@@ -3007,6 +3013,7 @@ export default {
           day_count: groups[index].day_count,
           week_day: groups[index].week_day,
           drug_id:groups[index].drug_id,
+          drug_name_id:groups[index].drug_name_id,
           wary:groups[index].way,
           isEdit: 0,
           index: 0,
@@ -3016,6 +3023,7 @@ export default {
           row_key: this.rowKey,
           table: []
         };
+        console.log("itme-----------",item)
         if (item.id in childMap) {
           for (const key in childMap[item.id]) {
             this.rowKey++;
@@ -3034,6 +3042,7 @@ export default {
               execution_frequency: childMap[item.id][key].execution_frequency,
               drug_id:childMap[item.id][key].drug_id,
               way:childMap[item.id][key].way,
+              drug_name_id:childMap[item.id][key].drug_name_id,
               isEdit: 0,
               index: 0,
               id: childMap[item.id][key].id,
@@ -3686,6 +3695,7 @@ export default {
             ].frequency_type,
             drug_id:this.adviceTemplateMaps[mapid].drug_id,
             way:this.adviceTemplateMaps[mapid].way,
+            drug_name_id:this.adviceTemplateMaps[mapid].way,
             isEdit: 0,
             id: 0,
             children: [],
@@ -3718,6 +3728,7 @@ export default {
                 execution_frequency: children[key].execution_frequency,
                 drug_id:children[key].drug_id,
                 way:children[key].way,
+                drug_name_id:children[key].drug_name_id,
                 isEdit: 0,
                 id: 0,
                 children: [],
@@ -3775,6 +3786,7 @@ export default {
               template_id: "T" + adviceTemplate.DoctorAdviceTemplate[index].id,
               drug_id: adviceTemplate.DoctorAdviceTemplate[index].drug_id,
               way:adviceTemplate.DoctorAdviceTemplate[index].way,
+              drug_name_id:adviceTemplate.DoctorAdviceTemplate[index].drug_name_id,
               isEdit: 0,
               id: 0,
               children: [],
@@ -3808,6 +3820,7 @@ export default {
                   execution_frequency: children[key].execution_frequency,
                   drug_id:children[key].drug_id,
                   way:children[key].way,
+                  drug_name_id:children[key].drug_name_id,
                   isEdit: 0,
                   id: 0,
                   children: [],
@@ -3865,6 +3878,7 @@ export default {
           week_days: this.allSelectedTemplate[index].week_days,
           drug_id:this.allSelectedTemplate[index].drug_id,
           way:this.allSelectedTemplate[index].way,
+          drug_name_id:this.allSelectedTemplate[index].drug_name_id,
           isEdit: 0,
           id: 0,
           children: [],
@@ -3892,6 +3906,7 @@ export default {
                 execution_frequency: children[key].execution_frequency,
                 drug_id:children[key].drug_id,
                 way:children[key].way,
+                drug_name_id:children[key].way,
                 isEdit: 0,
                 id: 0,
                 children: [],
@@ -3991,6 +4006,7 @@ export default {
                     execution_frequency: children[key].execution_frequency,
                     drug_id:children[key].drug_id,
                     way:children[key].way,
+                    drug_name_id:children[key].way,
                     isEdit: 0,
                     id: 0,
                     children: [],
@@ -4051,6 +4067,7 @@ export default {
                       _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,
@@ -4387,7 +4404,7 @@ export default {
         const params = {
           patient_id:id
         }
-    
+      console.log("params-----",params)
       getSelfMedicalList(params).then(response=>{
          if (response.data.state == 1) {
             this.arr_drug = []
@@ -4470,6 +4487,7 @@ export default {
             }
 
             this.private_drug_config = response.data.data.private_drug_config
+            console.log("medicals",medicalList)
             this.medicals = medicalList
           
       })
@@ -4497,6 +4515,9 @@ export default {
             this.src_type = this.drugSpec[i].type
             this.nameForm.drug_id = this.drugSpec[i].id
             this.nameForm.way = this.drugSpec[i].type
+            if(this.drugSpec[i].drug_name_id){
+               this.nameForm.drug_name_id = 0
+            }
           }
         }
     },