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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -221,6 +221,13 @@
                                   type="primary"
                                 >读电子凭证
                                 </el-button>
+                                <el-button
+                                  v-if="(hisPatientInfo.id_card_type != 3  && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0 && org_id == 10480)"
+                                  size="small"
+                                  @click="open(28,items.med_type,items.prescriptions[0].order,items.prescriptions)"
+                                  type="primary"
+                                >就医特殊属性上传
+                                </el-button>
 
                                 <el-button
                                   v-if="(hisPatientInfo.id_card_type != 3  && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0 && org_id != 10340)"
@@ -3499,7 +3506,81 @@ export default {
           })
         }
 
-      } else if (index == 9) {
+      } else if (index == 28) {
+        var ids = []
+        for (let i = 0; i < prescriptions.length; i++) {
+          ids.push(prescriptions[i].id)
+        }
+        var ids_str = ids.join(',')
+        this.temp_ids = ids_str
+        this.newLoading = true
+        var that = this
+        let form = {}
+        form['id'] = this.patientInfo.id
+        form['his_patient_id'] = this.hisPatientInfo.id
+        form['record_time'] = this.record_date
+        form['ids'] = this.temp_ids
+        var time_arr = this.form.diagnosis_time.split(" ")
+        let hh =  new Date().getHours() < 10
+          ? "0" + new Date().getHours()
+          : new Date().getHours();
+        let mf =
+          new Date().getMinutes() < 10
+            ? "0" + new Date().getMinutes()
+            : new Date().getMinutes();
+        let ss =
+          new Date().getSeconds() < 10
+            ? "0" + new Date().getSeconds()
+            : new Date().getSeconds();
+        var new_time  = time_arr[0] + " " + hh+":"+mf+":"+ss
+        form['begin_time'] = new_time
+        form['p_type'] = med_type
+        form['diagnosis'] = this.form.diagnosis.join(',')
+        form['sick_type'] = this.form.sick_type
+        form['admin_user_id'] = this.$store.getters.xt_user.user.id
+        form['org_id'] = this.$store.getters.xt_user.org_id
+        if (this.activeName == 'first') {
+          form['settle_accounts_type'] = 1
+        } else if (this.activeName == 'second') {
+          form['start_time'] = this.other_start_time
+          form['end_time'] = this.other_end_time
+          form['settle_accounts_type'] = 2
+        } else {
+          form['start_time'] = this.other_start_time_two
+          form['end_time'] = this.other_end_time_two
+          form['settle_accounts_type'] = 2
+        }
+        axios.get('http://127.0.0.1:9532/api/2406', {
+          params: form,
+          headers: {
+            'Permission': 5
+          }
+        })
+          .then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+              return false
+            } else {
+              if (response.data.data.failed_code == -10) {
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+                  that.changeRadioAndPatient(1)
+                  that.newLoading = false
+                }).catch(() => {
+                  that.changeRadioAndPatient(1)
+                  that.newLoading = false
+                })
+              } else {
+                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
+              }
+            }
+          })
+          .catch(function(error) {
+            that.newLoading = false
+          })
+      }  else if (index == 9) {
         if (this.org_id == 10375 && this.hisPatientInfo.balance_accounts_type == 1){
           var that = this
           axios

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1834,8 +1834,8 @@
                 }
                 //项目
                 for (let b = 0; b < prescription.project.length; b++) {
-                  if(prescription.project!=null && (prescription.project[b].good_info.good_status.startsWith('停用') == false )) {
-                    if (this.org_id == 10206 || this.org_id == 0) {
+                  if(prescription.project[b].type == 2 && prescription.project[b].project.medical_status!=1){
+                    if (this.org_id == 10206) {
                       let obj = {
                         id: prescription.project[b].id,
                         project_id: prescription.project[b].project_id,
@@ -1877,7 +1877,6 @@
                       }
                       tempProject.push(obj)
                     }else{
-                      if( prescription.project[b].project.medical_status!=1){
                         let obj = {
                           id: prescription.project[b].id,
                           project_id: prescription.project[b].project_id,
@@ -1912,9 +1911,85 @@
                           obj['unit'] = prescription.project[b].good_info.packing_unit
                         }
                         tempProject.push(obj)
+                    }
+                  }else if(prescription.project[b].type == 3 && prescription.project[b].good_info.good_status.startsWith('停用') == false){
+                    if (this.org_id == 10206 ) {
+                      let 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,
+                        type: prescription.project[b].type,
+                        frequency_type: prescription.project[b].frequency_type,
+                        day_count: prescription.project[b].day_count,
+                        week_day: prescription.project[b].week_day
+
 
                       }
-                    }
+
+                      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
+                        obj['project'] = prescription.project[b].project
+                        obj['unit'] = prescription.project[b].unit
+                        obj['number'] = ""
+
+
+                      } 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
+                        obj['good_info'] = prescription.project[b].good_info
+                        obj['unit'] = prescription.project[b].good_info.packing_unit
+                        obj['number'] = prescription.project[b].good_info.good_number
+
+                      }
+                      tempProject.push(obj)
+                    }else{
+                        let 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,
+                          type: prescription.project[b].type,
+                          frequency_type: prescription.project[b].frequency_type,
+                          day_count: prescription.project[b].day_count,
+                          week_day: prescription.project[b].week_day
+
+                        }
+
+                        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
+                          obj['project'] = prescription.project[b].project
+                          obj['unit'] = prescription.project[b].unit
+                        } 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
+                          obj['good_info'] = prescription.project[b].good_info
+                          obj['unit'] = prescription.project[b].good_info.packing_unit
+                        }
+                        tempProject.push(obj)
+                      }
                   }
                 }
                 // var preTime = nowTime