Browse Source

hah阿凡达

28169 3 months ago
parent
commit
3307444bd6

+ 4 - 4
src/api/advice.js View File

259
     })
259
     })
260
   }
260
   }
261
 }
261
 }
262
-export function DeleteGroupAdvice(groupno, mode) {
262
+export function DeleteGroupAdvice(groupno, mode,patient_id,advice_date) {
263
   return request({
263
   return request({
264
-    url:'/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode,
264
+    url:'/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode+"&patient_id="+patient_id+"&advice_date="+advice_date,
265
     method: 'delete',
265
     method: 'delete',
266
     headers: {
266
     headers: {
267
       Permission: 3
267
       Permission: 3
420
   })
420
   })
421
 }
421
 }
422
 
422
 
423
-export function DeleteNewGroupAdvice(groupno, mode) {
423
+export function DeleteNewGroupAdvice(groupno, mode,patient_id,advice_date) {
424
   return request({
424
   return request({
425
     url:
425
     url:
426
-      '/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode,
426
+      '/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode+'&patient_id='+patient_id+"&advice_date="+advice_date,
427
     method: 'delete',
427
     method: 'delete',
428
     headers: {
428
     headers: {
429
       Permission: 3
429
       Permission: 3

+ 23 - 0
src/xt_pages/Pharmacy/DrugDispensing.vue View File

445
         :visible.sync="dialogVisibleOne"
445
         :visible.sync="dialogVisibleOne"
446
          width="40%">
446
          width="40%">
447
        <span>
447
        <span>
448
+        <div style="margin-bottom: 10px;">
449
+         <span >追溯码个数:{{getTotal() }} 个</span>
450
+        </div>
448
         <el-input
451
         <el-input
449
           ref="Datefrom"
452
           ref="Datefrom"
450
           @keyup.native="changeText"
453
           @keyup.native="changeText"
551
       drug_id:0,
554
       drug_id:0,
552
       newArrList:[],
555
       newArrList:[],
553
       baseList:[],
556
       baseList:[],
557
+      textAreaList:[]
554
     };
558
     };
555
   },
559
   },
556
 
560
 
557
   methods: {
561
   methods: {
562
+    getTotal(){
563
+      if(this.textarea!=null){
564
+        var  textAreaList = this.textarea.split(",")
565
+        console.log("textArrleti",textAreaList)
566
+        var arr = []
567
+        if(textAreaList!=null && textAreaList.length>0){
568
+          for(let i=0;i<textAreaList.length;i++){
569
+            if(textAreaList[i]!=""){
570
+              arr.push(textAreaList[i])
571
+            }
572
+          }
573
+          return  arr.length
574
+        }else{
575
+          return ""
576
+        }
577
+      
578
+      }
579
+
580
+    },
558
     // 追溯码
581
     // 追溯码
559
     getDrugCode(id,DataSources,DrugCode,index){
582
     getDrugCode(id,DataSources,DrugCode,index){
560
       
583
       

+ 32 - 3
src/xt_pages/Pharmacy/PatientDispensing.vue View File

305
         :visible.sync="dialogVisibleOne"
305
         :visible.sync="dialogVisibleOne"
306
          width="40%">
306
          width="40%">
307
        <span>
307
        <span>
308
+        <div style="margin-bottom: 10px;">
309
+         <span >追溯码个数:{{getTotal() }} 个</span>
310
+        </div>
308
         <el-input
311
         <el-input
309
           ref="inputRef"
312
           ref="inputRef"
310
           @keyup.native="changeText"
313
           @keyup.native="changeText"
419
       patientList:[],
422
       patientList:[],
420
       drug_id:0,
423
       drug_id:0,
421
       total_count:0,
424
       total_count:0,
422
-      newArrList:[]
425
+      newArrList:[],
426
+      textAreaList:[]
423
     };
427
     };
424
   },
428
   },
425
-  watch: {},
429
+ 
426
   created() {
430
   created() {
427
     this.init();
431
     this.init();
428
     this.gettodaynumber();
432
     this.gettodaynumber();
433
     // this.selectedbydefault();
437
     // this.selectedbydefault();
434
   },
438
   },
435
   methods: {
439
   methods: {
440
+    getTotal(){
441
+
442
+      if(this.textarea!=null){
443
+        var  textAreaList = this.textarea.split(",")
444
+        console.log("textArrleti",textAreaList)
445
+        var arr = []
446
+        if(textAreaList!=null && textAreaList.length>0){
447
+          for(let i=0;i<textAreaList.length;i++){
448
+             if(textAreaList[i]!=""){
449
+               arr.push(textAreaList[i])
450
+             }
451
+          }
452
+          return  arr.length
453
+        }else{
454
+          return ""
455
+        }
456
+       
457
+      }
458
+     
459
+    },
436
     openDialog(){
460
     openDialog(){
437
       this.$nextTick(() => {
461
       this.$nextTick(() => {
438
         this.$refs.inputRef.focus()
462
         this.$refs.inputRef.focus()
1363
        
1387
        
1364
         var textarea = ""
1388
         var textarea = ""
1365
         textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
1389
         textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
1390
+
1391
+      
1366
          
1392
          
1367
         if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id==0 || this.$store.getters.xt_user.org.id == 10278|| this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10610){
1393
         if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id==0 || this.$store.getters.xt_user.org.id == 10278|| this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10610){
1368
 
1394
 
1481
        
1507
        
1482
       }
1508
       }
1483
 
1509
 
1484
-
1510
+      this.getTotal()
1485
     },
1511
     },
1486
     
1512
     
1487
     hasDuplicates(arr) {
1513
     hasDuplicates(arr) {
1511
 
1537
 
1512
 
1538
 
1513
   },
1539
   },
1540
+  watch:{
1541
+
1542
+  }
1514
   
1543
   
1515
 };
1544
 };
1516
 </script>
1545
 </script>

+ 6 - 3
src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue View File

1197
            this.$message.error("已执行的医嘱无法删除!")
1197
            this.$message.error("已执行的医嘱无法删除!")
1198
            return
1198
            return
1199
         }
1199
         }
1200
-        this.DeleteGroupAdvice(this.groupSelectRow.groupno)
1200
+        console.log("groupno====================",this.groupSelectRow)
1201
+       
1202
+        this.DeleteGroupAdvice(this.groupSelectRow.groupno,this.groupSelectRow.patient_id,this.groupSelectRow.advice_date)
1201
 
1203
 
1202
         // this.$confirm('确认删除些条医嘱内容?', '删除医嘱内容', {
1204
         // this.$confirm('确认删除些条医嘱内容?', '删除医嘱内容', {
1203
         //   confirmButtonText: '确定',
1205
         //   confirmButtonText: '确定',
1846
       }
1848
       }
1847
       ,
1849
       ,
1848
 
1850
 
1849
-      DeleteGroupAdvice(groupno) {
1851
+      DeleteGroupAdvice(groupno,patient_id,advice_date) {
1852
+
1850
         this.$confirm('确认删除这组医嘱?', '医嘱删除', {
1853
         this.$confirm('确认删除这组医嘱?', '医嘱删除', {
1851
           confirmButtonText: '确定',
1854
           confirmButtonText: '确定',
1852
           cancelButtonText: '取消',
1855
           cancelButtonText: '取消',
1859
             ) {
1862
             ) {
1860
               mode = '5'
1863
               mode = '5'
1861
             }
1864
             }
1862
-            DeleteGroupAdvice(groupno, mode).then(response => {
1865
+            DeleteGroupAdvice(groupno, mode,patient_id,advice_date).then(response => {
1863
               if (response.data.state == 0) {
1866
               if (response.data.state == 0) {
1864
                 this.$message.error(response.data.msg)
1867
                 this.$message.error(response.data.msg)
1865
                 if(response.data.code == 600000008){
1868
                 if(response.data.code == 600000008){

+ 26 - 1
src/xt_pages/stock/drugs/drugStockInOrderAdd.vue View File

440
       @open="openDialog"
440
       @open="openDialog"
441
       :visible.sync="dialogVisible"
441
       :visible.sync="dialogVisible"
442
       width="40%">
442
       width="40%">
443
+
444
+      <div style="margin-bottom: 10px;">
445
+        <span >追溯码个数:{{getTotal() }} 个</span>
446
+      </div>
443
       <span>
447
       <span>
444
         <el-input
448
         <el-input
445
         
449
         
595
       dialogVisible:false,
599
       dialogVisible:false,
596
       currentRow:{},
600
       currentRow:{},
597
       currentIndex:0,
601
       currentIndex:0,
598
-      textarea:""
602
+      textarea:"",
603
+      textAreaList:[]
599
     };
604
     };
600
   },
605
   },
601
   methods: {
606
   methods: {
607
+    getTotal(){
608
+      if(this.textarea!=null){
609
+        var  textAreaList = this.textarea.split(",")
610
+        console.log("textArrleti",textAreaList)
611
+        var arr = []
612
+        if(textAreaList!=null && textAreaList.length>0){
613
+          for(let i=0;i<textAreaList.length;i++){
614
+            if(textAreaList[i]!=""){
615
+              arr.push(textAreaList[i])
616
+            }
617
+          }
618
+          return  arr.length
619
+        }else{
620
+          return ""
621
+        }
622
+      
623
+      }
624
+
625
+    },
602
     openDialog(){
626
     openDialog(){
603
       this.$nextTick(() => {
627
       this.$nextTick(() => {
604
         this.$refs.inputRef.focus()
628
         this.$refs.inputRef.focus()
1257
         this.textarea = textarea
1281
         this.textarea = textarea
1258
 
1282
 
1259
       }
1283
       }
1284
+      this.getTotal()
1260
    },
1285
    },
1261
   },
1286
   },
1262
 
1287
 

+ 1 - 1
src/xt_pages/stock/stockOutOrder.vue View File

1064
       manufacturer: [],
1064
       manufacturer: [],
1065
       selectedTableData: [],
1065
       selectedTableData: [],
1066
       dealer: [],
1066
       dealer: [],
1067
-      type: 0,
1067
+      type: 1,
1068
       drug_id: 0,
1068
       drug_id: 0,
1069
       dialogVisible: false,
1069
       dialogVisible: false,
1070
       editdialogVisible: false,
1070
       editdialogVisible: false,

+ 1 - 1
src/xt_pages/user/components/PatientDetail.vue View File

662
 
662
 
663
             <div v-show="!generic_info_fold">
663
             <div v-show="!generic_info_fold">
664
               <el-col :span="8">
664
               <el-col :span="8">
665
-                <el-form-item label="别名 : " prop="alias">
665
+                <el-form-item label="血型 : " prop="alias">
666
                   <el-input v-model="form.alias" disabled></el-input>
666
                   <el-input v-model="form.alias" disabled></el-input>
667
                 </el-form-item>
667
                 </el-form-item>
668
               </el-col>
668
               </el-col>

+ 1 - 1
src/xt_pages/user/components/PatientForm.vue View File

704
 
704
 
705
               <div v-show="!generic_info_fold">
705
               <div v-show="!generic_info_fold">
706
                 <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
706
                 <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
707
-                  <el-form-item label="别名 : " prop="alias">
707
+                  <el-form-item label="血型 : " prop="alias">
708
                     <el-input v-model="form.alias"></el-input>
708
                     <el-input v-model="form.alias"></el-input>
709
                   </el-form-item>
709
                   </el-form-item>
710
                 </el-col>
710
                 </el-col>

+ 4 - 1
src/xt_pages/user/doctorAdvice.vue View File

2096
 import { jsGetAge, uParseTime } from "@/utils/tools";
2096
 import { jsGetAge, uParseTime } from "@/utils/tools";
2097
 import { getDataConfig } from "@/utils/data";
2097
 import { getDataConfig } from "@/utils/data";
2098
 import { getSelfMedicalList,getDrugDescByDrugName } from "@/api/drug/drug"
2098
 import { getSelfMedicalList,getDrugDescByDrugName } from "@/api/drug/drug"
2099
+import patient from "../../router/modules/patient";
2099
 let rowIndex = 1;
2100
 let rowIndex = 1;
2100
 const rowKey = 0;
2101
 const rowKey = 0;
2101
 
2102
 
2921
     },
2922
     },
2922
     DeleteGroupAdvice(groupno, row) {
2923
     DeleteGroupAdvice(groupno, row) {
2923
       console.log("patinet_id =======",row)
2924
       console.log("patinet_id =======",row)
2925
+      var patient_id = row.patient_id
2926
+      var advice_date = row.advice_date
2924
       this.$confirm("确认删除这组医嘱?", "医嘱删除", {
2927
       this.$confirm("确认删除这组医嘱?", "医嘱删除", {
2925
         confirmButtonText: "确定",
2928
         confirmButtonText: "确定",
2926
         cancelButtonText: "取消",
2929
         cancelButtonText: "取消",
2944
             }
2947
             }
2945
           }
2948
           }
2946
 
2949
 
2947
-          DeleteNewGroupAdvice(groupno, mode).then(response => {
2950
+          DeleteNewGroupAdvice(groupno, mode,patient_id,advice_date).then(response => {
2948
             if (response.data.state == 0) {
2951
             if (response.data.state == 0) {
2949
               this.$message.error(response.data.msg)``;
2952
               this.$message.error(response.data.msg)``;
2950
               return false;
2953
               return false;

+ 23 - 4
src/xt_pages/user/physiqueprinting.vue View File

54
                 <div style="flex: 1;">
54
                 <div style="flex: 1;">
55
                   首次透析日期:{{ patient.first_dialysis_date ? getTime(patient.first_dialysis_date, '{y}-{m}-{d}') : '' }}
55
                   首次透析日期:{{ patient.first_dialysis_date ? getTime(patient.first_dialysis_date, '{y}-{m}-{d}') : '' }}
56
                 </div>
56
                 </div>
57
-                <div style="flex: 1;">血型:{{ getBloodType(patient.blood_type) }}</div>
57
+                <div style="flex: 1;">血型:{{ patient.alias }}</div>
58
                 <div style="flex: 1;">报销方式:{{ getWayOptions(patient.reimbursement_way_id) }}</div>
58
                 <div style="flex: 1;">报销方式:{{ getWayOptions(patient.reimbursement_way_id) }}</div>
59
               </div>
59
               </div>
60
               <div style="display: flex; justify-self: start; margin-top: 5px ;width: 100%;">
60
               <div style="display: flex; justify-self: start; margin-top: 5px ;width: 100%;">
137
               {{index+1}}.<span>{{ item }}</span><br/>
137
               {{index+1}}.<span>{{ item }}</span><br/>
138
             </div>
138
             </div>
139
             <div style="text-align: right;margin-bottom: 10px;">
139
             <div style="text-align: right;margin-bottom: 10px;">
140
-              <span style="font-weight: bold;">病历书写者:</span>
141
-              {{getDoctorName(item.doctor_id)}}
140
+
141
+             <span style="font-weight: bold;">病历书写者:</span>
142
+              <span v-if="getUrl(item.doctor_id)!=''">
143
+                <img :src="getUrl(item.doctor_id)" style="height: 50px">
144
+              </span>
145
+              <span v-if="getUrl(item.doctor_id)==''">
146
+                {{getDoctorName(item.doctor_id)}}
147
+              </span>
148
+             
142
             </div>
149
             </div>
143
           </div>
150
           </div>
144
           <div style="float: right;">
151
           <div style="float: right;">
219
       },
226
       },
220
       diagnosis: [],
227
       diagnosis: [],
221
       treatment_plan_list:[],
228
       treatment_plan_list:[],
222
-      org_id:0
229
+      org_id:0,
230
+      signatureList:[]
223
     }
231
     }
224
   },
232
   },
225
   components: {
233
   components: {
230
       fetchAllDoctorAndNurse().then(response => {
238
       fetchAllDoctorAndNurse().then(response => {
231
         if (response.data.state == 1) {
239
         if (response.data.state == 1) {
232
           this.doctorOptions = response.data.data.doctors;
240
           this.doctorOptions = response.data.data.doctors;
241
+          var signature = response.data.data.signature
242
+          this.signatureList = signature
233
         }
243
         }
234
       });
244
       });
235
     },
245
     },
246
+    getUrl(creator){
247
+      var url = ""
248
+      for(let i=0;i<this.signatureList.length;i++){
249
+         if(creator == this.signatureList[i].admin_user_id){
250
+             url = this.signatureList[i].url
251
+         }
252
+      }
253
+      return url
254
+    },
236
     getDoctorName: function(doctor_id) {
255
     getDoctorName: function(doctor_id) {
237
       for (let index = 0; index < this.doctorOptions.length; index++) {
256
       for (let index = 0; index < this.doctorOptions.length; index++) {
238
         const doctor = this.doctorOptions[index]
257
         const doctor = this.doctorOptions[index]