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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -510,9 +510,8 @@
     refunddetail,
     refundNumber,
     register,
-    upload,
-    getMonthCharge
-  } from '@api/his/his'
+    upload
+  } from '@/api/his/his'
   import RegisterDialog from './components/registerDialog'
   import treatPrint from './treatPrint'
   import statementPrint from './statementPrint'
@@ -3244,253 +3243,6 @@
           }
         }
       },
-      getMonthPatientInformation(id, batch_number, his_patient_id, order_id) {
-        const params = {
-          'record_date': this.record_date,
-          'patient_id': id,
-          'his_patient_id': his_patient_id,
-          'number': batch_number,
-          'start_time': this.other_start_time,
-          'end_time': this.other_end_time,
-          'type': this.radio,
-          'p_type': 2,
-          'order_id': order_id
-
-        }
-        this.loading = true
-        getChargeHisPatientInfo(params).then(response => {
-          if (response.data.state == 0) {
-            this.loading = false
-
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.prescriptions = []
-            this.month_prescriptions = []
-            this.big_month_prescriptions = []
-            this.big_prescriptions = []
-            this.curPrescriptions = {}
-            this.curMonthPrescriptions = {}
-            this.loading = false
-            this.patientInfo = response.data.data.xt_info
-            this.hisPatientInfo = response.data.data.his_info
-            this.info = response.data.data.info
-            this.order = response.data.data.order
-            this.p_type = ''
-            this.sick_type = ''
-            this.diagnosis = []
-            this.sick_history = ''
-            this.form.diagnosis = []
-            if (this.info.id > 0) {
-              this.form.p_type = response.data.data.info.register_type
-              this.form.sick_type = response.data.data.info.sick_type
-              if (response.data.data.info.diagnosis.length == 0) {
-                this.form.diagnosis = []
-              } else {
-                for (let i = 0; i < response.data.data.info.diagnosis.split(',').length; i++) {
-                  this.form.diagnosis.push(parseInt(response.data.data.info.diagnosis.split(',')[i]))
-                }
-              }
-              this.sick_history = this.info.sick_history
-              if (this.info.register_type == 0) {
-                this.form.p_type = ''
-              }
-
-              if (this.info.sick_type == 0) {
-                this.form.sick_type = ''
-              }
-            } else {
-              this.form.p_type = 14
-              this.form.sick_type = this.sick[0].id
-              if (response.data.data.last_info.diagnoses.length == 0) {
-                this.form.diagnosis = []
-              } else {
-                for (let i = 0; i < response.data.data.last_info.diagnosis.split(',').length; i++) {
-                  this.form.diagnosis.push(parseInt(response.data.data.last_info.diagnosis.split(',')[i]))
-                }
-              }
-
-              this.sick_history = ''
-            }
-            this.addtions_charge = response.data.data.addtions_charge
-            this.setMonthPrescription(response.data.data.month_prescriptions)
-
-            if (response.data.data.prescription.length > 0 && response.data.data.prescription[0].advices.length > 0) {
-              this.prescription_id = response.data.data.prescription[0].advices[0].prescription_id
-            } else {
-              this.prescription_id = 0
-            }
-
-            const big_prescriptions = []
-
-            for (let i = 0; i < this.unique_three(response.data.data.prescription).length; i++) {
-              const obj = {
-                med_type: this.unique_three(response.data.data.prescription)[i].med_type,
-                prescriptions: []
-              }
-              big_prescriptions.push(obj)
-            }
-
-            for (let c = 0; c < big_prescriptions.length; c++) {
-              const inner_prescription = []
-              for (let i = 0; i < response.data.data.prescription.length; i++) {
-                var prescription = response.data.data.prescription[i]
-
-                if (big_prescriptions[c].med_type == prescription.med_type) {
-                  const tempAdvice = []
-                  const tempProject = []
-                  const tempAddition = []
-                  for (let b = 0; b < prescription.advices.length; b++) {
-                    const obj = {
-                      advice_id: prescription.advices[b].id,
-                      drug_name: prescription.advices[b].advice_name,
-                      single_dose: prescription.advices[b].single_dose,
-                      delivery_way: prescription.advices[b].delivery_way,
-                      execution_frequency: prescription.advices[b].execution_frequency,
-                      retail_price: prescription.advices[b].price.toString(),
-                      remark: prescription.advices[b].remark,
-                      day: prescription.advices[b].day,
-                      prescribing_number: prescription.advices[b].prescribing_number.toString(),
-                      single_dose_unit: prescription.advices[b].single_dose_unit,
-                      prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
-                      medical_insurance_number: prescription.advices[b].med_list_codg
-
-                    }
-                    tempAdvice.push(obj)
-                  }
-
-                  for (let b = 0; b < prescription.project.length; b++) {
-                    const obj = {
-                      id: prescription.project[b].id,
-                      project_id: prescription.project[b].project.id,
-                      // project_name: prescription.project[b].project.project_name,
-                      // statistical_classification: prescription.project[b].project.statistical_classification,
-                      single_dose: prescription.project[b].single_dose,
-                      delivery_way: prescription.project[b].delivery_way,
-                      execution_frequency: prescription.project[b].execution_frequency,
-                      number_days: prescription.project[b].day,
-                      total: prescription.project[b].count.toString(),
-                      price: prescription.project[b].price,
-                      remark: prescription.project[b].remark,
-                      // medical_code: prescription.project[b].project.medical_code,
-                      unit: prescription.project[b].unit,
-                      type: prescription.project[b].type
-                    }
-
-                    if (prescription.project[b].type == 2) {
-                      obj['statistical_classification'] = prescription.project[b].project.statistical_classification
-                      obj['medical_code'] = prescription.project[b].project.medical_code
-                      obj['project_name'] = prescription.project[b].project.project_name
-
-                    } else if (prescription.project[b].type == 3) {
-                      obj['statistical_classification'] = ''
-                      obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
-                      obj['project_name'] = prescription.project[b].good_info.good_name
-                    }
-
-                    tempProject.push(obj)
-                  }
-
-                  for (let b = 0; b < prescription.addition.length; b++) {
-                    const obj = {
-                      id: prescription.addition[b].id,
-                      item_name: prescription.addition[b].item_name,
-                      price: prescription.addition[b].price,
-                      count: prescription.addition[b].count,
-                      item_id: prescription.addition[b].item_id
-                    }
-                    tempAddition.push(obj)
-                  }
-                  const index = i + 1
-                  console.log('~~~~~~~~')
-                  console.log(prescription.order)
-                  prescription.order.order_status = prescription.order.order_status.toString()
-                  prescription.order.order_status = parseInt(prescription.order.order_status)
-
-                  const obj = {
-                    id: prescription.id,
-                    name: this.getPName(prescription.med_type, index),
-                    advices: tempAdvice,
-                    project: tempProject,
-                    addition: tempAddition,
-                    order_status: prescription.order_status,
-                    type: prescription.type,
-                    med_type: prescription.med_type,
-                    order: prescription.order
-                  }
-                  // inner_prescription.push(obj)
-                  big_prescriptions[c].prescriptions.push(obj)
-
-                  this.prescriptions.push(obj)
-                }
-              }
-            }
-
-            this.big_prescriptions = JSON.parse(JSON.stringify(big_prescriptions))
-
-            for (let i = 0; i < this.big_prescriptions.length; i++) {
-              if (this.big_prescriptions[i].med_type == '11') {
-                this.big_prescriptions[i]['is_true'] = 1
-              }
-            }
-
-            for (let i = 0; i < this.big_prescriptions.length; i++) {
-              if (this.big_prescriptions[i].is_true == 1) {
-                for (let b = 0; b < this.big_prescriptions[i].prescriptions.length; b++) {
-                  const obj = {
-                    med_type: '11',
-                    prescriptions: []
-                  }
-                  const arr = []
-                  arr.push(this.big_prescriptions[i].prescriptions[b])
-                  obj.prescriptions = arr
-                  this.big_prescriptions.push(obj)
-                }
-              }
-            }
-
-            console.log(this.big_prescriptions)
-            //
-            for (let i = 0; i < this.big_prescriptions.length; i++) {
-              if (this.big_prescriptions[i].is_true == 1) {
-                this.big_prescriptions.splice(i, 1)
-              }
-            }
-            // console.log(this.big_prescriptions)
-
-            for (let i = 0; i < this.big_prescriptions.length; i++) {
-              if (this.big_prescriptions[i].prescriptions.length > 0) {
-                this.big_prescriptions[i]['curPrescriptions'] = JSON.parse(JSON.stringify(this.big_prescriptions[i].prescriptions[0]))
-              } else {
-                this.big_prescriptions[i]['curPrescriptions'] = {}
-              }
-              this.big_prescriptions[i]['total'] = this.getTotalThree(this.big_prescriptions[i])
-            }
-
-            if (this.big_prescriptions.length > 0) {
-              this.editableTabsValue = this.getPName(this.big_prescriptions[0].med_type, 1)
-            }
-
-            console.log(this.big_prescriptions)
-            console.log(this.big_prescriptions[0].curPrescriptions.order_status)
-
-            //
-            // if (this.prescriptions.length > 0) {
-            //   this.curPrescriptions = this.prescriptions[0]
-            // } else {
-            //   this.curPrescriptions = {}
-            // }
-            // if (this.month_prescriptions.length > 0) {
-            //   this.curMonthPrescriptions = this.month_prescriptions[0]
-            // } else {
-            //   this.curMonthPrescriptions = {}
-            // }
-
-            // this.month_total = this.getMonthTotalOne()
-          }
-        })
-      },
-
       // 获取患者的基本信息
       getPatientInformation(id, batch_number, his_patient_id, order_id) {
         const params = {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -24,18 +24,18 @@
                         <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-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  filterable style="width:100%;" v-model="state1" placeholder="">
+                        <el-select filterable style="width:100%;" v-model="state1" placeholder="">
                             <el-option
                                     v-for="(item,index) in sick"
                                     :key="index"
@@ -48,7 +48,7 @@
 
                     <el-form-item label="诊断:" prop="name" label-position="right" style="width:66.6%;">
 
-                        <el-select style="width:100%;"  v-model="diagnose" placeholder="" multiple filterable>
+                        <el-select style="width:100%;" v-model="diagnose" placeholder="" multiple filterable>
                             <el-option
                                     v-for="(item,index) in diagnoses"
                                     :key="index"
@@ -128,7 +128,8 @@
                                 </el-date-picker>
 
 
-                                <el-select style="width:50%;" v-model="item.med_type" placeholder="医疗类型"   @change="changevalue" >
+                                <el-select style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
+                                           @change="changevalue">
                                     <el-option
                                             v-for="(item,index) in register"
                                             :key="index"
@@ -280,8 +281,8 @@
                                         </el-table-column>
                                         <el-table-column label="规格" width="60">
                                             <template slot-scope="scope">
-                                              <!-- {{ scope.row.drug_spec }} -->
-                                              <span v-if="scope.row.min_unit != scope.row.dose_unit">{{scope.row.dose}}{{scope.row.dose_unit}}&nbsp;* &nbsp;</span>{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+                                                <!-- {{ scope.row.drug_spec }} -->
+                                                <span v-if="scope.row.min_unit != scope.row.dose_unit">{{scope.row.dose}}{{scope.row.dose_unit}}&nbsp;* &nbsp;</span>{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
                                             </template>
                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
@@ -519,25 +520,25 @@
           { value: 11, label: '普通门诊' },
           // { value: 12, label: '门诊挂号' },
           // { value: 13, label: '急诊' },
-          { value: 14, label: '门诊特殊病' },
+          { value: 14, label: '门诊特殊病' }
           // { value: 15, label: '门诊统筹' },
           // { value: 16, label: '门诊慢性病' },
           // { value: 21, label: '普通住院' }
 
         ],
-        medical_care:[
-          {value: 11, label: "普通门诊"},
-          {value: 12, label: '家庭通道'},
-          {value: 13, label: "门诊大病"},
-          {value: 14, label: "重疾特药"},
-          {value: 15, label: "门诊慢病"},
-          {value: 16, label: "门诊特检"},
-          {value: 17, label: "健康体检"},
-          {value: 18, label: "预防接种"},
-          {value: 19, label: "门诊输血"},
-          {value: 91, label: "新冠肺炎门诊"},
-          {value: 1111, label: "精一"},
-          {value: 1112, label: "精二"},
+        medical_care: [
+          { value: 11, label: '普通门诊' },
+          { value: 12, label: '家庭通道' },
+          { value: 13, label: '门诊大病' },
+          { value: 14, label: '重疾特药' },
+          { value: 15, label: '门诊慢病' },
+          { value: 16, label: '门诊特检' },
+          { value: 17, label: '健康体检' },
+          { value: 18, label: '预防接种' },
+          { value: 19, label: '门诊输血' },
+          { value: 91, label: '新冠肺炎门诊' },
+          { value: 1111, label: '精一' },
+          { value: 1112, label: '精二' }
 
         ],
 
@@ -546,7 +547,7 @@
         register_type: '',
         value: '0',
         search_project_keyword: '',
-        search_project_team_keyword:"",
+        search_project_team_keyword: '',
         form: {
           name: ''
         },
@@ -588,7 +589,7 @@
         showTwo: false,
         tableData: [],
         tabPrjectTeam: [],
-        allTabPrjectTeam:[],
+        allTabPrjectTeam: [],
         teamList: [],
         doctors: [],
         departMent: [],
@@ -746,7 +747,6 @@
               // obj['single_dose_unit'] = drug_month_prescriptions.advices[a].single_dose_unit
               obj['single_dose_unit'] = drug_month_prescriptions.advices[a].drug.dose_unit
 
-
               // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
               obj['retail_price'] = parseFloat(drug_month_prescriptions.advices[a].price)
               obj['drug'] = drug_month_prescriptions.advices[a].drug
@@ -1299,8 +1299,7 @@
             ':' + (min < 10 ? '0' + min : min)
           this.prescriptions[i]['pre_time'] = nowTime
 
-            this.prescriptions[i]['med_type'] = 14
-
+          this.prescriptions[i]['med_type'] = 14
 
           this.prescriptions[i].name = '处方' + (i + 1)
           if (i == 0) {
@@ -1324,7 +1323,7 @@
         this.$refs.call_prescription.close()
         this.$emit('setData', this.prescriptions)
 
-      },changevalue(val){
+      }, changevalue(val) {
 
         this.$forceUpdate()
 
@@ -1359,10 +1358,7 @@
           this.prescriptions[i].name = '处方' + (i + 1)
           this.prescriptions[i]['pre_time'] = nowTime
 
-
-
-            this.prescriptions[i]['med_type'] = 14
-
+          this.prescriptions[i]['med_type'] = 14
 
           if (i == 0) {
             if (this.prescriptions[0].advices.length > 0 && this.prescriptions[0].project.length == 0) {
@@ -1526,7 +1522,7 @@
         this.$refs.additionalCharges.hide()
 
       }, searchProjectAction() {
-        console.log("~~~~")
+        console.log('~~~~')
         console.log(this.allProject)
 
         if (this.search_project_keyword.length == 0) {
@@ -1543,7 +1539,7 @@
 
         }
 
-      },searchProjectTeamAction(){
+      }, searchProjectTeamAction() {
         if (this.search_project_team_keyword.length == 0) {
           this.tabPrjectTeam = this.allTabPrjectTeam
 
@@ -1742,7 +1738,6 @@
             this.diagnoses = response.data.data.diagnose
             this.additions = response.data.data.additions
 
-
           }
         })
 
@@ -1847,12 +1842,11 @@
         this.teamList = []
 
       },
-      setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data,last_info) {
+      setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data, last_info) {
         this.curMonthPrescriptions = {}
         this.curPrescriptions = {}
         // this.$refs.tabProjectTeam.clearSelection()
 
-
         for (let i = 0; i < doctors.length; i++) {
           if (doctors[i].user_type == 1) {
             doctors.splice(i, 1)
@@ -1865,12 +1859,9 @@
         this.$emit('event1', this.prescription_id)
         this.curStatus = 0
         if (month_data && month_data.length > 0) {
-
           this.curMonthPrescriptions = month_data[0]
-
         } else {
           this.curMonthPrescriptions = {}
-
         }
 
         if (data && data.length > 0) {
@@ -1880,7 +1871,6 @@
           this.curPrescriptions = {}
         }
 
-
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
           this.curStatus = 1
           this.customTabIndex = 1
@@ -1897,7 +1887,6 @@
           this.showTwo = true
         }
 
-
         if (this.curPrescriptions.project.length == 0 && this.curPrescriptions.advices.length == 0) {
           this.curStatus = 1
           this.customTabIndex = 1
@@ -1906,9 +1895,6 @@
           this.showTwo = false
         }
 
-
-
-
         if (info.prescription_status == 0) {
           this.order_status = ''
         }
@@ -1924,8 +1910,6 @@
           this.order_status = '已退费'
         }
 
-
-
         getInitData().then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -1945,26 +1929,21 @@
             this.diagnoses = response.data.data.diagnose
             this.additions = response.data.data.additions
 
-
-
-
-
             if (info.id > 0) {
               this.doctorValue = info.doctor_id
               this.departmentValue = info.departments
             } else {
-              if(admin_info.id > 0 && admin_info.user_type == 2){
+              if (admin_info.id > 0 && admin_info.user_type == 2) {
                 this.doctorValue = admin_info.admin_user_id
                 this.departmentValue = this.department[0].id
 
-              }else{
+              } else {
 
                 this.doctorValue = this.doctors[0].admin_user_id
                 this.departmentValue = this.department[0].id
 
               }
 
-
             }
 
             if (info.register_type == 0) {
@@ -1976,217 +1955,32 @@
             }
             this.diagnose = []
 
-            if(info.id == 0){
-              if(last_info.diagnosis.length == 0){
+            if (info.id == 0) {
+              if (last_info.diagnosis.length == 0) {
                 this.diagnose = []
-              }else{
-                for(let i = 0; i < last_info.diagnosis.split(",").length;i++){
-                  this.diagnose.push(parseInt(last_info.diagnosis.split(",")[i]))
+              } else {
+                for (let i = 0; i < last_info.diagnosis.split(",").length; i++) {
+                  this.diagnose.push(parseInt(last_info.diagnosis.split(',')[i]))
 
                 }
               }
 
-              if(last_info.sick_history == 0){
+              if (last_info.sick_history == 0) {
                 this.state2 = ''
-              }else{
+              } else {
                 this.state2 = last_info.sick_history
               }
 
-
-            }else{
-              this.state2 = info.sick_history
-              if (this.state2 == 0) {
-                this.state2 = ''
-              }
-              if(info.diagnosis.length == 0){
-                this.diagnose = []
-              }else{
-                for(let i = 0; i < info.diagnosis.split(",").length;i++){
-                  this.diagnose.push(parseInt(info.diagnosis.split(",")[i]))
-
-                }
-
-              }
-
-            }
-
-
-
-            this.state1 = info.sick_type
-            if (this.state1 == 0 || this.state1 == "") {
-              this.state1 = ''
-              for (let i = 0; i < this.sick.length; i++) {
-                this.state1 = this.sick[0].id
-              }
-            }
-
-            if(this.departmentValue == "" || this.departmentValue == 0){
-              if(this.department.length > 0){
-                this.departmentValue = this.department[0].id
-
-              }
-            }
-
-          }
-        })
-
-      },
-      setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data,last_info) {
-        this.curMonthPrescriptions = {}
-        this.curPrescriptions = {}
-        // this.$refs.tabProjectTeam.clearSelection()
-
-
-        for (let i = 0; i < doctors.length; i++) {
-          if (doctors[i].user_type == 1) {
-            doctors.splice(i, 1)
-          }
-        }
-
-        this.prescription_id = data[0].id
-        this.editableTabsValue = '处方1'
-        this.dayorMonth = 'day'
-        this.$emit('event1', this.prescription_id)
-        this.curStatus = 0
-        if (month_data && month_data.length > 0) {
-
-          this.curMonthPrescriptions = month_data[0]
-
-        } else {
-          this.curMonthPrescriptions = {}
-
-        }
-
-        if (data && data.length > 0) {
-          this.curPrescriptions = data[0]
-
-        } else {
-          this.curPrescriptions = {}
-        }
-
-
-        if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
-          this.curStatus = 1
-          this.customTabIndex = 1
-          this.rightTab = 1
-          this.showOne = true
-          this.showTwo = false
-        }
-
-        if (this.curPrescriptions.project.length > 0 && this.curPrescriptions.advices.length == 0) {
-          this.curStatus = 2
-          this.customTabIndex = 2
-          this.rightTab = 2
-          this.showOne = false
-          this.showTwo = true
-        }
-
-
-        if (this.curPrescriptions.project.length == 0 && this.curPrescriptions.advices.length == 0) {
-          this.curStatus = 1
-          this.customTabIndex = 1
-          this.rightTab = 1
-          this.showOne = true
-          this.showTwo = false
-        }
-
-
-
-
-        if (info.prescription_status == 0) {
-          this.order_status = ''
-        }
-
-        if (this.curPrescriptions.order_status == 1) {
-          this.order_status = '未收费'
-        }
-        if (this.curPrescriptions.order_status == 2) {
-          this.order_status = '已结算'
-        }
-
-        if (this.curPrescriptions.order_status == 3) {
-          this.order_status = '已退费'
-        }
-
-
-
-        getInitData().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.drugs = response.data.data.drugs
-            this.allDrugs = response.data.data.drugs
-            this.advices_template = response.data.data.advices_template
-            this.doctors = response.data.data.doctors
-            for (let i = 0; i < this.doctors.length; i++) {
-              if (this.doctors[i].user_type == 1) {
-                this.doctors.splice(i, 1)
-              }
-            }
-            this.department = response.data.data.department
-            this.sick = response.data.data.sick
-            this.diagnoses = response.data.data.diagnose
-            this.additions = response.data.data.additions
-
-
-
-
-
-            if (info.id > 0) {
-              this.doctorValue = info.doctor_id
-              this.departmentValue = info.departments
             } else {
-              if(admin_info.id > 0 && admin_info.user_type == 2){
-                this.doctorValue = admin_info.admin_user_id
-                this.departmentValue = this.department[0].id
-
-              }else{
-
-                this.doctorValue = this.doctors[0].admin_user_id
-                this.departmentValue = this.department[0].id
-
-              }
-
-
-            }
-
-            if (info.register_type == 0) {
-              for (let i = 0; i < this.register.length; i++) {
-                this.register_type = this.register[0].value
-              }
-            } else {
-              this.register_type = info.register_type
-            }
-            this.diagnose = []
-
-            if(info.id == 0){
-              if(last_info.diagnosis.length == 0){
-                this.diagnose = []
-              }else{
-                for(let i = 0; i < last_info.diagnosis.split(",").length;i++){
-                  this.diagnose.push(parseInt(last_info.diagnosis.split(",")[i]))
-
-                }
-              }
-
-              if(last_info.sick_history == 0){
-                this.state2 = ''
-              }else{
-                this.state2 = last_info.sick_history
-              }
-
-
-            }else{
               this.state2 = info.sick_history
               if (this.state2 == 0) {
                 this.state2 = ''
               }
-              if(info.diagnosis.length == 0){
+              if (info.diagnosis.length == 0) {
                 this.diagnose = []
-              }else{
-                for(let i = 0; i < info.diagnosis.split(",").length;i++){
-                  this.diagnose.push(parseInt(info.diagnosis.split(",")[i]))
+              } else {
+                for (let i = 0; i < info.diagnosis.split(",").length; i++) {
+                  this.diagnose.push(parseInt(info.diagnosis.split(',')[i]))
 
                 }
 
@@ -2194,18 +1988,16 @@
 
             }
 
-
-
             this.state1 = info.sick_type
-            if (this.state1 == 0 || this.state1 == "") {
+            if (this.state1 == 0 || this.state1 == '') {
               this.state1 = ''
               for (let i = 0; i < this.sick.length; i++) {
                 this.state1 = this.sick[0].id
               }
             }
 
-            if(this.departmentValue == "" || this.departmentValue == 0){
-              if(this.department.length > 0){
+            if (this.departmentValue == '' || this.departmentValue == 0) {
+              if (this.department.length > 0) {
                 this.departmentValue = this.department[0].id
 
               }
@@ -2215,7 +2007,6 @@
         })
 
       },
-
       moreState(tab, event) {
         if (tab == 'more') {
           return false
@@ -2308,16 +2099,16 @@
             }
           }
           for (let i = 0; i < this.prescriptions.length; i++) {
-              if (this.prescriptions[i].med_type == 0 || this.prescriptions[i].med_type == '') {
-                this.$message.error('处方医疗类型不能为空')
-                return
-              }
+            if (this.prescriptions[i].med_type == 0 || this.prescriptions[i].med_type == '') {
+              this.$message.error('处方医疗类型不能为空')
+              return
+            }
           }
           if (index == 1) {
             let params = {
               p_type: 2,
               patient_id: this.patientInfo.id,
-              diagnose: this.diagnose.join(","),
+              diagnose: this.diagnose.join(','),
               sick_type: this.state1,
               sick_history: this.state2,
               doctor: this.doctorValue,
@@ -2342,7 +2133,6 @@
                 this.prescriptions[i].advices[b].day = parseInt(this.prescriptions[i].advices[b].day)
                 this.prescriptions[i].advices[b].groupno = parseInt(this.prescriptions[i].advices[b].groupno)
 
-
               }
 
               for (let b = 0; b < this.prescriptions[i].project.length; b++) {
@@ -2364,21 +2154,21 @@
               'prescriptions': this.prescriptions
             }
             isLoading = true
-            console.log('this.prescriptionsthis.prescriptions',this.prescriptions)
+            console.log('this.prescriptionsthis.prescriptions', this.prescriptions)
             let num = 0
             this.prescriptions.map(item => {
-              if(item.advices.length > 0){
+              if (item.advices.length > 0) {
                 item.advices.map(it => {
-                  if(it.drug.total <= 0){
+                  if (it.drug.total <= 0) {
                     num++
-                    setTimeout(() =>{
+                    setTimeout(() => {
                       this.$message.error(it.drug.drug_name + '库存不足')
-                    },100)
+                    }, 100)
                   }
                 })
               }
             })
-            if(num == 0){
+            if (num == 0) {
               createHisPrescription(data, params).then(response => {
                 if (response.data.state == 1) {
                   this.$emit('change', this.patientInfo.id)
@@ -2415,7 +2205,7 @@
             if (index == 1) {
               let params = {
                 patient_id: this.patientInfo.id,
-                diagnose: this.diagnose.join(","),
+                diagnose: this.diagnose.join(','),
                 sick_type: this.state1,
                 sick_history: this.state2,
                 doctor: this.doctorValue,
@@ -2510,17 +2300,14 @@
           advices: [],
           project: [],
           addition: [],
-          pre_time: this.prescriptions[0].pre_time,
-
+          pre_time: this.prescriptions[0].pre_time
 
         }
 
-          obj.med_type = 14
-
+        obj.med_type = 14
 
         this.prescriptions.push(obj)
 
-
         this.editableTabsValue = newTabName
         this.curPrescriptions = this.prescriptions[this.prescriptions.length - 1]
         this.curStatus = 0
@@ -2719,17 +2506,17 @@
         this.$refs.additionalCharges.show()
       },
       selectDrugs(selection, row) {
-        console.log('selection',selection)
-        console.log('row',row)
-        if(row.total <= 0){
+        console.log('selection', selection)
+        console.log('row', row)
+        if (row.total <= 0) {
           if (selection) {
             selection.forEach(row => {
-              if(row.total <= 0){
-                this.$refs.multipleTable.toggleRowSelection(row);
+              if (row.total <= 0) {
+                this.$refs.multipleTable.toggleRowSelection(row)
               }
-            });
+            })
           } else {
-            this.$refs.multipleTable.clearSelection();
+            this.$refs.multipleTable.clearSelection()
           }
           this.$message.error(row.drug_name + '库存不足')
           return
@@ -2739,8 +2526,8 @@
 
       comfirm() {
 
-       if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0){
-          if(this.$store.getters.xt_user.org_id == 10138) {
+        if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
+          if (this.$store.getters.xt_user.org_id == 10138) {
             for (let i = 0; i < this.curDrugs.length; i++) {
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
@@ -2751,9 +2538,8 @@
           }
         }
 
-
-        if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0){
-          if(this.$store.getters.xt_user.org_id == 10138) {
+        if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
+          if (this.$store.getters.xt_user.org_id == 10138) {
             for (let i = 0; i < this.curDrugs.length; i++) {
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
@@ -2764,7 +2550,6 @@
           }
         }
 
-
         // if (this.curPrescriptions.order_status == 2) {
         //   this.$message.error('该处方已经结算，无法继续添加药品或者项目')
         //   this.teamList = []
@@ -2836,9 +2621,9 @@
             var temp2 = this.deepClone(this.teamList)
 
             var temp3 = this.deepClone(templateDrugs)
-            console.log("hhhhhhhhhhhhhh",temp)
-            console.log("hhhh23",temp2)
-            console.log("hhhh23",temp3)
+            console.log('hhhhhhhhhhhhhh', temp)
+            console.log('hhhh23', temp2)
+            console.log('hhhh23', temp3)
             if (temp3.length > 0) {
               for (let b = 0; b < temp3.length; b++) {
                 let obj = {
@@ -2850,7 +2635,7 @@
                   execution_frequency: temp3[b].execution_frequency,
                   retail_price: temp3[b].drug.retail_price.toString(),
                   remark: '',
-                  day: "1",
+                  day: '1',
                   prescribing_number: temp3[b].prescribing_number,
                   single_dose_unit: temp3[b].drug.dose_unit,
                   prescribing_number_unit: temp3[b].drug.prescribing_number_unit,
@@ -2868,7 +2653,7 @@
 
             let index = 0
 
-            if(this.curPrescriptions.advices.length > 0){
+            if (this.curPrescriptions.advices.length > 0) {
               index = this.curPrescriptions.advices.length
             }
 
@@ -2890,13 +2675,13 @@
                   prescribing_number_unit: temp[b].prescribing_number_unit,
                   medical_insurance_number: temp[b].medical_insurance_number,
                   drug: temp[b],
-                  groupno:index+temp_index,
+                  groupno: index + temp_index
                 }
 
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
                   obj.prescribing_number = 1
                 }
-                console.log('obj',obj)
+                console.log('obj', obj)
                 this.prescriptions[i].advices.push(obj)
               }
               this.curStatus = 1
@@ -2925,7 +2710,7 @@
                   delivery_way: temp2[b].delivery_way,
                   execution_frequency: temp2[b].execution_frequency,
                   number_days: temp2[b].number_days.toString(),
-                  total:  temp2[b].cus_total,
+                  total: temp2[b].cus_total,
                   price: temp2[b].price,
                   remark: '',
                   medical_code: temp2[b].medical_code,
@@ -2938,7 +2723,7 @@
                 if (obj.type == 3) {
                   obj.single_dose = 1
                 }
-                console.log('项目obj',temp2)
+                console.log('项目obj', temp2)
                 this.prescriptions[i].project.push(obj)
               }
               this.curStatus = 2
@@ -2959,15 +2744,15 @@
         this.teamList = row
       },
       selectChange(selection, row) {
-        if(row.total <= 0){
+        if (row.total <= 0) {
           if (selection) {
             selection.forEach(row => {
-              if(row.total <= 0){
-                this.$refs.tables.toggleRowSelection(row);
+              if (row.total <= 0) {
+                this.$refs.tables.toggleRowSelection(row)
               }
-            });
+            })
           } else {
-            this.$refs.tables.clearSelection();
+            this.$refs.tables.clearSelection()
           }
           this.$message.error(row.project_name + '库存不足')
           return
@@ -2990,10 +2775,10 @@
                 number_days: project[i].number_days,
                 price: project[i].price,
                 medical_code: project[i].medical_code,
-                cus_total:1,
+                cus_total: 1,
                 unit: project[i].unit,
                 type: 2,
-                total:project[i].total
+                total: project[i].total
               }
 
               this.tabProject.push(obj)
@@ -3010,12 +2795,12 @@
                 delivery_way: '',
                 execution_frequency: '',
                 number_days: 1,
-                cus_total:1,
+                cus_total: 1,
                 price: good_info[i].packing_price,
                 medical_code: good_info[i].medical_insurance_number,
                 unit: this.getGoodUnit(good_info[i].good_unit),
                 type: 3,
-                total:good_info[i].total
+                total: good_info[i].total
               }
               this.tabProject.push(obj)
             }
@@ -3053,7 +2838,6 @@
             this.tabPrjectTeam = team
             this.allTabPrjectTeam = team
 
-
             this.projectList = team
           }
         })
@@ -3104,7 +2888,7 @@
                   delivery_way: project[i].project.delivery_way,
                   execution_frequency: project[i].project.execution_frequency,
                   number_days: project[i].project.number_days,
-                  cus_total:project[i].number,
+                  cus_total: project[i].number,
                   price: project[i].project.price,
                   remark: '',
                   medical_code: project[i].project.medical_code,
@@ -3156,13 +2940,15 @@
       },
       changeDayOrMonth(tab) {
         if (this.dayorMonth == 'day') {
-
+          this.$emit('day')
         } else if (this.dayorMonth == 'month') {
+          console.log('~~~~~~')
           let form = {
             id: this.patientInfo.id,
-            his_patient_id: this.hisPatientInfo.id,
+            his_patient_id: this.hisPatientInfo.id
           }
-          this.$emit("change-month",form)
+          console.log(form)
+          this.$emit('month', form)
         }
       },
       getAllProjectList() {