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

src/api/his/his.js

 }
 
 
+export function changeMedType(params) {
+  return request({
+    url: "/api/changemedtype/post",
+    method: "post",
+    params:params,
+  });
+}
+
+
+
+
 
 
 

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

         this.form.certificates = 1
         this.form.medical_care = 11
         this.form.settlement_value = 1
+        this.form.register = 4
+        this.form.registration_fee = 0
+        this.form.medical_expenses = 0
+
 
         // if( this.form.social_type == 0){
         //   this.form.social_type = ""

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

 
                     <el-form-item label="诊断:" prop="name" label-position="right">
 
-                        <el-select style="width:100%;" v-model="diagnose" placeholder="">
+                        <el-select style="width:100%;" v-model="diagnose" placeholder="" multiple>
                             <el-option
                                     v-for="(item,index) in diagnoses"
                                     :key="index"
         department: [],
         sick: [],
         diagnoses: [],
-        diagnose: "",
+        diagnose: [],
         state1: '',
         curTotal: 0,
         prescription_id: 0,
             this.diagnoses = response.data.data.diagnose
             this.additions = response.data.data.additions
 
-            // var info = response.data.data.info
-            // if (info.user_type == 2 || info.user_type == 1) {
-            //   this.doctorValue = info.admin_user_id
-            //   if (info.department_id == 0) {
-            //     if (this.department.length > 0) {
-            //       this.departmentValue = this.department[0].id
-            //     } else {
-            //       this.departmentValue = ''
-            //
-            //     }
-            //   } else {
-            //     this.departmentValue = info.department_id
-            //   }
-            // }else{
-            //   this.doctorValue = this.doctors[0].admin_user_id
-            // }
+
           }
         })
 
         this.teamList = []
 
       },
-      setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data) {
+      setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data,last_info) {
         this.curMonthPrescriptions = {}
         this.curPrescriptions = {}
         // this.$refs.tabProjectTeam.clearSelection()
 
 
-
-        console.log(doctors)
         for (let i = 0; i < doctors.length; i++) {
           if (doctors[i].user_type == 1) {
             doctors.splice(i, 1)
           this.curPrescriptions = {}
         }
 
-        this.diagnose = info.diagnosis
-        if (this.diagnose == 0) {
-          this.diagnose = ""
-          for (let i = 0; i < this.diagnoses.length; i++) {
-            this.diagnose = this.diagnoses[0].id
-          }
 
-        }
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
           this.curStatus = 1
           this.customTabIndex = 1
           this.showTwo = true
         }
 
-        this.state1 = info.sick_type
-        if (this.state1 == 0) {
-          this.state1 = ''
-          for (let i = 0; i < this.sick.length; i++) {
-            this.state1 = this.sick[0].id
-          }
-
-        }
         this.state2 = info.sick_history
         if (this.state2 == 0) {
           this.state2 = ''
           this.order_status = '已退费'
         }
 
-        if (info.id > 0) {
-          this.doctorValue = info.doctor_id
-          this.departmentValue = info.departments
-        } else {
-          if (hisPatientInfo.doctor != 0 && hisPatientInfo.department != 0) {
-            this.doctorValue = hisPatientInfo.doctor
-            this.departmentValue = hisPatientInfo.department
+
+
+        getInitData().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
           } else {
-            if (admin_info.user_type == 2) {
-              this.doctorValue = admin_info.admin_user_id
-              if (admin_info.department_id == 0) {
-                if (this.department.length > 0) {
-                  if (department && department.length > 0) {
-                    this.departmentValue = department[0].id
+            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
 
-                  } else {
 
-                    this.departmentValue = ''
 
+            if (info.id > 0) {
+              this.doctorValue = info.doctor_id
+              this.departmentValue = info.departments
+            } else {
+              if (hisPatientInfo.doctor != 0 && hisPatientInfo.department != 0) {
+                this.doctorValue = hisPatientInfo.doctor
+                this.departmentValue = hisPatientInfo.department
+              } else {
+                if (admin_info.user_type == 2) {
+                  this.doctorValue = admin_info.admin_user_id
+                  if (admin_info.department_id == 0) {
+                    if (this.department.length > 0) {
+                      if (department && department.length > 0) {
+                        this.departmentValue = department[0].id
+
+                      } else {
+
+                        this.departmentValue = ''
+
+                      }
+                    } else {
+                      this.departmentValue = ''
+                    }
+                  } else {
+                    this.departmentValue = admin_info.department_id
                   }
                 } else {
-                  this.departmentValue = ''
+                  this.doctorValue = doctors[0].admin_user_id
                 }
-              } else {
-                this.departmentValue = admin_info.department_id
+                if (this.doctorValue == 0) {
+                  this.doctorValue = ''
+                }
+              }
+            }
+            if (info.register_type == 0) {
+              for (let i = 0; i < this.register.length; i++) {
+                this.register_type = this.register[0].value
               }
             } else {
-              this.doctorValue = doctors[0].admin_user_id
+              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]))
+
+                }
+              }
+            }else{
+              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.diagnose = info.diagnosis.split(",")
+
+              }
+
             }
-            if (this.doctorValue == 0) {
-              this.doctorValue = ''
+
+
+
+            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
+
+              }
+            }
+
           }
-        }
-        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
-          }
-        } else {
-          this.register_type = info.register_type
-        }
+        })
 
-        if (this.diagnose == 0) {
-          this.diagnose = ""
-        }
       },
       moreState(tab, event) {
         if (tab == 'more') {
             this.$message.error('疾病类型不能为空')
             return
           }
-          console.log(this.prescriptions)
           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 == '') {
             let params = {
               p_type: 2,
               patient_id: this.patientInfo.id,
-              diagnose: this.diagnose,
+              diagnose: this.diagnose.join(","),
               sick_type: this.state1,
               sick_history: this.state2,
               doctor: this.doctorValue,
             if (index == 1) {
               let params = {
                 patient_id: this.patientInfo.id,
-                diagnose: this.diagnose,
+                diagnose: this.diagnose.join(","),
                 sick_type: this.state1,
                 sick_history: this.state2,
                 doctor: this.doctorValue,
                   remark: '',
                   day: "1",
                   prescribing_number: temp3[b].prescribing_number,
-                  single_dose_unit: temp3[b].drug.min_unit,
-                  prescribing_number_unit: temp3[b].drug.max_unit,
+                  single_dose_unit: temp3[b].drug.dose_unit,
+                  prescribing_number_unit: temp3[b].drug.prescribing_number_unit,
                   medical_insurance_number: temp3[b].drug.medical_insurance_number
                 }
 
                   remark: '',
                   day: temp[b].drug_day ? temp[b].drug_day : 1,
                   prescribing_number: temp[b].prescribing_number,
-                  single_dose_unit: temp[b].min_unit,
-                  prescribing_number_unit: temp[b].max_unit,
+                  single_dose_unit: temp[b].dose_unit,
+                  prescribing_number_unit: temp[b].prescribing_number_unit,
                   medical_insurance_number: temp[b].medical_insurance_number,
                   drug: temp[b]
                 }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

         diagnoses: [],
         other_sick: [],
         info: {},
+        last_info:{},
         templatedetail: {},
         detalid: 0,
         prescription_id: 0,
           '-' +
           (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
           ':' + (min < 10 ? '0' + min : min)
-        this.patientid = val.id
         let params = {
           'record_date': this.record_date,
           'patient_id': val.id,
 
             return false
           } else {
+            this.patientid = val.id
             this.isloading = false
 
             this.prescriptions = []
             this.hisPatientInfo = response.data.data.his_info
             this.case_history = response.data.data.case_history
             this.info = response.data.data.info
+            this.last_info = response.data.data.last_info
+
             this.doctors = response.data.data.doctors
             this.department = response.data.data.department
 
                 this.prescriptions.push(obj)
 
               }
-              // else{
-              //
-              //   if(response.data.data.count <= 1 ){
-              //     if(response.data.data.last_prescriptions.length == 0){
-              //       let obj = {
-              //         id: 0,
-              //         name: '处方' + 1,
-              //         advices: [],
-              //         project: [],
-              //         addition: [],
-              //         order_status: 0,
-              //         pre_time: nowTime,
-              //
-              //       };
-              //       this.prescriptions.push(obj)
-              //
-              //
-              //     }else {
-              //       for (let i = 0; i < response.data.data.last_prescriptions.length; i++) {
-              //         var prescription = response.data.data.last_prescriptions[i];
-              //         let tempAdvice = [];
-              //         let tempProject = [];
-              //         let tempAddition = [];
-              //
-              //         //药品
-              //         for (let b = 0; b < prescription.advices.length; b++) {
-              //           let obj = {
-              //             advice_id:0,
-              //             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,
-              //             id: prescription.advices[b].drug_id,
-              //             drug:prescription.advices[b].drug
-              //
-              //           };
-              //           tempAdvice.push(obj)
-              //         }
-              //
-              //         //项目
-              //         for (let b = 0; b < prescription.project.length; b++) {
-              //           let obj = {
-              //             id:0,
-              //             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].project.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++) {
-              //           let obj = {
-              //             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)
-              //         }
-              //
-              //         var preTime = nowTime
-              //
-              //         let index = i + 1;
-              //         let obj = {
-              //           id: 0,
-              //           name: '处方' + index,
-              //           advices: tempAdvice,
-              //           project: tempProject,
-              //           addition: tempAddition,
-              //           order_status: 1,
-              //           pre_time: preTime
-              //         };
-              //         this.prescriptions.push(obj)
-              //       }
-              //     }
-              //   }else{
-              //     let obj = {
-              //       id: 0,
-              //       name: '处方' + 1,
-              //       advices: [],
-              //       project: [],
-              //       addition: [],
-              //       order_status: 0,
-              //       pre_time: nowTime,
-              //
-              //     };
-              //     this.prescriptions.push(obj)
-              //   }
-              // }
             }
-            this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions)
+            console.log("~~~~~00000222222")
+            this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions,this.last_info)
           }
         })
 
                   this.hisPatientInfo = response.data.data.his_info;
                   this.case_history = response.data.data.case_history;
                   this.info = response.data.data.info;
+                  this.last_info = response.data.data.last_info
+
                   this.doctors = response.data.data.doctors;
                   this.department = response.data.data.department;
 
                     //   }
                     }
                   }
-                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department,this.hisPatientInfo, this.month_prescriptions);
+                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department,this.hisPatientInfo, this.month_prescriptions,this.last_info);
                   this.$refs.child.watchSign = 0
                 }
               });
                   this.hisPatientInfo = response.data.data.his_info;
                   this.case_history = response.data.data.case_history;
                   this.info = response.data.data.info;
+                  this.last_info = response.data.data.last_info
+
                   this.doctors = response.data.data.doctors;
                   this.department = response.data.data.department;
 
                       // }
                     }
                   }
-                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department,this.hisPatientInfo, this.month_prescriptions);
+                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department,this.hisPatientInfo, this.month_prescriptions,this.last_info);
                   this.$refs.child.watchSign = 0
                 }
               })
                   this.hisPatientInfo = response.data.data.his_info;
                   this.case_history = response.data.data.case_history;
                   this.info = response.data.data.info;
+                  this.last_info = response.data.data.last_info
+
                   this.doctors = response.data.data.doctors;
                   this.department = response.data.data.department;
 
                       // }
                     }
                   }
-                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department,this.hisPatientInfo, this.month_prescriptions);
+                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department,this.hisPatientInfo, this.month_prescriptions,this.last_info);
                   this.$refs.child.watchSign = 0
                 }
               });
 
                 this.case_history = response.data.data.case_history
                 this.info = response.data.data.info
+                this.last_info = response.data.data.last_info
+
                 this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
                 if (this.case_history.breathing <= 0) {
                   this.case_history.breathing = ''
                     // }
                   }
                 }
-                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions)
+                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions,this.last_info)
               }
             })
 
               this.hisPatientInfo = response.data.data.his_info
               this.case_history = response.data.data.case_history
               this.info = response.data.data.info
+              this.last_info = response.data.data.last_info
+
               this.doctors = response.data.data.doctors
               this.department = response.data.data.department
 
                   // }
                 }
               }
-              this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions)
+              this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions,this.last_info)
             }
           })
 
         if(this.titleType == "电子处方"){
           if(this.radio == 1){
             this.un_cure_data.map(item => {
+              console.log("~~~~~~~~")
               if(item.id == this.patientid){
+                console.log("~~~~~~~~22222222")
+
                 this.getPatientInfo(item)
               }
             })

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

         })
       },
       getDiagnosis(id){
+        let ids = id.split(",")
         var name = ""
-        for(let i=0;i<this.diagnoses.length;i++){
-           if(id == this.diagnoses[i].id){
-              name = this.diagnoses[i].class_name
-           }
+        for(let i = 0; i < ids.length; i++){
+
+          for(let b=0;b<this.diagnoses.length;b++){
+            if(parseInt(ids[i]) == this.diagnoses[b].id){
+              if(name.length == 0){
+                name = this.diagnoses[b].class_name
+              }else{
+                name = name +"," + this.diagnoses[b].class_name
+
+              }
+            }
+          }
+
         }
+
+
+
+
         return name
       }
     }, created() {

src/xt_pages/outpatientRegistration/index.vue

       this.form.id_card_type = 1
       this.form.medicalCare = 11
       this.form.settlementValue = 1
+      this.form.register = 4
+      this.form.registrationFee = 0
+      this.form.medicalExpenses = 0
 
     } else {
       this.form.settlementValue = 1