Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/doctor.js

@@ -13,3 +13,10 @@ export function fetchAllAdminUsers() {
   })
 }
 
+
+export function fetchMoibleAllDoctorAndNurse(){
+  return request({
+    url:"/api/mobilealldoctors",
+    method:"Get",
+  })
+}

src/xt_pages/stock/drugs/components/purchaseNewDrugQuery.vue

@@ -373,12 +373,10 @@ export default {
      if(totalthree == ""){
       totalthree =0
      }
-    //  console.log("totalone=========",totalone)
-    //  console.log("totalone=========",totaltwo)
-    //  console.log("totalone=========",totalthree)
+   
      var total = 0
       total = (parseFloat(totalone)  + parseFloat(totaltwo)  - parseFloat(totalthree))
-      console.log("total-=---------------",total)
+     
       if(total >0){
         return total.toFixed(2)
       }else{

src/xt_pages/stock/drugs/components/purchaseNewDrugQueryPrint.vue

@@ -1622,23 +1622,24 @@ export default {
     
    },
    GetDrugOverOnePrice(totalone,totaltwo,totalthree,min_number,min_unit,max_unit){
-      if(totalone == ""){
-          totalone =0
-      }
-      if(totaltwo == ""){
-        totaltwo =0
-      }
-      if(totalone == ""){
-          totalone =0
-      }
-      if(totalthree == ""){
-        totalthree =0
-      }
      
-      var total = 0
-      total = totalone  + totaltwo  - totalthree
-      if(total >0 || total!="NaN"){
-       
+    if(totalone == ""){
+        totalone =0
+     }
+     if(totaltwo == ""){
+       totaltwo =0
+     }
+     if(totalone == ""){
+        totalone =0
+     }
+     if(totalthree == ""){
+      totalthree =0
+     }
+   
+     var total = 0
+      total = (parseFloat(totalone)  + parseFloat(totaltwo)  - parseFloat(totalthree))
+     
+      if(total >0){
         return total.toFixed(2)
       }else{
         return ""

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -754,7 +754,7 @@ export default {
     }
     if(val2!=null && val2.length > 0){
      for(let i=0;i<val2.length;i++){
-      count_one_price +=val2[i].count * val[i].price
+      count_one_price +=val2[i].count * val2[i].price
      }
     }
     all_count_price = count_price + count_one_price
@@ -957,12 +957,12 @@ export default {
      }
      if(val2!=null && val2.length > 0){
       for(let i=0;i<val2.length;i++){
-        count_one_price +=val2[i].count  * val[i].price
+        count_one_price +=val2[i].count  * val2[i].price
       }
      }
      if(val3!=null && val3.length > 0){
       for(let i=0;i<val3.length;i++){
-        count_two_price +=val3[i].count  * val[i].price
+        count_two_price +=val3[i].count  * val3[i].price
       }
      }
      console.log("本期减少",count_price)

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -904,7 +904,7 @@ export default {
       }
       if(val2!=null && val2.length > 0){
       for(let i=0;i<val2.length;i++){
-        count_one_price +=val2[i].count * val[i].price
+        count_one_price +=val2[i].count * val2[i].price
       }
       }
       all_count_price = count_price + count_one_price
@@ -927,12 +927,12 @@ export default {
      }
      if(val2!=null && val2.length > 0){
       for(let i=0;i<val2.length;i++){
-        count_one_price +=val2[i].count  * val[i].price
+        count_one_price +=val2[i].count  * val2[i].price
       }
      }
      if(val3!=null && val3.length > 0){
       for(let i=0;i<val3.length;i++){
-        count_two_price +=val3[i].count  * val[i].price
+        count_two_price +=val3[i].count  * val3[i].price
       }
      }
      console.log("本期减少",count_price)

src/xt_pages/user/components/PatientSidebar.vue

@@ -167,10 +167,10 @@ export default {
               name: '3-1',
               label: '病史'
             },
-            {
-              name: '3-4',
-              label: '病史新'
-            },
+            // {
+            //   name: '3-4',
+            //   label: '病史新'
+            // },
             {
               name: '3-2',
               label: '体格检查'
@@ -179,10 +179,10 @@ export default {
             //   name: '3-3',
             //   label: '体格检查新'
             // },
-             {
-              name: '3-5',
-              label: '病程记录新'
-             },
+            //  {
+            //   name: '3-5',
+            //   label: '病程记录新'
+            //  },
             {
               name: '1-11',
               label: '首次病程记录'

src/xt_pages/user/courseOfDisease_new.vue

@@ -73,9 +73,9 @@
                 <el-select v-model="admin_user_id" placeholder="请选择" :disabled="disabled">
                   <el-option
                     v-for="item in doctorOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id">
+                    :key="item.admin_user_id"
+                    :label="item.user_name"
+                    :value="item.admin_user_id">
                   </el-option>
                 </el-select>
               </div>
@@ -284,7 +284,7 @@
     deleteCourseTempalte,
     getAutoPatientContent
   } from '@/api/patient'
-  import { fetchAllDoctorAndNurse } from "@/api/doctor";
+  import { fetchMoibleAllDoctorAndNurse } from "@/api/doctor";
   import { parseTime } from '@/utils'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { uParseTime } from '@/utils/tools'
@@ -335,7 +335,7 @@
         end_date:'',
         quzhi_options:[{value:1,label:'本周'},{value:2,label:'上周'},{value:3,label:'本月'},{value:4,label:'上周'},],
         tableData:[],
-        admin_user_id:0,
+        admin_user_id:"",
         record_date:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
         template_name:"",
         id:0,
@@ -381,6 +381,9 @@
     },
     created() {
       this.admin_user_id = this.$store.getters.xt_user.user.id
+      if(this.admin_user_id == 0){
+         this.admin_user_id = ""
+      }
 
       this.patient_id = parseInt(this.$route.query.id)
       this.org_id = this.$store.getters.xt_user.template_info.org_id;
@@ -426,8 +429,13 @@
         this.library_dialog = false
       },
       getCurrentChangeOne(val){
+        console.log("val================",val)
         this.$refs.editor.contents = val.content
         this.record_date = this.getTime(val.record_time)
+        this.admin_user_id = val.recorder
+        if(this.admin_user_id == 0){
+           this.admin_user_id = ""
+        }
         this.id = val.id
       },
       getCurrentChangeTwo(val){
@@ -487,8 +495,8 @@
       getDocName(admin_user_id){
         var user_name = ""
         for(let i=0;i<this.doctorOptions.length;i++){
-          if(admin_user_id == this.doctorOptions[i].id){
-              user_name = this.doctorOptions[i].name
+          if(admin_user_id == this.doctorOptions[i].admin_user_id){
+              user_name = this.doctorOptions[i].user_name
           }
         }
        return user_name
@@ -507,7 +515,7 @@
         })
      },
      fetchAllDoctorAndNurse() {
-       fetchAllDoctorAndNurse().then(response => {
+      fetchMoibleAllDoctorAndNurse().then(response => {
         if (response.data.state == 1) {
           this.doctorOptions= []
           this.doctorOptions = response.data.data.doctors;
@@ -541,6 +549,10 @@
           this.$message.error('请填写病程内容')
           return
         }
+
+        if(this.admin_user_id == ""){
+           this.admin_user_id = 0
+        }
        
         var params = {
           id:this.id,

src/xt_pages/user/sickHistory_new.vue

@@ -99,9 +99,9 @@
                 <el-select v-model="admin_user_id" placeholder="请选择" style="width: 120px;" :disabled="disabled">
                   <el-option
                     v-for="item in doctorOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id">
+                    :key="item.admin_user_id"
+                    :label="item.user_name"
+                    :value="item.admin_user_id">
                   </el-option>
                 </el-select>
               </div>
@@ -203,7 +203,7 @@
         <div style="width: 100%;text-align: center;margin-bottom: 10px;">
           <h2>{{orgname}}</h2>
         </div>
-        <div style="display: flex;padding: 5px 0;border-bottom: 1px solid black;"> 
+        <div style="display: flex;padding: 5px 0;border-bottom: 1px solid black;">
           <div style="flex: 1;">姓名：</div>
           <div style="flex: 1;">病历号：</div>
           <div style="flex: 1;">病区-床号：</div>
@@ -319,7 +319,7 @@ import PatientSidebar from './components/PatientSidebar'
 import PatientSidebar_new from './components/PatientSidebar_new'
 import Editor from '@/components/Editor'
 import ueditor from '@/components/Uedtior'
-import { fetchAllDoctorAndNurse } from "@/api/doctor";
+import { fetchMoibleAllDoctorAndNurse } from "@/api/doctor";
  import print from 'print-js'
 import {
   createNewSickHistoryRecord,
@@ -412,12 +412,19 @@ export default {
   },
   created() {
     this.orgname = this.$store.getters.xt_user.org.org_name;
+
+
+    this.fetchAllDoctorAndNurse()
     this.wayOptions = getDataConfig("patient", "reimbursement_ways");
     console.log('this.wayOptions',this.wayOptions);
-    
+
     this.admin_user_id = this.$store.getters.xt_user.user.id
+
+    if(this.admin_user_id == 0){
+        this.admin_user_id = ""
+    }
     this.patient_id = parseInt(this.$route.query.id)
-    
+
     if (isNaN(this.patient_id) || this.patient_id <= 0) {
       this.$notify.error({
         title: '错误',
@@ -449,10 +456,9 @@ export default {
       (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
       '-' +
       (nowDay < 10 ? '0' + nowDay : nowDay)
+      this.getlist()
+      this.fetchPatient(this.patient_id)
 
-    this.getlist()
-    this.fetchAllDoctorAndNurse()
-    this.fetchPatient(this.patient_id)
   },
   methods: {
     template_dele(){
@@ -498,7 +504,7 @@ export default {
       this.edit_index = row.index
     },
     template_click(){
-      
+
       console.log('this.add_index',this.getwayoption(this.form.reimbursement_way_id));
       if(this.add_index ==0){
         this.template_dialog = true
@@ -683,9 +689,9 @@ export default {
             console.log("haaaaaaaaaaaaa",this.templateList)
           }
         })
-        
+
         // this.templateList.push(obj)
-        
+
         console.log('11111111',obj);
 
       }
@@ -716,7 +722,7 @@ export default {
     },
 
     fetchAllDoctorAndNurse() {
-      fetchAllDoctorAndNurse().then(response => {
+      fetchMoibleAllDoctorAndNurse().then(response => {
         if (response.data.state == 1) {
           this.doctorOptions= []
           this.doctorOptions = response.data.data.doctors;
@@ -741,7 +747,7 @@ export default {
         this.$message.error('请选择医生')
         return
       }
-      if(this.sick_history_time.length  == 0){
+      if(this.start_time==""){
         this.$message.error('请选择时间')
         return
       }
@@ -755,7 +761,11 @@ export default {
       if(this.shen_guomi == ""){
         this.shen_guomi = 0
       }
-    
+
+      if(this.admin_user_id == ""){
+         this.admin_user_id = 0
+      }
+
       let params = {
         id:this.id,
         patient_id: this.patient_id,
@@ -810,7 +820,7 @@ export default {
         this.$message.error('请选择医生')
         return
       }
-      if(this.sick_history_time.length  == 0){
+      if(this.start_time == ""){
         this.$message.error('请选择时间')
         return
       }
@@ -823,7 +833,10 @@ export default {
       if(this.shen_guomi == ""){
         this.shen_guomi = 0
       }
-    
+      if(this.admin_user_id == ""){
+         this.admin_user_id = 0
+      }
+
       let params = {
         id:this.id,
         patient_id: this.patient_id,
@@ -918,8 +931,8 @@ export default {
     getDocName(admin_user_id){
       var user_name = ""
       for(let i=0;i<this.doctorOptions.length;i++){
-        if(admin_user_id == this.doctorOptions[i].id){
-             user_name = this.doctorOptions[i].name
+        if(admin_user_id == this.doctorOptions[i].admin_user_id){
+             user_name = this.doctorOptions[i].user_name
         }
       }
       return user_name
@@ -930,7 +943,7 @@ export default {
       }else{
         return uParseTime(time, '{y}-{m}-{d}')
       }
-     
+
     },
     getCurrentChange(val){
       console.log("val--------------",val)
@@ -955,7 +968,12 @@ export default {
       }
 
       this.patient_id = val.patient_id
-      this.admin_user_id = val.recorder?val.doctor_id:"0"
+      this.admin_user_id = val.doctor_id
+      if(this.admin_user_id == 0){
+         this.admin_user_id = ""
+      }
+
+      this.start_time  = this.getTime(val.record_date)
 
     },
     getCurrentChangeOne(val){
@@ -971,34 +989,34 @@ export default {
         title:this.template_name,
         content: this.$refs.editor.contents,
       }
-      saveSickHistoryTemplate(params).then(response=>{
-        if(response.data.state == 1){
-          var sickHistoryTemplate =  response.data.data.sickHistoryTemplate
-          this.$message.success("保存成功!")
-          this.template_dialog = false
-        }
-      })
-    },
-    toContentPint(){
-      this.$refs.editor.contents = this.template_content
-      this.library_dialog = false
-    },
-    fetchPatient(id) {
-        fetchPatient(id).then((response) => {
-            console.log('fetchPatient11111',response.data.data);
-            if(response.data.state ==1){
-              this.form = response.data.data.patient;
-              this.patientVascularAccessOne = response.data.data.patientVascularAccessOne
-            }
-          })
-          .catch((err) => {
-            console.log("patient get err", err);
-            this.$notify.error({
-              title: "错误",
-              message: "网络异常",
-            });
-            this.$router.push("/patients/patients");
+   saveSickHistoryTemplate(params).then(response=>{
+      if(response.data.state == 1){
+        var sickHistoryTemplate =  response.data.data.sickHistoryTemplate
+        this.$message.success("保存成功!")
+        this.template_dialog = false
+      }
+     })
+   },
+   toContentPint(){
+    this.$refs.editor.contents = this.template_content
+    this.library_dialog = false
+   },
+   fetchPatient(id) {
+      fetchPatient(id).then((response) => {
+          console.log('fetchPatient11111',response.data.data);
+          if(response.data.state ==1){
+            this.form = response.data.data.patient;
+            this.patientVascularAccessOne = response.data.data.patientVascularAccessOne
+          }
+        })
+        .catch((err) => {
+          console.log("patient get err", err);
+          this.$notify.error({
+            title: "错误",
+            message: "网络异常",
           });
+          this.$router.push("/patients/patients");
+        });
     },
     getwayoption(id){
       if(id != 0){
@@ -1011,7 +1029,7 @@ export default {
       }else{
         return ''
       }
-      
+
     }
   }
 }

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
  // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))