导出

src/xt_pages/data/components/addDrugs.vue

@@ -590,6 +590,7 @@
         this.form.prescription_mark = ""
         this.form.record_date = ""
         this.form.drug_remark = ""
+       
         this.visible = false
       },
       getValue: function() {

src/xt_pages/data/components/consumables.vue

@@ -107,6 +107,11 @@
         <template slot-scope="scope">
           {{ scope.row.retail_price }}
         </template>
+      </el-table-column>
+       <el-table-column label="社保目录编码" width="110" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.social_security_directory_code }}
+        </template>
       </el-table-column>
       <el-table-column label="状态" width="60" align="center">
         <template slot-scope="scope">

src/xt_pages/data/components/drugs.vue

@@ -304,7 +304,10 @@
           is_charge_predict: '',//是否收费预估项
           is_statistics_work: '',//是否统计工作量
           is_charge_use: '',//是否收费常用项
-          drug_code: ''
+          drug_code: '',
+          social_security_directory_code:'',
+          is_mark:'',
+          prescription_mark:'',
 
         },
 
@@ -452,6 +455,7 @@
               this.$message.error(response.data.msg)
               return false
             } else {
+              console.log("数据", response.data.data.drug)
               for (let key in response.data.data.drug) {
                 this.formValue[key] = response.data.data.drug[key]
               }
@@ -527,7 +531,40 @@
               }
 
               this.formValue.record_date = this.getTime(this.formValue.record_date)
-
+               
+              if(this.formValue.drug_category == 0){
+                  this.formValue.drug_category = ""
+              } 
+              if(this.formValue.drug_control == 0){
+                  this.formValue.drug_control = ""
+              }
+              if(this.formValue.pharmacology_category == 0){
+                 this.formValue.pharmacology_category = ""
+              }
+              if(this.formValue.statistics_category == 0){
+                this.formValue.statistics_category = ""
+              }
+              if(this.formValue.pinyin == 0){
+                 this.formValue.pinyin = ""
+              }
+              if(this.formValue.wubi == 0){
+                this.formValue.wubi = ""
+              }
+              if(this.formValue.last_price == 0){
+                  this.formValue.last_price = ""
+              }
+              if(this.formValue.retail_price == 0){
+                this.formValue.retail_price = ""
+              }
+              if(this.formValue.social_security_directory_code == 0){
+                 this.formValue.social_security_directory_code = ""
+              }
+              if(this.formValue.is_mark == 0){
+                 this.formValue.is_mark = ""
+              }  
+              if(this.formValue.prescription_mark == 0){
+                  this.formValue.prescription_mark = ""
+              }
               this.$refs.addDrugs.show(id, this.formValue)
 
             }

src/xt_pages/data/components/editProject.vue

@@ -393,15 +393,22 @@ export default {
               this.form.execution_frequency = projecDetail.execution_frequency
               this.form.number_days = projecDetail.number_days
               this.form.total = projecDetail.total
-              if(projecDetail.category == 0){
+            
+              this.form.category = projecDetail.category
+               if(projecDetail.category == 0){
                 this.form.category = ""
               }
-              this.form.category = projecDetail.category
               if(projecDetail.specail_project == 0){
                 this.form.specail_project = ""
               }
               this.form.specail_project = projecDetail.specail_project
+              if(projecDetail.specail_project == 0){
+                 this.form.specail_project = ""
+              }
               this.form.social_security_directory_code = projecDetail.social_security_directory_code
+              if(projecDetail.social_security_directory_code == 0){
+                this.form.social_security_directory_code = ""
+              }
               this.form.record_date = this.getTime(projecDetail.record_date)
             }
          })

src/xt_pages/data/components/project.vue

@@ -52,6 +52,16 @@
                 <template  slot-scope="scope">
                     {{scope.row.project_name}}
                 </template>
+            </el-table-column>
+             <el-table-column prop="date" label="单价" align="center">
+                <template  slot-scope="scope">
+                    {{scope.row.price}}
+                </template>
+            </el-table-column>
+            <el-table-column prop="date" label="单位" align="center">
+                <template  slot-scope="scope">
+                    {{scope.row.unit}}
+                </template>
             </el-table-column>
             <el-table-column prop="date" label="费用类别" align="center">
                   <template  slot-scope="scope">
@@ -216,7 +226,7 @@ export default {
                console.log('projectlist',projecList)
                this.tableData = projecList
                var total = response.data.data.total
-               console.log("total-----",total)
+               console.log("total",total)
                this.total = total
              }
           })  
@@ -305,7 +315,7 @@ export default {
           ids.push(this.selectDrug[index].id);
           idMap[this.selectDrug[index].id] = this.selectDrug[index].id;
         }
-        console.log('ids222222222',ids)
+       
         var idss = ids.join(',')
         let params = {
           ids:idss,

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -1248,7 +1248,7 @@
           'hemodialysis',
           'blood'
         )
-        console.log("抽血-----",this.bloods)
+      
       //  dialyzerPerfusionApparatus.map(item => {
       //    item.name = item.name.toUpperCase()
       //  })
@@ -1290,6 +1290,7 @@
         } else {
 
           if (schedual.mode_id == 2 ||schedual.mode_id == 5 ||schedual.mode_id == 12) {
+            
             this.zhiShow = true
             this.huShow = true
             this.totalShow = true
@@ -1631,6 +1632,7 @@
         // 入口
         var pre = pre
         console.log("香锅2222222",this.dialysisPrescription)
+     
         this.dialysisPrescription.mode_id = this.$route.query.mode_id
         if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12) {
           this.zhiShow = true

src/xt_pages/dialysis/details/index.vue

@@ -979,7 +979,7 @@ export default {
         if (resp.state == 1) {
           var patient = resp.data.patient // 患者信息
           var schedual = resp.data.schedual // 患者排班信息
-
+          console.log("排班22222222222",schedual)
           var prescription = resp.data.prescription // 透析处方
           if (prescription != null) {
             if (prescription.body_fluid == -2) {

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -51,7 +51,7 @@
         <el-input v-model="patientInfo.home_address" placeholder="" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="过敏史: " prop="name">
-        <el-input v-model="patientInfo.home_address" placeholder=""></el-input>
+        <el-input v-model="allergic_history" placeholder=""></el-input>
       </el-form-item>
     </el-form>
     <div class="mainTitle">体格信息：</div>
@@ -313,6 +313,7 @@
         valueSeven:'',
         diagnoses:[],
         sick:[],
+        allergic_history:"",
       }
     },
     methods: {
@@ -363,9 +364,10 @@
             "doctor_advice":this.case_history.doctor_advice,
             "remark":this.case_history.remark,
             "sick":this.case_history.sick,
-            "diagnose":this.case_history.diagnose
+            "diagnose":this.case_history.diagnose,
+            "allergic_history":this.allergic_history
           }
-
+          console.log("prams222",params)
           createCaseHistory(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error("患者病历已存在")
@@ -400,6 +402,7 @@
                 this.case_history.remark = templatedetail.remark
                 this.case_history.sick = templatedetail.sick
                 this.case_history.diagnose = templatedetail.diagnose
+                // this.allergic_history = templatedetail.allergic_history
               }
           })
         },
@@ -566,6 +569,7 @@
         if(this.case_history.diagnose == 0){
            this.case_history.diagnose = ""
         }
+        // this.allergic_history = this.case_history.allergic_history
         
       }
     }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -897,6 +897,7 @@
       },
 
       choosePatient(val) {
+        
         var nowDate = new Date()
         var nowYear = nowDate.getFullYear()
         var nowMonth = nowDate.getMonth() + 1
@@ -965,12 +966,12 @@
                 return false
               } else {
 
-
                 this.prescriptions = []
                 this.patientInfo = response.data.data.xt_info
                 this.hisPatientInfo = response.data.data.his_info
                 this.case_history = response.data.data.case_history
-                var case_history = response.data.data.case_history
+                // var case_history = response.data.data.case_history
+                // console.log("礼拜2222222222",this.case_history)
                 var month_prescriptions = response.data.data.month_prescriptions
                 this.setMonthPrescription(month_prescriptions)
                 this.doctors = response.data.data.doctors
@@ -1143,9 +1144,9 @@
               this.patientInfo = response.data.data.xt_info
               this.hisPatientInfo = response.data.data.his_info
               this.case_history = response.data.data.case_history
-              var case_history = response.data.data.case_history
-
-              this.case_history = case_history
+              // var case_history = response.data.data.case_history
+              // console.log("礼拜2223332222222",this.case_history)
+              // this.case_history = case_history
               this.info = response.data.data.info
               this.doctors = response.data.data.doctors
               this.department = response.data.data.department
@@ -1363,7 +1364,10 @@
           if (response.data.state == 1) {
             this.centerDialogVisible = true
             var list = response.data.data.list
-           
+            console.log("list2222222",list)
+            for(let i=0;i<list.length;i++){
+              list[i].prescription_number = list[i].prescription_number + i
+            }
             this.tableData = list
           }
         })

src/xt_pages/role/components/AdminInfoForm.vue

@@ -776,6 +776,9 @@
                    this.form.prescription_qualification_identification = ""
                 }
                 this.form.identification_outpatients = admin.identification_outpatients
+                if(admin.identification_outpatients == 0){
+                   this.form.identification_outpatients = ""
+                }
                 this.form.start_time = this.getTime(admin.start_time)
                 this.form.medical_range_code = admin.medical_range_code
                 if(admin.medical_range_code == 0){
@@ -796,11 +799,14 @@
                     this.form.doctor_level = ""
                 }
                 this.form.doctor_type_job = admin.doctor_type_job
+                if(admin.doctor_type_job == 0){
+                   this.form.doctor_type_job = ""
+                }
                 this.form.doctor_number = admin.doctor_number
                 this.form.is_active = admin.is_active
                 console.log("2222222",this.form.is_active)
                 if(admin.is_active == 0){
-                   admin.is_active = ""
+                   this.form.is_active = ""
                 }
                 this.form.active_status = admin.active_status
                 if(admin.active_status == 0){
@@ -1076,6 +1082,9 @@
         }
       },
        getTime(val) {
+         if(val < 0){
+           return ""
+         }
          if(val == ""){
           return ""
          }else {