提交代码

src/xt_pages/hospitalStation/components/deskPrescription.vue

             for (let b = 0; b < temp2.length; b++) {
               let obj = {
                 id: 0,
+                single_dose: temp2[b].single_dose.toString(),
                 project_id: temp2[b].id,
                 project_name: temp2[b].project_name,
                 statistical_classification: '',
-                single_dose: temp2[b].single_dose.toString(),
                 delivery_way: temp2[b].delivery_way,
                 execution_frequency: temp2[b].execution_frequency,
                 number_days: temp2[b].number_days.toString(),
                 obj['project'] = temp2[b].project
                 obj['unit'] = temp2[b].project.unit
 
+
               } else if (temp2[b].type == 3) {
                 obj['good_info'] = temp2[b].good_info
                 obj['unit'] = temp2[b].good_info.packing_unit
               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),
+              unit: good_info[i].packing_unit,
               type: 3,
               total: good_info[i].total,
               is_special_diseases: good_info[i].is_special_diseases,
                   id: project[i].project_id,
                   project_name: project[i].good_info.good_name,
                   statistical_classification: '',
-                  single_dose: '',
+                  single_dose: project[i].good_info.default_count,
                   delivery_way: '',
                   execution_frequency: '',
                   number_days: '',
                   price: project[i].good_info.retail_price,
                   remark: '',
                   medical_code: project[i].good_info.medical_insurance_number,
-                  unit: project[i].good_info.unit,
+                  unit: project[i].good_info.packing_unit,
                   type: project[i].type,
                   is_special_diseases: project[i].good_info.is_special_diseases,
                   team_id: team_id,

src/xt_pages/hospitalStation/doctorDesk.vue

                 var preTime = ''
 
                 if (prescription.pre_time == 0) {
-                  if (this.$store.getters.xt_user.org.id != 10210 || this.$store.getters.xt_user.org.id != 0){
+                  if (this.$store.getters.xt_user.org.id != 10210 && this.$store.getters.xt_user.org.id != 0){
                     if (this.schedule.schedule_type == 1) {
                       preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                     } else if (this.schedule.schedule_type == 2) {
                       preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
                     }
                   }else{
-                    preTime = ""
+                    preTime = nowTime
                   }
                 } else {
-                  if (this.$store.getters.xt_user.org.id != 10210  || this.$store.getters.xt_user.org.id != 0){
+                  if (this.$store.getters.xt_user.org.id != 10210  && this.$store.getters.xt_user.org.id != 0){
                     preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                   }else{
-                    preTime = ""
+                    preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                   }
                 }
 
                     tempProject.push(obj)
                   }
 
-                  if (this.schedule.schedule_type == 1) {
-                    var preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
-                  } else if (this.schedule.schedule_type == 2) {
-                    var preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
-                  } else if (this.schedule.schedule_type == 3) {
-                    var preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                  var preTime = ""
+                  if (this.$store.getters.xt_user.org.id != 10210  && this.$store.getters.xt_user.org.id != 0){
+                    if (this.schedule.schedule_type == 1) {
+                       preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                    } else if (this.schedule.schedule_type == 2) {
+                       preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                    } else if (this.schedule.schedule_type == 3) {
+                       preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                    }
+                  }else{
+                    preTime = nowTime
+
                   }
 
+
+
+
                   let index = i + 1
                   let obj = {
                     id: 0,
                       // }
 
                       var preTime = ''
-
                       if (prescription.pre_time == 0) {
-                        // preTime = nowTime
-                        if (this.schedule.schedule_type == 1) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
-                        } else if (this.schedule.schedule_type == 2) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
-                        } else if (this.schedule.schedule_type == 3) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                        if (this.$store.getters.xt_user.org.id != 10210  && this.$store.getters.xt_user.org.id != 0) {
+                          if (this.schedule.schedule_type == 1) {
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                          } else if (this.schedule.schedule_type == 2) {
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          } else if (this.schedule.schedule_type == 3) {
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                          }
+                        }else{
+                          preTime = nowTime
                         }
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
 
                         // var preTime = nowTime
                         var preTime = ''
-                        if (this.schedule.schedule_type == 1) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
-                        } else if (this.schedule.schedule_type == 2) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
-                        } else if (this.schedule.schedule_type == 3) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                        if (this.$store.getters.xt_user.org.id != 10210  && this.$store.getters.xt_user.org.id != 0) {
+
+                          if (this.schedule.schedule_type == 1) {
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                          } else if (this.schedule.schedule_type == 2) {
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          } else if (this.schedule.schedule_type == 3) {
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                          }
+                        }else{
+                          preTime = nowTime
                         }
 
                         let index = i + 1
 
                       if (prescription.pre_time == 0) {
                         // preTime = nowTime
-                        if (this.schedule.schedule_type == 1) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
-                        } else if (this.schedule.schedule_type == 2) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
-                        } else if (this.schedule.schedule_type == 3) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                        if (this.$store.getters.xt_user.org.id != 10210  && this.$store.getters.xt_user.org.id != 0) {
+
+                          if (this.schedule.schedule_type == 1) {
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                          } else if (this.schedule.schedule_type == 2) {
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          } else if (this.schedule.schedule_type == 3) {
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                          }
+                        }else{
+                          preTime = nowTime
+
                         }
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                           tempProject.push(obj)
                         }
 
-                        // var preTime = nowTime
-                        var preTime = ''
-                        if (this.schedule.schedule_type == 1) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
-                        } else if (this.schedule.schedule_type == 2) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
-                        } else if (this.schedule.schedule_type == 3) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                        var preTime = nowTime
+                        if (this.$store.getters.xt_user.org.id != 10210  && this.$store.getters.xt_user.org.id != 0) {
+                          if (this.schedule.schedule_type == 1) {
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                          } else if (this.schedule.schedule_type == 2) {
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          } else if (this.schedule.schedule_type == 3) {
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                          }
                         }
 
                         let index = i + 1
                       //   tempAddition.push(obj)
                       // }
 
-                      var preTime = ''
+                      var preTime = nowTime
 
                       if (prescription.pre_time == 0) {
-                        // preTime = nowTime
-                        if (this.schedule.schedule_type == 1) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
-                        } else if (this.schedule.schedule_type == 2) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
-                        } else if (this.schedule.schedule_type == 3) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                        if (this.$store.getters.xt_user.org.id != 10210  && this.$store.getters.xt_user.org.id != 0) {
+                          if (this.schedule.schedule_type == 1) {
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                          } else if (this.schedule.schedule_type == 2) {
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          } else if (this.schedule.schedule_type == 3) {
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                          }
                         }
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                           tempProject.push(obj)
                         }
 
-                        // var preTime = nowTime
-                        var preTime = ''
-                        if (this.schedule.schedule_type == 1) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
-                        } else if (this.schedule.schedule_type == 2) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
-                        } else if (this.schedule.schedule_type == 3) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                        var preTime = nowTime
+                        // var preTime = ''
+                        if (this.$store.getters.xt_user.org.id != 10210  && this.$store.getters.xt_user.org.id != 0) {
+                          if (this.schedule.schedule_type == 1) {
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                          } else if (this.schedule.schedule_type == 2) {
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          } else if (this.schedule.schedule_type == 3) {
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                          }
                         }
 
                         let index = i + 1

src/xt_pages/outpatientCharges/components/registerDialog.vue

           'certificates':this.form.certificates,
         }
 
-        if ((this.$store.getters.xt_user.org_id == 10387 && this.form.id_card_type ==  4) || (this.$store.getters.xt_user.org_id == 4 && this.form.id_card_type ==  4) || (this.$store.getters.xt_user.org_id == 10318 && this.form.id_card_type ==  4) ){
+        if ((this.$store.getters.xt_user.org_id == 10387 && this.form.id_card_type ==  4) || (this.$store.getters.xt_user.org_id == 4 && this.form.id_card_type ==  4)){
           try {
             //检测当前浏览器是否支持websocket模式
             window.WebSocket = window.WebSocket || window.MozWebSocket;

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

 
             <!-- <el-button size="small" ref="button_four"  @click="open(5)" type="primary" :disabled='prescriptions && prescriptions[0].advices && prescriptions[0].project ? prescriptions[0].advices.length == 0 && prescriptions[0].project.length == 0 : false'>存模板</el-button> -->
           </div>
-          
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子病历'">
             <el-button size="small" @click="opentwo(1)" type="primary">保存</el-button>
             <el-button size="small" @click="opentwo(2)" type="primary">打印</el-button>
                            :org_id="org_id"
                            ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
                            v-on:getSunziValue = "getSunziValue"
-                           :hisPatientInfo="hisPatientInfo" @event1="changetwo($event)" @editKeepLoad="editKeepLoad"
+                           :hisPatientInfo="hisPatientInfo" :patient_diagnoses="patient_diagnoses" @event1="changetwo($event)" @editKeepLoad="editKeepLoad"
                            v-if="titleType == '电子处方'" style="flex:1;"></desk-prescription>
 
 
       printList:[],
       printDate:'',
       anticoagulants_confit:null,
+      patient_diagnoses:[]
     }
   },
 
             this.diagnoses = []
           }
 
+          var patientDiagnose = response.data.data.patientDiagnose
+
+          if(patientDiagnose!=null && patientDiagnose.length >0){
+            this.patient_diagnoses = []
+            this.patient_diagnoses = patientDiagnose.sort(this.compare('sort'))
+          }else{
+            this.patient_diagnoses = []
+          }
+
           this.additions = response.data.data.additions
 
         }
               // }
 
               var preTime = nowTime
-              if (this.$store.getters.xt_user.org.id != 9919){
+              if (this.$store.getters.xt_user.org.id != 9919 || this.$store.getters.xt_user.org.id != 10485){
                 if (prescription.pre_time == 0) {
                   if (this.schedule.schedule_type == 1) {
                     preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                   tempProject.push(obj)
                 }
                 var preTime = nowTime
-                if (this.$store.getters.xt_user.org.id != 9919) {
+                if (this.$store.getters.xt_user.org.id != 9919 || this.$store.getters.xt_user.org.id != 10485) {
                   if (this.schedule.schedule_type == 1) {
                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                   } else if (this.schedule.schedule_type == 2) {
                 // this.setMonthPrescription(month_prescriptions)
 
                 this.patientInfo = response.data.data.xt_info
-                console.log("patientInfo++++++++++++++++",this.patientInfo)
+
                 this.hisPatientInfo = response.data.data.his_info
                 this.case_history = response.data.data.case_history
 
                     // }
 
                     var preTime = nowTime
-                    if (this.$store.getters.xt_user.org.id != 9919) {
+                    if (this.$store.getters.xt_user.org.id != 9919 ||this.$store.getters.xt_user.org.id != 10485 ) {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
 
                       var preTime = nowTime
                       // var preTime = ''
-                      if(this.org_id != 9919 ) {
+                      if(this.org_id !=  9919 || this.org_id !=  10485) {
                         if (this.schedule.schedule_type == 1) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
 
                     var preTime = nowTime
 
-                    if(this.org_id != 9919 ) {
+                    if(this.org_id != 9919 || this.org_id  != 10485 ) {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
 
                       // var preTime = nowTime
                       var preTime = nowTime
-                      if(this.org_id != 9919 ) {
+                      if(this.org_id != 9919 ||  this.org_id != 10485) {
                         if (this.schedule.schedule_type == 1) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
 
                     var preTime = nowTime
 
-                    if(this.org_id != 9919) {
+                    if(this.org_id != 9919 || this.org_id != 10485) {
                       if (prescription.pre_time == 0) {
                         // preTime = nowTime
                         if (this.schedule.schedule_type == 1) {
 
                       var preTime = nowTime
                       // var preTime = ''
-                      if(this.org_id != 9919 ) {
+                      if(this.org_id != 9919  || this.org_id != 10485) {
                         if (this.schedule.schedule_type == 1) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {

src/xt_pages/user/ktv.vue

     },
     submitNew(formName) {
       let valueSix = 0
-      for(let i = 0; i < items.length; i++){
-        if(items[i].item_name == "KT/V"){
-          valueSix = items[i].value
+      for(let i = 0; i < this.items.length; i++){
+        if(this.items[i].item_name == "KT/V"){
+          valueSix = this.items[i].value
         }
       }
       if(valueSix.length == 0){