Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/data/components/editInspection.vue

@@ -45,7 +45,7 @@
                     <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
                 </el-form-item>
                 <el-form-item label="组套明细" style="width:50%;">
-                    <el-select v-model="form.project_detail" placeholder="请选择">
+                    <el-select v-model="form.project_detail" filterable placeholder="请选择">
                         <el-option
                                 v-for="item,index in projectList"
                                 :key="index"

src/xt_pages/outpatientDoctorStation/components/additionalCharges.vue

@@ -58,7 +58,7 @@
       },
       show() {
         this.chargeTable = []
-       
+
         this.visible = true
         for (let i = 0; i < this.additions.length; i++) {
           let obj = {
@@ -83,9 +83,7 @@
       }
     },
     watch: {
-      hisPatientInfo: function(val) {
-        console.log('患者ID', this)
-      }
+
     }
   }
 </script>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -271,18 +271,18 @@
                                             <template slot-scope="scope">{{ scope.row.drug_spec }}</template>
                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
-                                            <template slot-scope="scope">{{
-                                                stockInCount(scope.row) -
-                                                salesReturnCount(scope.row) -
-                                                stockOutCount(scope.row) +
-                                                cancelStockCount(scope.row)
-                                                }}
+                                            <template slot-scope="scope">
+                                                {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}} / {{
+                                                scope.row.total * (scope.row.dose / scope.row.min_number)}}
+                                                {{(scope.row.total * (scope.row.dose /
+                                                scope.row.min_number))?scope.row.max_unit:''}}
                                             </template>
                                         </el-table-column>
                                         <el-table-column label="单价" width="40">
                                             <template slot-scope="scope">{{ scope.row.retail_price }}</template>
                                         </el-table-column>
                                     </el-table>
+                                    <div>{{3*(2/3)}}</div>
                                 </div>
 
                             </el-tab-pane>
@@ -420,11 +420,10 @@
                                    v-on:cancel="cancel"></next-or-last-prescription>
 
 
-
         <!--<next-or-last-prescription ref='next_or_last_prescription' v-on:save="setValue" v-on:cancel="cancel"></next-or-last-prescription>-->
         <call-prescription ref='call_prescription' v-on:call="call" v-on:call-cancel="callCancel"></call-prescription>
 
-        <
+
     </div>
 </template>
 
@@ -432,6 +431,7 @@
 <script>
   import MonthPrescriptionTable from '../../outpatientCharges/components/monthPrescriptionTable'
   import {
+    createdTemplate,
     createHisPrescription,
     delHisPrescription,
     editHisPrescription,
@@ -440,8 +440,7 @@
     getInitData,
     getNextOrLastHisPrescription,
     getPatientInfo,
-    getSchedulePatientList,
-    createdTemplate
+    getSchedulePatientList
   } from '@/api/his/his'
   import { getDictionaryDataConfig } from '@/utils/data'
   import prescriptionTable from './prescriptionTable'
@@ -505,7 +504,7 @@
         ],
         isLastOrNextVisible: false,
         multipleTableHeight: '',
-        register_type: 1,
+        register_type: '',
         value: '0',
         search_project_keyword: '',
         form: {
@@ -573,7 +572,7 @@
         sick: [],
         diagnoses: [],
         diagnose: 1,
-        state1: 1,
+        state1: '',
         curTotal: 0,
         prescription_id: 0,
         tempDrugs: [],
@@ -685,12 +684,6 @@
           return cur
         }, []) // 设置cur默认类型为数组，并且初始值为空的数组
 
-        console.log(drug_ids)
-        console.log(project_ids)
-        console.log(additions_ids)
-
-        console.log(additions_ids)
-
         let drugs = []
         let projects = []
         let additions = []
@@ -761,7 +754,6 @@
         for (let i = 0; i < additions_ids.length; i++) {
           let obj = {}
           let count = 0
-          console.log(addition_month_prescriptions.addition)
           if (addition_month_prescriptions.addition) {
             for (let a = 0; a < addition_month_prescriptions.addition.length; a++) {
               if (additions_ids[i].price == addition_month_prescriptions.addition[a].price) {
@@ -777,14 +769,13 @@
           }
         }
 
-
         let p1 = {
           name: '处方' + 1,
           advices: drugs,
           project: [],
           type: 1,
           addition: additions
-        };
+        }
         let p2 = {
           name: '处方' + 2,
           type: 2,
@@ -792,12 +783,10 @@
           advices: [],
           addition: []
 
-        };
-        console.log(this.month_prescriptions);
-        console.log(this.curMonthPrescriptions);
+        }
 
-        this.month_prescriptions.push(p1);
-        this.month_prescriptions.push(p2);
+        this.month_prescriptions.push(p1)
+        this.month_prescriptions.push(p2)
 
         this.curMonthPrescriptions = this.month_prescriptions[0]
 
@@ -1034,7 +1023,7 @@
                       prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                       medical_insurance_number: prescription.advices[b].med_list_codg,
                       id: prescription.advices[b].drug_id,
-                      drug:prescription.advices[b].drug,
+                      drug: prescription.advices[b].drug
                     }
                     tempAdvice.push(obj)
                   }
@@ -1123,8 +1112,6 @@
         }
         getDayOrMonthHisPrescription(params).then(response => {
           if (response.data.state == 1) {
-            console.log(val)
-            console.log(this.end_time)
             this.month_prescriptions = []
             if (val == this.start_time) {
               var day_prescription = response.data.data.day_prescription
@@ -1153,7 +1140,7 @@
                       prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                       medical_insurance_number: prescription.advices[b].med_list_codg,
                       id: prescription.advices[b].drug_id,
-                      drug:prescription.advices[b].drug,
+                      drug: prescription.advices[b].drug
                     }
                     tempAdvice.push(obj)
                   }
@@ -1226,28 +1213,25 @@
           }
         })
 
-      },saveTemplate(val){
-        let params ={
-          name:val.name,
-          mode:val.mode,
-          patient_id:this.patientInfo.id
+      }, saveTemplate(val) {
+        let params = {
+          name: val.name,
+          mode: val.mode,
+          patient_id: this.patientInfo.id
         }
         let data = {
-          "prescriptions":val.prescriptions,
+          'prescriptions': val.prescriptions
         }
-
-        createdTemplate(params,data).then(response => {
+        createdTemplate(params, data).then(response => {
           if (response.data.state == 1) {
             this.$refs.saveTemplate.hide()
 
-            this.$message.success("保存成功")
+            this.$message.success('保存成功')
           } else {
             this.$message.error(response.data.msg)
           }
         })
 
-
-
       },
       call(val) {
         this.prescriptions = []
@@ -1704,15 +1688,12 @@
 
       },
       monthTabclickEvent(val) {
-        console.log(val)
-        console.log(this.month_prescriptions)
 
         for (let i = 0; i < this.month_prescriptions.length; i++) {
           if (this.month_prescriptions[i].name == val.name) {
             if (this.dayorMonth == 'month') {
               if (this.isShowDayPrescription) {
                 this.curDayPrescriptions = this.month_prescriptions[i]
-                console.log(this.curDayPrescriptions)
                 //用来区分处方属于项目还是药品
                 if (this.curDayPrescriptions.advices.length > 0 && this.curDayPrescriptions.project.length == 0) {
                   this.monthCustomTabIndex = 1
@@ -1807,23 +1788,21 @@
 
       },
       setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data) {
+        this.curMonthPrescriptions = {}
+        this.curPrescriptions = {}
 
+        console.log(doctors)
         for (let i = 0; i < doctors.length; i++) {
           if (doctors[i].user_type == 1) {
             doctors.splice(i, 1)
           }
         }
 
-        this.curMonthPrescriptions = {}
-        this.curPrescriptions = {}
-
         this.prescription_id = data[0].id
         this.editableTabsValue = '处方1'
         this.dayorMonth = 'day'
         this.$emit('event1', this.prescription_id)
         this.curStatus = 0
-        this.curPrescriptions = {}
-        this.curMonthPrescriptions = {}
         if (month_data && month_data.length > 0) {
 
           this.curMonthPrescriptions = month_data[0]
@@ -1925,6 +1904,7 @@
             }
           }
         }
+        console.log(info.register_type)
         if (info.register_type == 0) {
           for (let i = 0; i < this.register.length; i++) {
             this.register_type = this.register[0].value
@@ -1937,8 +1917,24 @@
         if (tab == 'more') {
           return false
         }
-      },open_three(){
-       this.$refs.saveTemplate.show(this.prescriptions)
+      }, open_three() {
+        for (let i = 0; i < this.prescriptions.length; i++) {
+          for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
+            if (this.prescriptions[i].advices[b].prescribing_number == 0 || this.prescriptions[i].advices[b].prescribing_number == '') {
+              this.$message.error('药品处方总量不能为0')
+              return
+            }
+          }
+        }
+        for (let i = 0; i < this.prescriptions.length; i++) {
+          for (let b = 0; b < this.prescriptions[i].project.length; b++) {
+            if (this.prescriptions[i].project[b].total == 0 || this.prescriptions[i].project[b].total == '') {
+              this.$message.error('项目处方总量不能为0')
+              return
+            }
+          }
+        }
+        this.$refs.saveTemplate.show(this.prescriptions)
       }, open_two() {
         if (this.dayorMonth == 'day') {
           if (this.patientInfo == null || this.patientInfo.id == 0) {
@@ -1968,34 +1964,48 @@
         if (this.dayorMonth == 'day') {
 
           if (this.prescriptions[0].advices.length == 0 && this.prescriptions[0].project.length == 0) {
-            this.$message.error('请先开处方');
+            this.$message.error('请先开处方')
             return
           }
         }
 
         if (this.dayorMonth == 'day') {
           if (this.curPrescriptions.order_status == 2) {
-            this.$message.error('当前处方已经结算,无法保存');
+            this.$message.error('当前处方已经结算,无法保存')
             return
           }
           if (this.doctorValue.length <= 0) {
-            this.$message.error('医生不能为空');
+            this.$message.error('医生不能为空')
             return
           }
 
           if (this.departmentValue.length <= 0) {
-            this.$message.error('科室不能为空');
+            this.$message.error('科室不能为空')
             return
           }
-
-          if (this.state1  <= 0) {
-            this.$message.error('疾病类型不能为空');
+          if (this.state1 <= 0) {
+            this.$message.error('疾病类型不能为空')
             return
           }
-
+          for (let i = 0; i < this.prescriptions.length; i++) {
+            for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
+              if (this.prescriptions[i].advices[b].prescribing_number == 0 || this.prescriptions[i].advices[b].prescribing_number == '') {
+                this.$message.error('药品处方总量不能为0')
+                return
+              }
+            }
+          }
+          for (let i = 0; i < this.prescriptions.length; i++) {
+            for (let b = 0; b < this.prescriptions[i].project.length; b++) {
+              if (this.prescriptions[i].project[b].total == 0 || this.prescriptions[i].project[b].total == '') {
+                this.$message.error('项目处方总量不能为0')
+                return
+              }
+            }
+          }
           if (index == 1) {
             let params = {
-              p_type:2,
+              p_type: 2,
               patient_id: this.patientInfo.id,
               diagnose: this.diagnose,
               sick_type: this.state1,
@@ -2046,7 +2056,7 @@
               if (response.data.state == 1) {
                 this.$emit('change', this.patientInfo.id)
                 this.$message.success('保存成功')
-              }else{
+              } else {
                 this.$message.error(response.data.msg)
               }
             })
@@ -2106,7 +2116,6 @@
                 }
 
                 for (let b = 0; b < month_prescriptions[i].project.length; b++) {
-                  console.log('~~~~~~~')
                   month_prescriptions[i].project[b].price = month_prescriptions[i].project[b].price.toString()
                   month_prescriptions[i].project[b].total = month_prescriptions[i].project[b].total.toString()
                   month_prescriptions[i].project[b].delivery_way = month_prescriptions[i].project[b].delivery_way.toString()
@@ -2378,7 +2387,6 @@
       },
 
       comfirm() {
-        console.log('222222222222', this.curPrescriptions)
 
         // if (this.curPrescriptions.order_status == 2) {
         //   this.$message.error('该处方已经结算，无法继续添加药品或者项目')
@@ -2418,9 +2426,6 @@
           }
         }
 
-        console.log(this.curDrugs)
-        console.log(this.curPrescriptions.advices)
-
         for (let i = 0; i < this.curDrugs.length; i++) {
           for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
             if (this.curDrugs[i].id == this.curPrescriptions.advices[a].id) {
@@ -2497,8 +2502,8 @@
                   single_dose_unit: temp[b].min_unit,
                   prescribing_number_unit: temp[b].max_unit,
                   medical_insurance_number: temp[b].medical_insurance_number,
-                  drug: temp[b],
-                };
+                  drug: temp[b]
+                }
 
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
                   obj.prescribing_number = 1
@@ -2520,7 +2525,6 @@
             //  }
 
             if (temp2.length > 0) {
-              console.log('temp2222222222', temp2)
               for (let b = 0; b < temp2.length; b++) {
                 let obj = {
                   id: 0,
@@ -2538,14 +2542,13 @@
                   unit: temp2[b].unit,
                   type: temp2[b].type
                 }
-                if (obj.total == 0) {
+                if (obj.total == 0 || obj.total == undefined) {
                   obj.total = 1
                 }
                 if (obj.type == 3) {
                   obj.single_dose = 1
                 }
 
-                console.log(obj)
                 this.prescriptions[i].project.push(obj)
               }
               this.curStatus = 2
@@ -2639,14 +2642,12 @@
         getAllProjectTeam().then(response => {
           if (response.data.state == 1) {
             var team = response.data.data.team
-            console.log('team2222', team)
             this.tabPrjectTeam = team
             this.projectList = team
           }
         })
       },
       selectTeam(row) {
-        console.log('row', row)
         var arr = []
         for (let i = 0; i < row.length; i++) {
           arr.push(row[i].item_id)
@@ -2694,7 +2695,7 @@
                   unit: project[i].project.unit,
                   type: project[i].type
                 }
-                if (obj.total == 0) {
+                if (obj.total == 0 || obj.total == undefined) {
                   obj.total = 1
                 }
 
@@ -2715,13 +2716,11 @@
                   unit: project[i].good_info.unit,
                   type: project[i].type
                 }
-                if (obj.total == 0) {
+                if (obj.total == 0 || obj.total == undefined) {
                   obj.total = 1
                 }
                 this.teamList.push(obj)
 
-                console.log(this.teamList)
-
               }
             }
 
@@ -2751,7 +2750,6 @@
         getAllProjectList().then(response => {
           if (response.data.state == 1) {
             var hisprojectlist = response.data.data.hisprojectlist
-            console.log('hisprojectlist', hisprojectlist)
             this.hisList = hisprojectlist
           }
         })

src/xt_pages/outpatientDoctorStation/components/saveTemplate.vue

@@ -6,17 +6,14 @@
             :before-close="_close"
     >
         <div>
-            <el-form :model="form" class="adviceForm" ref="form" label-width="100px"
-                     style="display: flex;flex-wrap: wrap;justify-content: space-between;">
+            <el-form :model="form" class="adviceForm" :rules="rules" ref="form" label-width="100px"
+                     >
 
-                <!--<el-form-item label="处方模板类别 : " style="width: 100%;margin-bottom:0;">-->
-                <!--<el-radio v-model="radio" label="1">临时</el-radio>-->
-                <!--<el-radio v-model="radio" label="2">长期</el-radio>-->
-                <!--</el-form-item>-->
-                <el-form-item label="处方模板名称:" style="width: 60%;margin-bottom:0;">
-                    <el-input v-model="form.name" placeholder=""></el-input>
+                <el-form-item label="模板名称:"  prop="name" style="width: 100%;margin-bottom:0;">
+                    <el-input v-model="form.name"  placeholder=""></el-input>
                 </el-form-item>
-                <el-form-item label="透析模式 : " style="width: 60%;">
+
+                <el-form-item label="透析模式 : " style="width: 100%;margin-top: 20px" prop="mode">
                     <el-select v-model="form.mode" style="width:100%;" placeholder="请选择">
                         <el-option
                                 v-for="item in modeOptions"
@@ -30,9 +27,7 @@
 
 
             <div v-for="(item,index) in allPrescription" :key="index">
-                <el-checkbox-group v-model="item.check_group">
                     <div v-for="(subItem,index2) in item.prescriptions" :key="index2">
-                        <el-checkbox style="margin:10px 0;" :label="subItem.id">{{'处方' + (index2+ 1)}}</el-checkbox>
                         <el-table v-if="subItem.advices.length > 0" :data="subItem.advices" border style="width: 99%;"
                                   :row-style="{ color: '#303133' }"
                                   :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
@@ -146,14 +141,13 @@
                             </el-table-column>
                         </el-table>
                     </div>
-                </el-checkbox-group>
             </div>
 
 
         </div>
         <div slot="footer" class="dialog-footer">
             <el-button @click="hide">取 消</el-button>
-            <el-button type="primary" @click="submitAction()">保 存</el-button>
+            <el-button type="primary" @click="submitAction('form')">保 存</el-button>
         </div>
     </el-dialog>
 </template>
@@ -164,6 +158,10 @@
   export default {
     data() {
       return {
+        rules: {
+          name: [{required: true, message: "模版名字不能为空", trigger: 'blur'}],
+          mode: [{required: true, message: "请选择透析模式", trigger: 'blur'}],
+        },
         visible: false,
         modeOptions: {},
         allPrescription: [],
@@ -197,65 +195,45 @@
         this.form.name = ''
         this.form.intro = ''
       }, submitAction() {
-
-        let checkGroup = []
-        let allPrescriptions = []
-        let targetPrescriptions = []
-        let prescriptions = []
-        for (let i = 0; i < this.allPrescription.length; i++) {
-          for (let a = 0; a < this.allPrescription[i].check_group.length; a++) {
-            checkGroup.push(this.allPrescription[i].check_group[a])
-          }
-          for (let a = 0; a < this.allPrescription[i].prescriptions.length; a++) {
-            allPrescriptions.push(this.allPrescription[i].prescriptions[a])
-          }
-        }
-        for (let i = 0; i < allPrescriptions.length; i++) {
-          for (let a = 0; a < checkGroup.length; a++) {
-            if (allPrescriptions[i].id == checkGroup[a]) {
-              targetPrescriptions.push(allPrescriptions[i])
+        this.$refs['form'].validate((valid) => {
+          if (valid) {
+            let checkGroup = []
+            let allPrescriptions = []
+            let targetPrescriptions = []
+            for (let i = 0; i < allPrescriptions.length; i++) {
+                  targetPrescriptions.push(allPrescriptions[i])
             }
+            for(let i = 0; i < targetPrescriptions.length; i++){
+              if(targetPrescriptions[i].advices.length > 0 && targetPrescriptions[i].project.length == 0){
+                targetPrescriptions[i]["type"] = 1
+              } else if(targetPrescriptions[i].advices.length == 0 && targetPrescriptions[i].project.length > 0){
+                targetPrescriptions[i]["type"] = 2
+              }
+              for (let b = 0; b < targetPrescriptions[i].advices.length; b++) {
+                targetPrescriptions[i].advices[b].single_dose = targetPrescriptions[i].advices[b].single_dose.toString()
+                targetPrescriptions[i].advices[b].prescribing_number =targetPrescriptions[i].advices[b].prescribing_number.toString()
+                targetPrescriptions[i].advices[b].retail_price = targetPrescriptions[i].advices[b].retail_price.toString()
+                targetPrescriptions[i].advices[b].day = parseInt(targetPrescriptions[i].advices[b].day)
+              }
+              for (let b = 0; b < targetPrescriptions[i].project.length; b++) {
+                targetPrescriptions[i].project[b].price =targetPrescriptions[i].project[b].price.toString()
+                targetPrescriptions[i].project[b].total =targetPrescriptions[i].project[b].total.toString()
+                targetPrescriptions[i].project[b].delivery_way =targetPrescriptions[i].project[b].delivery_way.toString()
+              }
+            }
+            let params = {
+              name: this.form.name,
+              mode: this.form.mode,
+              prescriptions: targetPrescriptions,
+            }
+            this.$emit('save_template', params)
           }
-        }
-
-
-        for(let i = 0; i < targetPrescriptions.length; i++){
-          if(targetPrescriptions[i].advices.length > 0 && targetPrescriptions[i].project.length == 0){
-            targetPrescriptions[i]["type"] = 1
-          } else if(targetPrescriptions[i].advices.length == 0 && targetPrescriptions[i].project.length > 0){
-            targetPrescriptions[i]["type"] = 2
-          }
-          for (let b = 0; b < targetPrescriptions[i].advices.length; b++) {
-            targetPrescriptions[i].advices[b].single_dose = targetPrescriptions[i].advices[b].single_dose.toString()
-            targetPrescriptions[i].advices[b].prescribing_number =targetPrescriptions[i].advices[b].prescribing_number.toString()
-            targetPrescriptions[i].advices[b].retail_price = targetPrescriptions[i].advices[b].retail_price.toString()
-            targetPrescriptions[i].advices[b].day = parseInt(targetPrescriptions[i].advices[b].day)
-          }
-          for (let b = 0; b < targetPrescriptions[i].project.length; b++) {
-            targetPrescriptions[i].project[b].price =targetPrescriptions[i].project[b].price.toString()
-            targetPrescriptions[i].project[b].total =targetPrescriptions[i].project[b].total.toString()
-            targetPrescriptions[i].project[b].delivery_way =targetPrescriptions[i].project[b].delivery_way.toString()
-          }
-        }
-
-        let params = {
-          name: this.form.name,
-          mode: this.form.mode,
-          prescriptions: targetPrescriptions,
-        }
-        this.$emit('save_template', params)
+        })
       },
       show(prescriptions) {
-        for (let i = 0; i < prescriptions.length; i++) {
-          if (prescriptions[i].id == 0) {
-            prescriptions[i].id = Math.floor((Math.random() + Math.floor(Math.random() * 9 + 1)) * Math.pow(10, 10 - 1))
-          }
-        }
-
         this.allPrescription = []
         this.modeOptions = this.$store.getters.treatment_mode
         let obj = {
-          check_group: [],
           prescriptions: prescriptions
         }
         this.allPrescription.push(obj)

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -341,8 +341,6 @@
                 }
               }
             }
-            console.log(this.un_cure_data)
-            console.log(this.cure_data)
             //排班
             for (let i = 0; i < response.data.data.list_two.length; i++) {
               //未就诊
@@ -584,31 +582,97 @@
           'record_date': this.record_date,
           'type': this.radio,
           'sch_type':this.schedule_type,
-        };
-        this.patientTableData = [];
+        }
+        this.un_cure_data = []
+        this.cure_data = []
+        this.all_data = []
 
         getSchedulePatientList(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);
             return false
           } else {
-            this.patientTableData = response.data.data.list;
-            this.patientTableDataTwo = response.data.data.list;
-            this.cal_one = response.data.data.total_one;
-            this.cal_two = response.data.data.total_two;
-            this.admin_info = response.data.data.info;
+            //挂号
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
+                //未就诊
+                if (response.data.data.list[i].his_patient[b].prescription.length == 0) {
+                  let obj = {
+                    name: response.data.data.list[i].his_patient[b].name,
+                    number: response.data.data.list[i].his_patient[b].number,
+                    id: response.data.data.list[i].id,
+                    his_patient_id: response.data.data.list[i].his_patient[b].id
+                  }
+                  this.un_cure_data.push(obj)
+                }
+                //已就诊
+                if (response.data.data.list[i].his_patient[b].prescription.length > 0) {
+                  let obj = {
+                    name: response.data.data.list[i].his_patient[b].name,
+                    number: response.data.data.list[i].his_patient[b].number,
+                    id: response.data.data.list[i].id,
+                    his_patient_id: response.data.data.list[i].his_patient[b].id
+                  }
+                  this.cure_data.push(obj)
+                }
+              }
+            }
 
-            if (this.patientTableData.length > 0) {
-              this.$refs.tab.setCurrentRow(this.patientTableData[0]);
-              this.oldCurrentRow = this.patientTableData[0];
+            //排班
+            for (let i = 0; i < response.data.data.list_two.length; i++) {
+              //未就诊
+              if (response.data.data.list_two[i].prescription.length == 0 && response.data.data.list_two[i].his_patient.id == 0) {
+                let obj = {
+                  name: response.data.data.list_two[i].name,
+                  number: response.data.data.list_two[i].his_patient.number,
+                  id: response.data.data.list_two[i].id,
+                  his_patient_id: response.data.data.list_two[i].his_patient.id
+                }
+                this.un_cure_data.push(obj)
+              }
 
-              this.getPatientInfo(this.patientTableData[0])
+              //已就诊
+              if (response.data.data.list_two[i].prescription.length > 0 && response.data.data.list_two[i].his_patient.id == 0) {
+                let obj = {
+                  name: response.data.data.list_two[i].name,
+                  number: response.data.data.list_two[i].his_patient.number,
+                  id: response.data.data.list_two[i].id,
+                  his_patient_id: response.data.data.list_two[i].his_patient.id
+                }
+                this.cure_data.push(obj)
+              }
             }
 
-            this.prescriptionList = response.data.data.list.prescription
+            this.all_data = this.all_data.concat(this.cure_data)
+            this.all_data = this.all_data.concat(this.un_cure_data)
 
-            // this.patientid = this.patientTableData[0].patient_id
+            this.cure_data_two = this.cure_data
+            this.un_cure_data_two =this.un_cure_data
+            this.all_data_two = this.all_data
 
+            this.cal_one = this.un_cure_data.length
+            this.cal_two = this.cure_data.length
+            this.admin_info = response.data.data.info
+            if (this.un_cure_data.length > 0) {
+              if(this.radio == 0){
+                this.$refs.tab.setCurrentRow(this.all_data[0])
+                this.oldCurrentRow = this.all_data[0]
+                this.getPatientInfo(this.all_data[0])
+              }else if(this.radio == 1){
+
+                this.$refs.tab.setCurrentRow(this.un_cure_data[0])
+                this.oldCurrentRow = this.un_cure_data[0]
+                this.getPatientInfo(this.un_cure_data[0])
+
+              }else if(this.radio == 2){
+
+                this.$refs.tab.setCurrentRow(this.cure_data[0])
+                this.oldCurrentRow = this.cure_data[0]
+                this.getPatientInfo(this.cure_data[0])
+
+              }
+
+            }
           }
         })
       },
@@ -761,7 +825,6 @@
         for (let i = 0; i < additions_ids.length; i++) {
           let obj = {}
           let count = 0
-          console.log(addition_month_prescriptions.addition)
           if (addition_month_prescriptions.addition) {
             for (let a = 0; a < addition_month_prescriptions.addition.length; a++) {
               if (project_ids[i].price == addition_month_prescriptions.addition[a].price) {
@@ -777,9 +840,6 @@
           }
         }
 
-        console.log(drugs)
-        console.log(projects)
-        console.log(additions)
 
         let p1 = {
           name: '处方' + 1,
@@ -1004,8 +1064,6 @@
                 }
               }
             }
-            console.log(this.un_cure_data)
-            console.log(this.cure_data)
 
 
             //排班
@@ -1091,7 +1149,6 @@
             this.patientInfo = response.data.data.xt_info
             this.hisPatientInfo = response.data.data.his_info
             this.case_history = response.data.data.case_history
-            console.log('病历222222', this.case_history)
             this.info = response.data.data.info
             this.doctors = response.data.data.doctors
             this.department = response.data.data.department
@@ -1451,9 +1508,7 @@
       },
 
       choosePatient(val) {
-        console.log(111111,val);
         if(this.titleType == '电子病历'){
-          console.log('this.$refs.child.watchSign',this.$refs.child.watchSign);
           if(this.$refs.child.watchSign > 2){
             this.$confirm('是否保存当前病例', '保存', {
               confirmButtonText: '确 定',
@@ -1488,7 +1543,6 @@
                   this.patientInfo = response.data.data.xt_info;
                   this.hisPatientInfo = response.data.data.his_info;
                   this.case_history = response.data.data.case_history;
-                  console.log("数据是22222多少",this.case_history);
                   this.info = response.data.data.info;
                   this.doctors = response.data.data.doctors;
                   this.department = response.data.data.department;
@@ -1868,7 +1922,6 @@
                   this.patientInfo = response.data.data.xt_info;
                   this.hisPatientInfo = response.data.data.his_info;
                   this.case_history = response.data.data.case_history;
-                  console.log("数据是22222多少",this.case_history);
                   this.info = response.data.data.info;
                   this.doctors = response.data.data.doctors;
                   this.department = response.data.data.department;
@@ -2249,7 +2302,6 @@
                   this.patientInfo = response.data.data.xt_info;
                   this.hisPatientInfo = response.data.data.his_info;
                   this.case_history = response.data.data.case_history;
-                  console.log("数据是22222多少",this.case_history);
                   this.info = response.data.data.info;
                   this.doctors = response.data.data.doctors;
                   this.department = response.data.data.department;
@@ -2603,7 +2655,8 @@
               });
             this.$refs.child.watchSign = 0
           }
-        }else{
+        }
+        else{
         var nowDate = new Date();
         var nowYear = nowDate.getFullYear();
         var nowMonth = nowDate.getMonth() + 1;
@@ -2638,9 +2691,9 @@
         }
 
         if (isShowDailog) {
-          this.patientTableData.map((item, index) => {
-            if (item.patient_id == this.oldCurrentRow.patient_id) {
-              this.$refs.tab.setCurrentRow(this.patientTableData[index])
+          this.all_data.map((item, index) => {
+            if (item.id == this.oldCurrentRow.id) {
+              this.$refs.tab.setCurrentRow(this.all_data[index])
               return
             }
           })
@@ -2651,11 +2704,12 @@
           }).then(() => {
             this.open(1)
           }).catch(() => {
-            this.patientTableData.map((item, index) => {
-              if (item.patient_id == val.patient_id) {
-                this.$refs.tab.setCurrentRow(this.patientTableData[index])
+
+            for(let i = 0; i < this.all_data.length; i++){
+              if(this.all_data[i].id == val.id){
+                this.$refs.tab.setCurrentRow(this.all_data[i])
               }
-            })
+            }
 
             this.patientid = val.id
             let params = {
@@ -2671,12 +2725,16 @@
                 this.$message.error(response.data.msg)
                 return false
               } else {
+                for(let i = 0;i < this.all_data.length; i++){
+                  if(this.all_data[i].id == val.id){
+                    this.oldCurrentRow =  this.all_data[i]
+                  }
+                }
 
                 this.prescriptions = []
                 this.patientInfo = response.data.data.xt_info
                 this.hisPatientInfo = response.data.data.his_info
                 this.case_history = response.data.data.case_history
-                console.log('数据列表是多少', this.case_history)
                 var month_prescriptions = response.data.data.month_prescriptions
                 this.setMonthPrescription(month_prescriptions)
                 this.doctors = response.data.data.doctors
@@ -2688,7 +2746,7 @@
                   }
                 }
 
-                this.case_history = case_history
+                this.case_history = response.data.data.case_history
                 this.info = response.data.data.info
                 this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
                 if (this.case_history.breathing <= 0) {
@@ -3059,7 +3117,6 @@
               this.patientInfo = response.data.data.xt_info
               this.hisPatientInfo = response.data.data.his_info
               this.case_history = response.data.data.case_history
-              console.log('数据是22222多少', this.case_history)
               this.info = response.data.data.info
               this.doctors = response.data.data.doctors
               this.department = response.data.data.department
@@ -3413,17 +3470,10 @@
 
         }
         }
-
-
-
-
-
       },
       currentChange(currentRow, oldCurrentRow) {
         this.newPatientId = oldCurrentRow.id;
-        console.log('老数据',oldCurrentRow.id);
         this.patientid = oldCurrentRow.id;
-
         let isShowDailog = false
         for (let i = 0; i < this.prescriptions.length; i++) {
           if ((this.prescriptions[i].id == 0 && this.prescriptions[i].advices.length > 0) || (this.prescriptions[i].id == 0 && this.prescriptions[i].project.length > 0)) {
@@ -3434,14 +3484,10 @@
           this.oldCurrentRow = currentRow
           return
         }
-
-
       }, open_two() {
         this.$refs.prescriptions.open_two()
       },open_three(){
         this.$refs.prescriptions.open_three()
-
-
       },
       open(index) {
 
@@ -3504,7 +3550,6 @@
           if (response.data.state == 1) {
             this.centerDialogVisible = true
             var list = response.data.data.list
-            console.log('list2222222', list)
             for (let i = 0; i < list.length; i++) {
               list[i].prescription_number = list[i].prescription_number + i
             }
@@ -3514,9 +3559,11 @@
       },
       handleSelectionChange(val) {
         this.selecting_schs = val
-        // console.log("99999",this.selecting_schs)
       },
       handleClick() {
+        if(this.titleType == "电子处方"){
+          this.getPatientInfo()
+        }
 
       },
       savePrint() {

src/xt_pages/outpatientDoctorStation/prescriptionTemplate.vue

@@ -7,15 +7,15 @@
         </div>
         <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
             <div class="mainLeft">
-                <!--<div class="mainCell" style="margin-bottom:10px;">-->
-                    <!--<el-input size="small" placeholder="请输入姓名" @input="searchAction"-->
-                              <!--@keyup.enter.native='searchAction'-->
-                              <!--v-model="search_input" class="filter-item"/>-->
+                <div class="mainCell" style="margin-bottom:10px;">
+                    <el-input size="small" placeholder="请输入姓名或者透析号"
+                              v-model="search_input" class="filter-item" @input="searchAction"
+                              @keyup.enter.native='searchAction'/>
                     <!--<el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"-->
                                <!--@click="searchAction">-->
                         <!--搜索-->
                     <!--</el-button>-->
-                <!--</div>-->
+                </div>
                 <div>
                     <el-table :data="data" :height="tableHeight" @row-click='choosePatient'
                                border style="width: 100%;"
@@ -91,6 +91,7 @@
         fullHeight: document.documentElement.clientHeight,
         isloading: false,
         data: [],
+        all_data:[],
         page: 1,
         limit: 10,
         patient_id: 0,
@@ -98,6 +99,20 @@
       }
     },
     methods: {
+      searchAction() {
+        this.data = []
+        if (this.search_input.length == 0) {
+          this.data = this.all_data
+        } else {
+
+          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].dialysis_no.indexOf(this.search_input)  != -1){
+              this.data.push(this.all_data[i])
+            }
+          }
+        }
+      },
+
       deleteTemplate(row) {
         this.$confirm('处方模版删除后不可恢复，是否确认删除', '删除', {
           confirmButtonText: '确 定',
@@ -172,6 +187,8 @@
         getPatientList().then(response => {
           if (response.data.state == 1) {
             this.data = response.data.data.list
+            this.all_data = response.data.data.list
+
             this.$refs.tab.setCurrentRow(this.data[0])
             // this.patient_id = this.data[0].id
             // this.GetPrescriptionTemplateList()

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -175,8 +175,11 @@
                                 </el-tab-pane>
                             </el-tabs>
                         </div>
+                        </div>
                     </el-tabs>
-                    <template>
+
+
+                <template>
 
 
                         <div class="comfirmBox">
@@ -1351,7 +1354,7 @@
                   unit: temp2[b].unit,
                   type: temp2[b].type
                 }
-                if (obj.total == 0) {
+                if (obj.total == 0 || obj.total == undefined) {
                   obj.total = 1
                 }
                 if (obj.type == 3) {
@@ -1619,7 +1622,7 @@
                   unit: project[i].project.unit,
                   type: project[i].type
                 }
-                if (obj.total == 0) {
+                if (obj.total == 0 || obj.total == undefined) {
                   obj.total = 1
                 }
 
@@ -1640,7 +1643,7 @@
                   unit: project[i].good_info.unit,
                   type: project[i].type
                 }
-                if (obj.total == 0) {
+                if (obj.total == 0 || obj.total == undefined) {
                   obj.total = 1
                 }
                 this.teamList.push(obj)