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

src/xt_pages/hospitalStation/components/callPrescription.vue

@@ -188,14 +188,18 @@
         let params={
           patient_id:this.patient_id,
           start_time: this.start_time,
-          end_time:this.end_time
+          end_time:this.end_time,
+          p_type:1,
+
         };
         this.GetCallHisPrescription(params)
       },changeEndTime(){
         let params={
           patient_id:this.patient_id,
           start_time: this.start_time,
-          end_time:this.end_time
+          end_time:this.end_time,
+          p_type:1,
+
         };
         this.GetCallHisPrescription(params)
       },

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -23,43 +23,43 @@
           <el-form-item label="证件号: " prop="name" label-position="right">
             <el-input v-model="patientInfo.id_card_no" placeholder="" readonly></el-input>
           </el-form-item>
-          <el-form-item label="处方类型: " prop="name" label-position="right">
-            <el-select style="width:100%;" v-model="register_type" placeholder="">
-              <el-option
-                v-for="(item,index) in register"
-                :key="index"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="疾病类型:" prop="name" label-position="right">
-
-            <el-select style="width:100%;" v-model="state1" placeholder="">
-              <el-option
-                v-for="(item,index) in sick"
-                :key="index"
-                :label="item.class_name"
-                :value="item.id">
-              </el-option>
-            </el-select>
+          <!--<el-form-item label="处方类型: " prop="name" label-position="right">-->
+            <!--<el-select style="width:100%;" v-model="register_type" placeholder="">-->
+              <!--<el-option-->
+                <!--v-for="(item,index) in register"-->
+                <!--:key="index"-->
+                <!--:label="item.label"-->
+                <!--:value="item.value">-->
+              <!--</el-option>-->
+            <!--</el-select>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item label="疾病类型:" prop="name" label-position="right">-->
 
-          </el-form-item>
+            <!--<el-select style="width:100%;" v-model="state1" placeholder="">-->
+              <!--<el-option-->
+                <!--v-for="(item,index) in sick"-->
+                <!--:key="index"-->
+                <!--:label="item.class_name"-->
+                <!--:value="item.id">-->
+              <!--</el-option>-->
+            <!--</el-select>-->
 
-          <el-form-item label="诊断:" prop="name" label-position="right">
+          <!--</el-form-item>-->
 
-            <el-select style="width:100%;" v-model="diagnose" placeholder="">
-              <el-option
-                v-for="(item,index) in diagnoses"
-                :key="index"
-                :label="item.class_name"
-                :value="item.id">
-              </el-option>
-            </el-select>
+          <!--<el-form-item label="诊断:" prop="name" label-position="right">-->
 
-          </el-form-item>
+            <!--<el-select style="width:100%;" v-model="diagnose" placeholder="">-->
+              <!--<el-option-->
+                <!--v-for="(item,index) in diagnoses"-->
+                <!--:key="index"-->
+                <!--:label="item.class_name"-->
+                <!--:value="item.id">-->
+              <!--</el-option>-->
+            <!--</el-select>-->
 
+          <!--</el-form-item>-->
 
+<!--
           <el-form-item label="过敏病史: " prop="name" label-position="right">
             <el-autocomplete
               style="width:100%;"
@@ -68,7 +68,8 @@
               :fetch-suggestions="querySearch2"
               placeholder="请输入内容"
             ></el-autocomplete>
-          </el-form-item>
+          </el-form-item>-->
+
         </el-form>
         <div class="tabsBox">
 
@@ -425,8 +426,6 @@
     getDayOrMonthHisPrescription,
     getInitData,
     getNextOrLastHisPrescription,
-    getPatientInfo,
-    getSchedulePatientList
   } from '@/api/his/his'
   import { getDictionaryDataConfig } from '@/utils/data'
   import prescriptionTable from './prescriptionTable'
@@ -967,7 +966,8 @@
         let params = {
           patient_id: this.patientInfo.id,
           start_time: val,
-          end_time: this.end_time
+          end_time: this.end_time,
+          p_type:1,
         };
         getDayOrMonthHisPrescription(params).then(response => {
           if (response.data.state == 1) {
@@ -1070,7 +1070,8 @@
         let params = {
           patient_id: this.patientInfo.id,
           start_time: this.start_time,
-          end_time: val
+          end_time: val,
+          p_type:1
         };
         getDayOrMonthHisPrescription(params).then(response => {
           if (response.data.state == 1) {
@@ -1326,7 +1327,9 @@
           let params = {
             patient_id: this.patientInfo.id,
             record_time: this.request_record_date,
-            type: 2
+            type: 2,
+            p_type:1,
+
           };
 
           this.GetNextOrLastHisPrescription(params)
@@ -1334,7 +1337,8 @@
           let params = {
             patient_id: this.patientInfo.id,
             record_time: this.request_record_date,
-            type: 2
+            type: 2,
+            p_type:1,
           };
           this.GetNextOrLastHisPrescription(params)
 
@@ -1837,7 +1841,8 @@
           let params = {
             end_time: this.record_date,
             start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
-            patient_id: this.patientInfo.id
+            patient_id: this.patientInfo.id,
+            p_type: 1,
           };
           getCallHisPrescription(params).then(response => {
             if (response.data.state == 1) {
@@ -1877,10 +1882,10 @@
             return
           }
 
-          if (this.state1  <= 0) {
-            this.$message.error('疾病类型不能为空');
-            return
-          }
+          // if (this.state1  <= 0) {
+          //   this.$message.error('疾病类型不能为空');
+          //   return
+          // }
 
 
 

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -5,7 +5,17 @@
     </div>
     <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
       <div class="mainLeft">
-
+        <div class="mainCell" style="justify-content: space-between;">
+          <p style="font-size:14px;">未就诊：<span>{{cal_one}}</span>人</p>
+          <p style="font-size:14px;">已就诊：<span>{{cal_two}}</span>人</p>
+        </div>
+        <div class="mainCell">
+          <el-radio-group v-model="radio" @change="change">
+            <el-radio :label="1">未就诊</el-radio>
+            <el-radio :label="2">已就诊</el-radio>
+            <el-radio :label="0">全部</el-radio>
+          </el-radio-group>
+        </div>
         <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"/>
@@ -674,6 +684,8 @@
           } 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;
 
             if (this.patientTableData.length > 0) {
@@ -714,7 +726,8 @@
           'record_date': this.record_date,
           'patient_id': val.id,
           'start_time': moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
-          'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD")
+          'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD"),
+          'p_type':1,
 
         };
         this.isloading = true;
@@ -910,7 +923,10 @@
                 'record_date': this.record_date,
                 'patient_id': val.id,
                 'start_time': moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
-                'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD")
+                'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD"),
+                'p_type':1,
+
+
               };
               getPatientInfo(params).then(response => {
                 if (response.data.state == 0) {
@@ -1077,7 +1093,9 @@
                 'record_date': this.record_date,
                 'patient_id': val.id,
                 'start_time': moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
-                'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD")
+                'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD"),
+                'p_type':1,
+
               };
               getPatientInfo(params).then(response => {
                 if (response.data.state == 0) {
@@ -1245,7 +1263,9 @@
               'record_date': this.record_date,
               'patient_id': val.id,
               'start_time': moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
-              'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD")
+              'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD"),
+              'p_type':1,
+
             };
             getPatientInfo(params).then(response => {
                 if (response.data.state == 0) {
@@ -1467,7 +1487,9 @@
               'record_date': this.record_date,
               'patient_id': val.id,
               'start_time': moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
-              'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD")
+              'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD"),
+              'p_type':1,
+
             };
             getPatientInfo(params).then(response => {
               if (response.data.state == 0) {
@@ -1638,7 +1660,9 @@
             'record_date': this.record_date,
             'patient_id': val.id,
             'start_time': moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
-            'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD")
+            'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD"),
+            'p_type':1,
+
           };
           getPatientInfo(params).then(response => {
             if (response.data.state == 0) {

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -113,7 +113,7 @@
                       >发票打印
                       </el-button>
                     </div>
-                    
+
 
 
                 </div>
@@ -544,7 +544,8 @@
         let params = {
           patient_id: this.patientInfo.id,
           start_time: val,
-          end_time: this.other_end_time
+          end_time: this.other_end_time,
+          p_type:1
         };
         getDayOrMonthHisPrescription(params).then(response => {
           if (response.data.state == 1) {
@@ -561,7 +562,8 @@
         let params = {
           patient_id: this.patientInfo.id,
           start_time: this.other_start_time,
-          end_time: val
+          end_time: val,
+          p_type:1
         };
         getDayOrMonthHisPrescription(params).then(response => {
           if (response.data.state == 1) {
@@ -2814,15 +2816,15 @@
 
       },
       invoicePrint(obj){
-        console.log(this.hisPatientInfo)
+        console.log(this.hisPatientInfo);
         let paramsObj = {
           order_id: this.hisPatientInfo.id,
           patient_id: this.hisPatientInfo.patient_id,
           name:this.hisPatientInfo.name,
           gend:this.hisPatientInfo.gend,
           setl_time:this.hisPatientInfo.out_hosptial_time
-        }
-        this.invoiceParams = paramsObj
+        };
+        this.invoiceParams = paramsObj;
         this.invoiceVisible = true
       }
     },

src/xt_pages/outpatientCharges/11.vue

@@ -117,7 +117,7 @@
   import { getPatientInformation, getPatientList } from '@/api/project/project'
   import { getPatientInfo, getSchedulePatientList, register,upload } from '@/api/his/his'
 
-  const moment = require('moment')
+  const moment = require('moment');
   export default {
     components: {
       BreadCrumb,
@@ -161,16 +161,16 @@
       }
     },
     created() {
-      var nowDate = new Date()
-      var nowYear = nowDate.getFullYear()
-      var nowMonth = nowDate.getMonth() + 1
-      var nowDay = nowDate.getDate()
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
       this.record_date =
         nowYear +
         '-' +
         (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
         '-' +
-        (nowDay < 10 ? '0' + nowDay : nowDay)
+        (nowDay < 10 ? '0' + nowDay : nowDay);
 
       //获取患者信息
       this.getPatientList()
@@ -179,9 +179,9 @@
       tabclickEvent(val) {
         for (let i = 0; i < this.prescriptions.length; i++) {
           if (this.prescriptions[i].name == val.name) {
-            this.curPrescriptions = {}
-            var temp = this.deepClone(this.prescriptions[i])
-            this.curPrescriptions = temp
+            this.curPrescriptions = {};
+            var temp = this.deepClone(this.prescriptions[i]);
+            this.curPrescriptions = temp;
             console.log(this.curPrescriptions)
           }
         }
@@ -189,19 +189,19 @@
         if (!source && typeof source !== 'object') {
           throw new Error('error arguments', 'shallowClone')
         }
-        const targetObj = source.constructor === Array ? [] : {}
+        const targetObj = source.constructor === Array ? [] : {};
         Object.keys(source).forEach((keys) => {
           if (source[keys] && typeof source[keys] === 'object') {
             targetObj[keys] = this.deepClone(source[keys])
           } else {
             targetObj[keys] = source[keys]
           }
-        })
+        });
         return targetObj
       },
       getTotal() {
-        var total = 0
-        console.log(this.prescriptions)
+        var total = 0;
+        console.log(this.prescriptions);
         for (let i = 0; i < this.prescriptions.length; i++) {
           if (this.prescriptions[i].advices != null) {
             for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
@@ -230,12 +230,12 @@
           let params = {
             'id': this.patientInfo.id,
             'record_time': this.record_date
-          }
-          this.loadingtwo = true
+          };
+          this.loadingtwo = true;
           upload(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
-              this.loadingtwo = false
+              this.$message.error(response.data.msg);
+              this.loadingtwo = false;
 
               return false
 
@@ -243,53 +243,53 @@
               this.loadingtwo = false
 
             }
-          })
+          });
 
-          this.state = '已收费'
+          this.state = '已收费';
           this.$message({ message: '收费成功', type: 'success' })
         } else if (index == 5) {
           this.$message({ message: '退费成功', type: 'success' })
         } else if (index == 6) {
 
           if (this.patientInfo.id == 0) {
-            this.$message.error('请先选择要挂号的病人')
+            this.$message.error('请先选择要挂号的病人');
             return
           }
           let params = {
             'id': this.patientInfo.id,
             'record_time': this.record_date
-          }
-          this.loadingone = true
+          };
+          this.loadingone = true;
           register(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
-              this.loadingone = false
+              this.$message.error(response.data.msg);
+              this.loadingone = false;
 
               return false
 
             } else {
-              this.loadingone = false
-              var his_info = response.data.data.his_info
+              this.loadingone = false;
+              var his_info = response.data.data.his_info;
               this.hisPatientInfo = his_info
             }
           })
         }
       },
       addTab(targetName) {
-        let newTabName = ++this.tabIndex + ''
+        let newTabName = ++this.tabIndex + '';
         this.editableTabs.push({
           title: '处方' + this.tabIndex,
           name: newTabName
-        })
+        });
         this.editableTabsValue = newTabName
       },
       removeTab(targetName) {
-        let tabs = this.editableTabs
-        let activeName = this.editableTabsValue
+        let tabs = this.editableTabs;
+        let activeName = this.editableTabsValue;
         if (activeName === targetName) {
           tabs.forEach((tab, index) => {
             if (tab.name === targetName) {
-              let nextTab = tabs[index + 1] || tabs[index - 1]
+              let nextTab = tabs[index + 1] || tabs[index - 1];
               if (nextTab) {
                 activeName = nextTab.name
               }
@@ -297,7 +297,7 @@
           })
         }
 
-        this.editableTabsValue = activeName
+        this.editableTabsValue = activeName;
         this.editableTabs = tabs.filter(tab => tab.name !== targetName)
       },
       addCharges() {
@@ -307,8 +307,8 @@
 
       },
       changeRadio(id) {
-        console.log(id)
-        this.radioStatus = id
+        console.log(id);
+        this.radioStatus = id;
         this.getPatientList()
       },
 
@@ -316,13 +316,13 @@
       getPatientList() {
         let params = {
           'record_date': this.record_date
-        }
+        };
         getSchedulePatientList(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
-            this.patientTableData = []
+            this.patientTableData = [];
             // let cal_one = 0
             // let cal_two = 0
             for (let i = 0; i < response.data.data.list.length; i++) {
@@ -342,7 +342,7 @@
       },
 
       unique(arr) {
-        const res = new Map()
+        const res = new Map();
         return arr.filter((arr) => !res.has(arr.id_card_no) && res.set(arr.id_card_no, 1))
       },
       handleCurrentChange(val) {
@@ -351,26 +351,26 @@
       getPatientInformation(id) {
         let params = {
           'record_date': this.record_date,
-          'patient_id': id
-        }
+          'patient_id': id,
+        };
         getPatientInfo(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
-            this.patientInfo = response.data.data.xt_info
-            this.hisPatientInfo = response.data.data.his_info
-            this.prescriptions = []
+            this.patientInfo = response.data.data.xt_info;
+            this.hisPatientInfo = response.data.data.his_info;
+            this.prescriptions = [];
             for (let i = 0; i < response.data.data.prescription.length; i++) {
-              var prescription = response.data.data.prescription[i]
-              let index = i + 1
+              var prescription = response.data.data.prescription[i];
+              let index = i + 1;
               let obj = {
                 name: '处方' + index,
                 advices: prescription.advices,
                 project: prescription.project,
                 type: response.data.data.prescription[i].type
-              }
-              this.prescriptions.push(obj)
+              };
+              this.prescriptions.push(obj);
               this.curPrescriptions = this.prescriptions[0]
 
             }

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

@@ -188,21 +188,24 @@
         let params={
           patient_id:this.patient_id,
           start_time: this.start_time,
-          end_time:this.end_time
-        }
+          end_time:this.end_time,
+          p_type:2,
+        };
         this.GetCallHisPrescription(params)
       },changeEndTime(){
         let params={
           patient_id:this.patient_id,
           start_time: this.start_time,
-          end_time:this.end_time
-        }
+          end_time:this.end_time,
+          p_type:2,
+
+        };
         this.GetCallHisPrescription(params)
       },
       GetCallHisPrescription(params){
         getCallHisPrescription(params).then(response => {
           if (response.data.state == 1) {
-            this.allPrescription = response.data.data.prescriptions
+            this.allPrescription = response.data.data.prescriptions;
             for (let i = 0; i < this.allPrescription.length; i++){
               this.allPrescription[i].check_group = []
             }
@@ -214,13 +217,13 @@
         })
       },
       save() {
-        let replace_one = []
-        let replace_two = []
+        let replace_one = [];
+        let replace_two = [];
 
-        let checkGroup = []
-        let allPrescriptions = []
-        let targetPrescriptions = []
-        let prescriptions = []
+        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])
@@ -239,10 +242,10 @@
 
         if (targetPrescriptions.length > 0) {
           for (let i = 0; i < targetPrescriptions.length; i++) {
-            var prescription = targetPrescriptions[i]
-            let tempAdvice = []
-            let tempProject = []
-            let tempAddition = []
+            var prescription = targetPrescriptions[i];
+            let tempAdvice = [];
+            let tempProject = [];
+            let tempAddition = [];
             for (let b = 0; b < prescription.doctor_advice.length; b++) {
               let obj = {
                 advice_id: 0,
@@ -258,7 +261,7 @@
                 prescribing_number_unit:prescription.doctor_advice[b].prescribing_number_unit,
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
                 id:prescription.doctor_advice[b].drug_id
-              }
+              };
               tempAdvice.push(obj)
 
             }
@@ -278,7 +281,7 @@
                 price:prescription.project[b].price,
                 remark:prescription.project[b].remark,
                 medical_code:prescription.project[b].project.medical_code,
-              }
+              };
               tempProject.push(obj)
             }
             let obj = {
@@ -288,32 +291,32 @@
               addition:tempAddition,
               type:prescription.type,
               order_status:0,
-            }
+            };
             prescriptions.push(obj)
           }
         }
 
         if(this.srcPrescriptions.length == 1){
           if(this.srcPrescriptions[0].advices.length == 0 && this.srcPrescriptions[0].project.length == 0){
-            this.srcPrescriptions = []
-            this.srcPrescriptions = prescriptions
+            this.srcPrescriptions = [];
+            this.srcPrescriptions = prescriptions;
             this.$emit('call', this.srcPrescriptions)
           }else{
 
-            this.srcPrescriptions =  this.srcPrescriptions.concat(prescriptions)
+            this.srcPrescriptions =  this.srcPrescriptions.concat(prescriptions);
             this.$emit('call', this.srcPrescriptions)
           }
         }else{
-          this.srcPrescriptions =  this.srcPrescriptions.concat(prescriptions)
+          this.srcPrescriptions =  this.srcPrescriptions.concat(prescriptions);
           this.$emit('call', this.srcPrescriptions)
         }
       },show(name,id,end_time, start_time,srcPrescriptions,prescriptions){
-        this.srcPrescriptions = srcPrescriptions
-        this.start_time  = start_time
-        this.end_time = end_time
-        this.patient_id = id
-        this.name = '处方调用' + '（'+name +'）'
-        this.allPrescription = prescriptions
+        this.srcPrescriptions = srcPrescriptions;
+        this.start_time  = start_time;
+        this.end_time = end_time;
+        this.patient_id = id;
+        this.name = '处方调用' + '（'+name +'）';
+        this.allPrescription = prescriptions;
         for (let i = 0; i < this.allPrescription.length; i++){
           this.allPrescription[i].check_group = []
         }
@@ -327,8 +330,8 @@
         return uParseTime(time,template)
 
       }, getGroup(id){
-        var name = ""
-        var statistics_category =  getDictionaryDataConfig('system','statistics_category')
+        var name = "";
+        var statistics_category =  getDictionaryDataConfig('system','statistics_category');
         for(let i=0;i<statistics_category.length;i++){
           if(id == statistics_category[i].id){
             name = statistics_category[i].name

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -425,8 +425,6 @@
     getDayOrMonthHisPrescription,
     getInitData,
     getNextOrLastHisPrescription,
-    getPatientInfo,
-    getSchedulePatientList
   } from '@/api/his/his'
   import { getDictionaryDataConfig } from '@/utils/data'
   import prescriptionTable from './prescriptionTable'
@@ -967,7 +965,8 @@
         let params = {
           patient_id: this.patientInfo.id,
           start_time: val,
-          end_time: this.end_time
+          end_time: this.end_time,
+          p_type:2
         };
         getDayOrMonthHisPrescription(params).then(response => {
           if (response.data.state == 1) {
@@ -1070,7 +1069,10 @@
         let params = {
           patient_id: this.patientInfo.id,
           start_time: this.start_time,
-          end_time: val
+          end_time: val,
+          p_type:2
+
+
         };
         getDayOrMonthHisPrescription(params).then(response => {
           if (response.data.state == 1) {
@@ -1295,7 +1297,9 @@
           let params = {
             patient_id: this.patientInfo.id,
             record_time: this.request_record_date,
-            type: 1
+            type: 1,
+            p_type:2,
+
           };
 
           this.GetNextOrLastHisPrescription(params)
@@ -1303,7 +1307,8 @@
           let params = {
             patient_id: this.patientInfo.id,
             record_time: this.request_record_date,
-            type: 1
+            type: 1,
+            p_type:2,
           };
 
           this.GetNextOrLastHisPrescription(params)
@@ -1326,7 +1331,8 @@
           let params = {
             patient_id: this.patientInfo.id,
             record_time: this.request_record_date,
-            type: 2
+            type: 2,
+            p_type:2,
           };
 
           this.GetNextOrLastHisPrescription(params)
@@ -1334,7 +1340,8 @@
           let params = {
             patient_id: this.patientInfo.id,
             record_time: this.request_record_date,
-            type: 2
+            type: 2,
+            p_type:2,
           };
           this.GetNextOrLastHisPrescription(params)
 
@@ -1837,7 +1844,8 @@
           let params = {
             end_time: this.record_date,
             start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
-            patient_id: this.patientInfo.id
+            patient_id: this.patientInfo.id,
+            p_type:2,
           };
           getCallHisPrescription(params).then(response => {
             if (response.data.state == 1) {

src/xt_pages/outpatientDoctorStation/components/nextOrLastPrescription.vue

@@ -239,8 +239,9 @@
           let params = {
             patient_id: this.patient_id,
             record_time: this.request_record_date,
-            type: 1
-          }
+            type: 1,
+            p_type:2,
+          };
 
           this.GetNextOrLastHisPrescription(params)
 
@@ -251,15 +252,17 @@
           let params = {
             patient_id: this.patient_id,
             record_time: this.request_record_date,
-            type: 2
-          }
+            type: 2,
+            p_type:2,
+
+          };
           this.GetNextOrLastHisPrescription(params)
         }
       },
       GetNextOrLastHisPrescription(params){
         getNextOrLastHisPrescription(params).then(response => {
           if (response.data.state == 1) {
-            this.allPrescription = response.data.data.prescriptions
+            this.allPrescription = response.data.data.prescriptions;
             for (let i = 0; i < this.allPrescription.length; i++){
               this.allPrescription[i].check_group = []
             }
@@ -271,13 +274,13 @@
         })
       },
       save() {
-        let replace_one = []
-        let replace_two = []
+        let replace_one = [];
+        let replace_two = [];
 
-        let checkGroup = []
-        let allPrescriptions = []
-        let targetPrescriptions = []
-        let prescriptions = []
+        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])
@@ -296,10 +299,10 @@
 
         if (targetPrescriptions.length > 0) {
           for (let i = 0; i < targetPrescriptions.length; i++) {
-            var prescription = targetPrescriptions[i]
-            let tempAdvice = []
-            let tempProject = []
-            let tempAddition = []
+            var prescription = targetPrescriptions[i];
+            let tempAdvice = [];
+            let tempProject = [];
+            let tempAddition = [];
             for (let b = 0; b < prescription.doctor_advice.length; b++) {
               let obj = {
                 advice_id: 0,
@@ -315,7 +318,7 @@
                 prescribing_number_unit:prescription.doctor_advice[b].prescribing_number_unit,
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
                 id:prescription.doctor_advice[b].drug_id
-              }
+              };
               tempAdvice.push(obj)
 
             }
@@ -335,7 +338,7 @@
                 price:prescription.project[b].price,
                 remark:prescription.project[b].remark,
                 medical_code:prescription.project[b].project.medical_code,
-              }
+              };
               tempProject.push(obj)
             }
             let obj = {
@@ -345,40 +348,40 @@
               addition:tempAddition,
               order_status:0,
               // type: type,
-            }
+            };
             prescriptions.push(obj)
           }
         }
 
-        console.log(this.srcPrescriptions)
+        console.log(this.srcPrescriptions);
 
         if(this.srcPrescriptions.length == 1){
           if(this.srcPrescriptions[0].advices.length == 0 && this.srcPrescriptions[0].project.length == 0){
-            this.srcPrescriptions = []
-            this.srcPrescriptions = prescriptions
+            this.srcPrescriptions = [];
+            this.srcPrescriptions = prescriptions;
             this.$emit('save', this.srcPrescriptions)
           }else{
 
-            this.srcPrescriptions =  this.srcPrescriptions.concat(prescriptions)
+            this.srcPrescriptions =  this.srcPrescriptions.concat(prescriptions);
             this.$emit('save', this.srcPrescriptions)
           }
         }else{
-          this.srcPrescriptions =  this.srcPrescriptions.concat(prescriptions)
+          this.srcPrescriptions =  this.srcPrescriptions.concat(prescriptions);
           this.$emit('save', this.srcPrescriptions)
         }
 
 
 
       },show(prescriptions,name,id,srcPrescriptions){
-        this.srcPrescriptions = srcPrescriptions
-        this.patient_id = id
-        this.request_record_date = uParseTime(prescriptions[0].record_date, '{y}-{m}-{d}')
-        this.name = name
-        this.allPrescription = prescriptions
+        this.srcPrescriptions = srcPrescriptions;
+        this.patient_id = id;
+        this.request_record_date = uParseTime(prescriptions[0].record_date, '{y}-{m}-{d}');
+        this.name = name;
+        this.allPrescription = prescriptions;
         for (let i = 0; i < this.allPrescription.length; i++){
           this.allPrescription[i].check_group = []
         }
-        console.log(this.allPrescription)
+        console.log(this.allPrescription);
         this.isLastOrNextVisible = true
       },close(){
         this.isLastOrNextVisible = false
@@ -389,8 +392,8 @@
         return uParseTime(time,template)
 
       }, getGroup(id){
-        var name = ""
-        var statistics_category =  getDictionaryDataConfig('system','statistics_category')
+        var name = "";
+        var statistics_category =  getDictionaryDataConfig('system','statistics_category');
         for(let i=0;i<statistics_category.length;i++){
           if(id == statistics_category[i].id){
             name = statistics_category[i].name