新分支

src/api/role/admin.js

@@ -276,10 +276,10 @@ export function getEnterPriseDetail(params){
 }
 
 export function UploadPrintOrder(data){
-  
+  console.log("DATAOWOWOWOW",data)
   return request({
     url:"/api/device/uploadprintorder",
-    method:"Post",
+    method:"post",
     data:data,
   })
 }

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -110,7 +110,8 @@
           org_template_info.template_id == 50 ||
           org_template_info.template_id == 52 ||
           org_template_info.template_id == 53  ||
-          org_template_info.template_id == 64 )
+          org_template_info.template_id == 64 ||
+          org_template_info.template_id == 199 )
         "
       >
       <div>
@@ -1309,6 +1310,12 @@
             v-if="org_template_info.template_id == 68"
           >
           </DialysisPrintOrderSixtyeight>
+
+          <DialysisPrintOrderZero
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 199"
+          >
+          </DialysisPrintOrderZero>
         </div>
       </el-container>
     </div>
@@ -1395,6 +1402,7 @@ import DialysisPrintOrderSixtyFive from "./template/DialysisPrintOrderSixtyFive.
 import DialysisPrintOrderSixtysix from './template/DialysisPrintOrderSixtysix.vue'
 import DialysisPrintOrdersixtySeven from './template/DialysisPrintOrdersixtySeven.vue'
 import DialysisPrintOrderSixtyeight from './template/DialysisPrintOrderSixtyeight.vue'
+import DialysisPrintOrderZero from './template/DialysisPrintOrderZero.vue'
 export default {
   name: "dialysisPrintOrder",
   components: {
@@ -1466,6 +1474,7 @@ export default {
     DialysisPrintOrderSixtyFive,
     DialysisPrintOrderSixtysix,
     DialysisPrintOrderSixtyeight,
+    DialysisPrintOrderZero,
     LabelBox,
     BreadCrumb,
     // DialysisPrintOrderSixtyFive
@@ -2016,17 +2025,13 @@ export default {
           style: style2,
           scanStyles: false,
         });
-      }else if (
-        this.org_template_info.template_id == 64
-      ) {
+      }else if (this.org_template_info.template_id == 64 ) {
         printJS({
           printable: "dialysis-print-box-64",
           type: "html",
           style: style12,
           scanStyles: false,
         });
-
-
         console.log("printjswowoowowowwoow",style12)
 
       }else if (this.org_template_info.template_id == 65 || this.org_template_info.template_id == 6) {
@@ -2093,6 +2098,15 @@ export default {
           style: style2,
           scanStyles: false,
         });
+      }else if (this.org_template_info.template_id == 199 ) {
+        printJS({
+          printable: "dialysis-print-box-64",
+          type: "html",
+          style: style12,
+          scanStyles: false,
+        });
+       
+
       }
     },
     printThisOnePage() {
@@ -2220,6 +2234,15 @@ export default {
           style: style93,
           scanStyles: false,
         });
+      }else if (this.org_template_info.template_id == 199 ) {
+        printJS({
+          printable: "dialysis-print-box-64",
+          type: "html",
+          style: style12,
+          scanStyles: false,
+        });
+        console.log("printjswowoowowowwoow",style12)
+
       }
     },
 
@@ -2280,7 +2303,7 @@ export default {
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state == 1) {
           this.childResponse = response;
-          console.log('this.org_template_info是数据',response.data.data);
+          console.log('this.org_template_info是数据',response.data.data.org_template_info.template_id);
           this.org_template_info = response.data.data.org_template_info;
           this.loading = false;
           //   this.adminUser = response.data.data.users
@@ -2928,7 +2951,7 @@ export default {
     },
   },
   created() {
-    // console.log("hhahahhahahahah=======",this.org_template_info.template_id)
+    console.log("hhahahhahahahah=======",this.org_template_info.template_id)
     console.log("this.$store.getters.xt_user.org.id",this.$store.getters.xt_user.org.id)
     var schedule_type_selected = this.$store.getters.schedule_type_selected;
     var zone_selected = this.$store.getters.zone_selected;

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -39,6 +39,14 @@
           </template>
        </el-autocomplete>
        <el-button type="primary" @click="toSeach">搜索</el-button>
+
+       
+      </div>
+      <div class="filter-container">
+      <el-input style="width:200px" placeholder="请输入药品名称" v-model="keyword"></el-input>
+       <el-button type="primary" @click="toSeachOne">搜索</el-button>
+
+       
       </div>
       <div class="cell clearfix">
         <label class="title">
@@ -830,6 +838,7 @@ export default {
       execution_frequency:"",
       zoneIdList:[],
       partion_str:"",
+      keyword:"",
     };
   },
   created() {
@@ -959,7 +968,7 @@ export default {
          var schedule_type = this.listQuery.schedul_type
          var partition_type = this.listQuery.partition_type
        
-        getNewSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id,excution_way:this.excution_way,cost_type:this.costType,execution_frequency:nameOne}).then(rs => {
+        getNewSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id,excution_way:this.excution_way,cost_type:this.costType,execution_frequency:nameOne,keyword:this.keyword}).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
             this.admin_users = resp.data.adminUser
@@ -1556,6 +1565,9 @@ export default {
        this.patient_id = 0
        this.requestSchedualDoctors(this.time)
      },
+     toSeachOne(){
+      this.requestSchedualDoctors(this.time)
+     },
      toExcution(){
 
        if(this.selecting_schs.length ==0){

src/xt_pages/dialysis/patientDoctorAdvice.vue

@@ -0,0 +1,403 @@
+<template>
+    <div class="main-contain">
+       <div class="position">
+         <bread-crumb :crumbs="crumbs"></bread-crumb>
+        
+       </div>
+       <div class="app-container">
+         <div class="filter-container">
+            <el-form :inline="true" :model="listQuery">
+                <el-form-item label>
+
+                <!-- <el-autocomplete
+                    class="checkSearch"
+                    popper-class="my-autocomplete"
+                    v-model.trim="listQuery.search"
+                    :fetch-suggestions="querySearchAsync"
+                    :trigger-on-focus="false"
+                    placeholder="病人透析号/姓名"
+                    @select="handleSelect"
+                    style="width:160px;"
+                    >
+                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                    <template slot-scope="{ item }">
+                        <div class="name">{{ item.name }}</div>
+                    </template>
+                </el-autocomplete> -->
+                <el-input v-model="listQuery.search" style="width: 200px;" placeholder="请输入患者姓名或透析号"></el-input>
+                <el-button type="primary" size="small" @click="toSeach">搜索</el-button>
+                </el-form-item>
+            </el-form>
+
+            <label class="title" style="text-align:left;">
+              <span class="name">日期查询</span> :
+            </label>
+            <el-date-picker
+                v-model="listQuery.start_time"
+                prefix-icon="el-icon-date"
+                @change="changeTime"
+                :editable="false"
+                style="width: 196px;"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+            ></el-date-picker>
+            <span class>-</span>
+            <el-date-picker
+                v-model="listQuery.end_time"
+                prefix-icon="el-icon-date"
+                @change="changeEndTime"
+                :editable="false"
+                style="width: 196px;"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+            ></el-date-picker>
+
+            <el-container>
+                <div style="width:160px">
+                    <div class="tableTitle" style="margin-bottom: 10px;">患者列表</div>
+                    <el-table :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
+                    :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                    highlight-current-row
+                    @current-change="handleChange"
+                    ref="singleTable"
+                    >
+                    <el-table-column prop="dialysis_no" label="透析号" width="70">
+                        <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
+                    </el-table-column>
+                    <el-table-column prop="name" label="姓名" width="90">
+                        <template slot-scope="scope">{{ scope.row.name }}</template>
+                    </el-table-column>
+                    </el-table>
+                </div>
+                <div style="padding-left:10px;flex:1">
+                  <div class="tableTitle" style="margin-top: 10px;margin-bottom: 10px;">统计表</div>
+                  <div>
+                    <el-button type="primary" @click="exportList" style="margin-bottom: 10px;">导出</el-button>
+                    <el-table 
+                     :data="DialysisData" style="width: 100%" border :row-style="{ color: '#303133' }"
+                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                     highlight-current-row
+                     
+                      >
+                            <el-table-column  label="医嘱名称" min-width="200" align="center">
+                               <template slot-scope="scope">
+                                   {{ scope.row.advice_name }}
+                               </template>
+                            </el-table-column>
+                            <!-- <el-table-column  label="生产厂家" width="140">
+                                <template slot-scope="scope">
+                                 
+                                </template>
+                            </el-table-column> -->
+                            <el-table-column  label="规格" min-width="200" align="center">
+                                <template slot-scope="scope">
+                                    {{ scope.row.specification_name }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column  label="数量" min-width="200" align="center">
+                                <template slot-scope="scope">
+                                   {{ getCount(scope.row.child) }}
+                                </template>
+                                
+                            </el-table-column>
+                          
+                     </el-table>
+
+                    <el-pagination
+                    align="right"
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange"
+                    :current-page="listQuery.page"
+                    :page-sizes="[20, 40, 60, 80, 100,200,300,500,1000]"
+                    :page-size="10"
+                    background
+                    style="margin-top:20px;"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="total"
+                    ></el-pagination>
+                   </div>
+                </div>
+            </el-container>
+         </div>
+      </div> 
+    </div>
+</template>
+<script>
+    import {getPatientsByName,getDocAdviceByPatientId} from '@/api/advice'
+    import BreadCrumb from "@/xt_pages/components/bread-crumb";
+    export default {
+        components: {
+             BreadCrumb
+         }, 
+        data(){
+          
+          return{
+            crumbs: [
+              { path: false, name: "透析管理" },
+              { path: false, name: "药品统计" }
+           ], 
+           listQuery:{
+            search:"",
+            start_time:"",
+            end_time:"",
+            page:1,
+            limit:10,
+           },
+           patientsData:[],
+           DialysisData:[],
+           total:0,
+           patient_id:0
+          }
+         
+        },
+        created(){
+            var nowDate = new Date();
+            var nowYear = nowDate.getFullYear();
+            var nowMonth = nowDate.getMonth() + 1;
+            var nowDay = nowDate.getDate();
+            this.listQuery.end_time = nowYear +"-" +(nowMonth < 10 ? "0" + nowMonth : nowMonth) +"-" +(nowDay < 10 ? "0" + nowDay : nowDay);
+            nowDate.setMonth(nowDate.getMonth() - 1);
+            nowYear = nowDate.getFullYear();
+            nowMonth = nowDate.getMonth() + 1;
+            nowDay = nowDate.getDate();
+            this.listQuery.start_time = nowYear + "-" + (nowMonth < 10 ? "0" + nowMonth : nowMonth) +"-" +(nowDay < 10 ? "0" + nowDay : nowDay);
+
+            //获取该机构下的所有患者
+           this.getPatientsByName()
+          },
+        methods:{
+            getPatientsByName(){
+                  var keyword = this.listQuery.search
+                  var params = {
+                    keyword:keyword,
+                  }
+                getPatientsByName(params).then(response=>{
+                    if(response.data.state == 1){
+                    var patients = response.data.data.patients
+                    
+                    this.patientsData = patients
+                     
+                    
+                    this.$nextTick(()=>{
+                        // 别忘了标签上定义ref  这里的 myTable就说获取的标签上的ref命的名
+                        this.$refs.singleTable.setCurrentRow(this.patientsData[0])
+                    })
+                    
+                   
+                    }
+                })
+             },
+            handleSelect(){
+
+            },
+            changeTime(){
+              this.handleChange(this.patient_id)
+            },
+            changeEndTime(){
+              this.handleChange(this.patient_id)
+            },
+            handleSizeChange(){
+
+            },
+            handleCurrentChange(){
+
+            },
+            exportList(){
+                var params = {
+                  patient_id:0,
+                  start_time:this.listQuery.start_time,
+                  end_time:this.listQuery.end_time,
+                  limit:this.listQuery.limit,
+                  page:this.listQuery.page,
+                }
+                console.log("paramswowowoow",params)
+                
+              getDocAdviceByPatientId(params).then(response=>{
+                  if(response.data.state == 1){
+                    var list =  response.data.data.list
+                    var tableData = []
+                    if(list!=null && list.length>0){
+                        let dataInfo = {}
+                        list.forEach((item, index) => {
+                        let { patient_id } = item
+                        if (!dataInfo[patient_id]) {
+                            dataInfo[patient_id] = {
+                            patient_id:item.patient_id,
+                            child: [],
+                            }
+                        }
+                       })
+                       let arr = Object.values(dataInfo)
+
+                       if(arr!=null && arr.length>0){
+                         for(let i=0;i<list.length;i++){
+                           for(let j=0;j<arr.length;j++){
+                              if(list[i].patient_id == arr[j].patient_id){
+                                  arr[j].child.push(list[i])
+                              } 
+                           } 
+                         }
+                       }
+
+                       console.log("arrwowoowowo",arr)
+
+                      if(arr!=null && arr.length>0){
+                         for(let i=0;i<arr.length;i++){
+                            let dataInfo = {}
+                            arr[i].child.forEach((item, index) => {
+                            let { advice_name} = item
+                            if (!dataInfo[advice_name]) {
+                                    dataInfo[advice_name] = {
+                                    advice_name:item.advice_name,
+                                    childOne: [],
+                                    count:0,
+                                    specification_name:item.advice_desc +item.drug_spec_unit,
+                                    patient_id:item.patient_id,
+                                 }
+                                }
+                            })
+                            let newArr = Object.values(dataInfo)
+                            console.log("newArrwoowow",newArr)
+                            if(newArr!=null && newArr.length>0){
+                              for(let z=0;z<arr[i].child.length;z++){
+                                for(let y=0;y<newArr.length;y++){
+                                   if(arr[i].child[z].advice_name == newArr[y].advice_name){
+                                     newArr[y].childOne.push(arr[i].child[z])
+                                   }
+
+                                }
+                              }
+                            }
+                            console.log("newArrwoowow",newArr)
+                            tableData.push(...newArr)
+                         }           
+                      }
+                    console.log("tableDatawpwwwoow",tableData)
+                   
+                    for(let i=0;i<tableData.length;i++){
+                       tableData[i].index = i+1
+                       tableData[i].count_name = this.getCount(tableData[i].childOne)
+                       tableData[i].specification_name =tableData[i].specification_name
+                       tableData[i].query_date = this.listQuery.start_time + "~" + this.listQuery.end_time
+                      tableData[i].patient_name = this.getPatientName(tableData[i].patient_id)
+                
+                     }
+                     import('@/vendor/Export2Excel').then(excel => {
+                        
+                            const tHeader = ['序号','患者姓名','查询日期','药品名称','规格&单位','数量']
+                            const filterVal = ['index','patient_name','query_date','advice_name','specification_name','count_name']
+
+                            const data = this.formatJson(filterVal,tableData)
+
+                            excel.export_json_to_excel({
+                            header: tHeader,
+                            data,
+                            filename: '患者药品使用查询表'
+                            })
+                        })
+                    }
+                  }
+              })
+           
+            },
+            formatJson(filterVal, jsonData) {
+                return jsonData.map(v => filterVal.map(j => v[j]))
+            },
+            getPatientName(id){
+                var patient_name = ""
+                for(let i=0;i<this.patientsData.length;i++){
+                if(id == this.patientsData[i].id){
+                    patient_name = this.patientsData[i].name
+                }
+                }
+                return patient_name
+            },
+            handleChange(val){
+                console.log("valwoowowowwo",val)
+                this.patient_id =val.id
+                var params = {
+                  patient_id:val.id,
+                  start_time:this.listQuery.start_time,
+                  end_time:this.listQuery.end_time,
+                  limit:this.listQuery.limit,
+                  page:this.listQuery.page,
+                }
+                console.log("paramswowowoow",params)
+              getDocAdviceByPatientId(params).then(response=>{
+                  if(response.data.state == 1){
+                    var list =  response.data.data.list
+
+                    if(list!=null && list.length>0){
+                        let dataInfo = {}
+                        list.forEach((item, index) => {
+                        let { advice_name } = item
+                        if (!dataInfo[advice_name]) {
+                            dataInfo[advice_name] = {
+                            advice_name:item.advice_name,
+                            child: [],
+                            count:0,
+                            specification_name:item.advice_desc +item.drug_spec_unit,
+                            patient_id:item.patient_id,
+                            }
+                        }
+                       })
+                       let arr = Object.values(dataInfo)
+
+                       if(arr!=null && arr.length>0){
+                         for(let i=0;i<list.length;i++){
+                           for(let j=0;j<arr.length;j++){
+                              if(list[i].advice_name == arr[j].advice_name){
+                                  arr[j].child.push(list[i])
+                              } 
+                           } 
+                         }
+                       }
+
+                       this.DialysisData= []
+
+                       this.DialysisData = arr
+
+                       console.log("arrwoowowowowo",arr)
+                    }
+                   
+                  }
+              })
+            },
+            toSeach(){
+              this.getPatientsByName()
+            },
+            getCount(val){
+               var count =0
+               if(val!=null && val.length>0){
+                for(let i=0;i<val.length;i++){
+                    count+=val[i].prescribing_number
+                }
+               }
+               return count
+               
+            }
+        }   
+    }
+</script>
+
+<style lang="scss" scoped>
+.tableTitle {
+  font-size: 16px;
+  color: #000;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+</style>
+<style lang="scss">
+.page_timePersonal {
+  .cell {
+    text-align: center;
+  }
+}
+</style>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
     <el-button type="primary" @click="checkData">一键核对</el-button>
+    <el-button type="primary" @click="toUpload">一键上传</el-button>
     
     <div id="dialysis-print-box-1"  ref="pdfContent">
       <div
@@ -3444,6 +3445,116 @@ export default {
     };
   },
   methods: {
+    toUpload() {
+         
+         let dom = document.getElementById("dialysis-print-box-1")
+         //调用方法下载
+         html2canvas(dom, {
+           useCORS: true, //允许跨域
+           allowTaint: false,
+           logging: false,
+           letterRendering: true,
+           ddpi: window.devicePixelRatio * 4, //将分辨率提高到特定的DPI 提高四倍
+           scale: 4, //按比例增加分辨率
+           background: '#fff',//pdf背景色为白色，默认是黑色的
+         }).then((canvas) => {
+           //返回图片dataURL，参数：图片格式和清晰度(0-1)
+           var pageData = canvas.toDataURL('image/jpeg', 1.0);
+ 
+           //方向默认竖直，尺寸ponits，格式a4[595.28,841.89]
+           var pdf = new jsPDF('', 'pt', 'a4');
+ 
+           //addImage后两个参数控制添加图片的尺寸，此处将页面高度按照a4纸宽高比列进行压缩
+           //  pdf.addImage(pageData, 'JPEG', 0, 0, 595.28, 592.28 / canvas.width * canvas.height);
+           pdf.addImage(pageData, 'JPEG', 0, 0, 555.28, 592.28 / canvas.width * canvas.height);
+           
+           console.log("pdf222222222222222222",pdf)
+
+           var newBase64Data =  pdf.output("dataurlstring").split("base64,")[1]
+           // console.log("base63",newBase64Data)
+           const blob = this.base64ToBlob(newBase64Data, 'application/pdf');
+           console.log("blobwoowowowwo",blob)
+           this.openPdf(blob);
+           
+           // var data = {
+           //   name:newBase64Data,
+           // }
+           // UploadPrintOrder(data).then(response=>{
+           //   if(response.data.state == 1){
+           //     var sign =  response.data.data.sign
+           //     console.log("SIGNWWOOWWO")
+           //     var pdfBase64 = response.data.data.pdfBase64
+           //     console.log("pdfBase64",pdfBase64)
+           //     this.$message.success("保存成功!")
+           //     const blob = this.base64ToBlob(pdfBase64, 'application/pdf');
+           //     this.openPdf(blob);
+           //   }
+           // })
+           
+           // this.viewPdf(newBase64Data)
+           //保存到pdf，名字是stone
+           // pdf.save('stone.pdf');
+          
+         });
+       },
+    
+     viewPdf(content) {
+       console.log("content",content);
+       const blob = this.base64ToBlob(content);
+       if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+         window.navigator.msSaveOrOpenBlob(blob);
+       } else {
+         const fileURL = URL.createObjectURL(blob);
+         console.log("fileUlrwowowoow",fileURL)
+         window.open(fileURL);//打开ppf文件
+       }
+     },
+     compare (property) {
+       return function (a, b) {
+           var value1 = a[property]
+           var value2 = b[property]
+           return value1 - value2
+       }
+     },
+ 
+     openPdf(blob) {
+       const objectUrl = URL.createObjectURL(blob);
+       const a = document.createElement('a');
+       a.href = objectUrl;
+       a.target = '_blank';
+       a.click();
+       URL.revokeObjectURL(objectUrl);
+     },
+      base64ToBlob(base64Data, contentType) {
+       contentType = contentType || '';
+       const sliceSize = 1024;
+       const byteCharacters = window.atob(base64Data);
+       const bytesLength = byteCharacters.length;
+       const slicesCount = Math.ceil(bytesLength / sliceSize);
+       const byteArrays = new Array(slicesCount);
+ 
+       for (let sliceIndex = 0; sliceIndex < slicesCount; ++sliceIndex) {
+         const begin = sliceIndex * sliceSize;
+         const end = Math.min(begin + sliceSize, bytesLength);
+ 
+         const bytes = new Array(end - begin);
+         for (let offset = begin, i = 0; offset < end; ++i, ++offset) {
+           bytes[i] = byteCharacters[offset].charCodeAt(0);
+         }
+         byteArrays[sliceIndex] = new Uint8Array(bytes);
+       }
+ 
+       return new Blob(byteArrays, {
+         type: contentType
+       });
+     },
+    
+     UploadPdf(res) {
+       let pdfBase64Str = res;
+       let title = "上传给后端的个人报告";
+       var myfile = this.dataURLtoFile(pdfBase64Str, title + ".pdf")
+       console.log("myfile",myfile)
+     },
     // 获取当前年份，用于年龄计算
     getoldAge() {
       let date = new Date();

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -1574,12 +1574,11 @@ export default {
       } else {
         let arr = []
         for (let i = 0; i < this.allProject.length; i++) {
-          if(this.allProject[i].first_letter !=undefined){
-            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
-              this.allProject[i].first_letter.indexOf(this.search_project_keyword) != -1) {
+          
+            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
                 arr = arr.concat(this.allProject[i])
             }
-          }
+          
         }
         this.tabProject = arr
       }
@@ -1607,8 +1606,7 @@ export default {
         for (let i = 0; i < this.drugs.length; i++) {
           if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1 || 
           this.drugs[i].wubi.indexOf(this.search_keyword) != -1 || 
-          this.drugs[i].pinyin.indexOf(this.search_keyword) != -1 ||
-          this.drugs[i].first_letter.indexOf(this.search_keyword) != -1) {
+          this.drugs[i].pinyin.indexOf(this.search_keyword) != -1) {
             arr = arr.concat(this.drugs[i])
           }
         }

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -559,8 +559,7 @@ export default {
             // console.log('3333',this.all_data);
             for (let i = 0; i < this.all_data.length; i++) {
               if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
-              this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 ||
-              this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
+              this.all_data[i].his_patient.number.indexOf(this.search_input) != -1) {
                 arr4 = arr4.concat(this.all_data[i])
               }
             }
@@ -571,8 +570,7 @@ export default {
             // console.log('4444',this.all_data);
             for (let i = 0; i < this.all_data.length; i++) {
               if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
-                  this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 ||
-                  this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
+                  this.all_data[i].his_patient.number.indexOf(this.search_input) != -1) {
                 arr2 = arr2.concat(this.all_data[i])
               }
             }
@@ -584,8 +582,7 @@ export default {
             // console.log('5555',this.all_data);
             for (let i = 0; i < this.all_data.length; i++) {
               if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
-              this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 || 
-              this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
+              this.all_data[i].his_patient.number.indexOf(this.search_input) != -1) {
                 arr3 = arr3.concat(this.all_data[i])
               }
             }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1597,13 +1597,12 @@ export default {
       } else {
         let arr = []
         for (let i = 0; i < this.allProject.length; i++) {
-          if(this.allProject[i].first_letter != undefined){
+        
             // console.log('4444',this.tabProject[i].first_letter.indexOf(this.search_project_keyword) != -1)
-            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
-                this.allProject[i].first_letter.indexOf(this.search_project_keyword) != -1) {
+            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
               arr = arr.concat(this.allProject[i])
             }
-          }
+          
         }
         this.tabProject = arr
         console.log('kkkk',this.tabProject);
@@ -1632,8 +1631,7 @@ export default {
         for (let i = 0; i < this.drugs.length; i++) {
           if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1 ||
            this.drugs[i].wubi.indexOf(this.search_keyword) != -1 ||
-           this.drugs[i].pinyin.indexOf(this.search_keyword) != -1 ||
-           this.drugs[i].first_letter.indexOf(this.search_keyword) != -1
+           this.drugs[i].pinyin.indexOf(this.search_keyword) != -1
            ) {
             arr = arr.concat(this.drugs[i])
           }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -850,8 +850,7 @@ export default {
             let arr = []
             for (let i = 0; i < this.all_data.length; i++) {
               if (this.all_data[i].name.indexOf(this.search_input) != -1 ||
-               this.all_data[i].number.indexOf(this.search_input) != -1 ||
-               this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
+               this.all_data[i].number.indexOf(this.search_input) != -1) {
                 arr = arr.concat(this.all_data[i])
                 console.log(arr)
               }
@@ -864,8 +863,7 @@ export default {
            
             for (let i = 0; i < this.cure_data.length; i++) {
               if (this.cure_data[i].name.indexOf(this.search_input) != -1 || 
-              this.cure_data[i].number.indexOf(this.search_input) != -1 ||
-              this.cure_data[i].first_letter.indexOf(this.search_input) != -1) {
+              this.cure_data[i].number.indexOf(this.search_input) != -1) {
                 console.log('2222',this.cure_data);
                 arr2 = arr2.concat(this.cure_data[i])
               }
@@ -880,8 +878,7 @@ export default {
             for (let i = 0; i < this.un_cure_data.length; i++) {
               if(this.un_cure_data[i].first_letter!=undefined){
                 if (this.un_cure_data[i].name.indexOf(this.search_input) != -1 || 
-                this.un_cure_data[i].number.indexOf(this.search_input) != -1 ||
-                this.un_cure_data[i].first_letter.indexOf(this.search_input) != -1) {
+                this.un_cure_data[i].number.indexOf(this.search_input) != -1) {
                   arr3 = arr3.concat(this.un_cure_data[i])
                 }
               }