Browse Source

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

28169 1 year ago
parent
commit
e3f06e8ecc

+ 8 - 0
src/api/manage.js View File

@@ -797,4 +797,12 @@ export function DeleteBatchDialyisWater(data){
797 797
     method:"Delete",
798 798
     data:data,
799 799
   })
800
+}
801
+
802
+export function getInformationManaList(params){
803
+  return request({
804
+    url:"/api/manage/getinformationmanalist",
805
+    method:"get",
806
+    params:params
807
+  })
800 808
 }

+ 10 - 10
src/xt_pages/device/objectTableDisinfectTwo.vue View File

@@ -80,7 +80,7 @@
80 80
                     </template>
81 81
                 </el-table-column>
82 82
 
83
-                <el-table-column prop="name" :label="'体温计'+'\n'+'75%酒精擦拭'" align="center" min-width="60">
83
+                <el-table-column prop="name" :label="'体温计'+'\n'+'75%酒精浸泡'" align="center" min-width="60">
84 84
                     <template slot-scope="scope">
85 85
                         <!-- {{scope.row.fourth_total_time?scope.row.fourth_total_time:""}} -->
86 86
                         <!-- {{ scope.row.fourth_disinfection_time }} -->
@@ -990,7 +990,7 @@
990 990
                                 <td>负责人</td>
991 991
                                 <td>医疗垃圾桶<br/>1000mg/l含氯制剂</td>
992 992
                                 <td>负责人</td>
993
-                                <td>体温计<br/>75%酒精<br/>擦拭</td>
993
+                                <td>体温计<br/>75%酒精<br/>浸泡</td>
994 994
                                 <td>负责人</td>
995 995
                                 <td>体温枪<br/>75%酒精<br/>擦拭</td>
996 996
                                 <td>负责人</td>
@@ -1424,15 +1424,15 @@
1424 1424
               this.form.third_modifications = list.third_modifications?list.third_modifications:""
1425 1425
               this.form.third_creator = list.third_creator
1426 1426
 
1427
-              this.form.fourth_disinfection_water = list.third_disinfection_water?list.third_disinfection_water:""
1428
-              this.form.fourth_disinfection_methods = list.third_disinfection_methods?list.third_disinfection_methods:""
1427
+              this.form.fourth_disinfection_water = list.fourth_disinfection_water?list.fourth_disinfection_water:""
1428
+              this.form.fourth_disinfection_methods = list.fourth_disinfection_methods?list.fourth_disinfection_methods:""
1429 1429
               this.form.fourth_disinfection_time = list.fourth_disinfection_time?list.fourth_disinfection_time:""
1430
-              this.form.fourth_start_time  =this.getTimeThree(list.third_start_time)
1431
-              this.form.fourth_end_time = this.getTimeThree(list.third_end_time)
1432
-              this.form.fourth_total_time = list.third_total_time? list.third_total_time:""
1433
-              this.form.fourth_is_check = list.third_is_check.toString()
1434
-              this.form.fourth_modifications = list.third_modifications?list.third_modifications:""
1435
-              this.form.fourth_creator = list.third_creator
1430
+              this.form.fourth_start_time  =this.getTimeThree(list.fourth_start_time)
1431
+              this.form.fourth_end_time = this.getTimeThree(list.fourth_end_time)
1432
+              this.form.fourth_total_time = list.fourth_total_time? list.fourth_total_time:""
1433
+              this.form.fourth_is_check = list.fourth_is_check.toString()
1434
+              this.form.fourth_modifications = list.fourth_modifications?list.fourth_modifications:""
1435
+              this.form.fourth_creator = list.fourth_creator
1436 1436
 
1437 1437
               this.form.last_start_time = this.getTimeThree(list.last_start_time)
1438 1438
               this.form.last_end_time = this.getTimeThree(list.last_end_time)

+ 15 - 3
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue View File

@@ -69,8 +69,14 @@
69 69
               </div>
70 70
71 71
             </div>
72
-            <div class="inline_block">
73
-              门诊:
72
+            <div class="inline_block" v-if="record.receive_assessment.condition!=1">
73
+                门诊:
74
+                <div class="under_line" style="width: 30px; text-align: center">
75
+                  <check-box :checked="record.patient.source == 1"></check-box>
76
+                </div>
77
+              </div>
78
+            <div class="inline_block" v-if="record.receive_assessment.condition==1">
79
+              住院:
74 80
               <div class="under_line" style="width: 30px; text-align: center">
75 81
                 <check-box :checked="record.patient.source == 1"></check-box>
76 82
               </div>
@@ -2061,12 +2067,18 @@
2061 2067
                 </div>
2062 2068
2063 2069
               </div>
2064
-              <div class="inline_block">
2070
+              <div class="inline_block" v-if="record.receive_assessment.condition!=1">
2065 2071
                 门诊:
2066 2072
                 <div class="under_line" style="width: 30px; text-align: center">
2067 2073
                   <check-box :checked="record.patient.source == 1"></check-box>
2068 2074
                 </div>
2069 2075
               </div>
2076
+              <div class="inline_block" v-if="record.receive_assessment.condition==1">
2077
+                住院:
2078
+                <div class="under_line" style="width: 30px; text-align: center">
2079
+                  <check-box :checked="record.patient.source == 1"></check-box>
2080
+                </div>
2081
+              </div>
2070 2082
               <div class="inline_block">
2071 2083
                 病区:
2072 2084
                 <div class="under_line" style="width: 50px; text-align: center">

+ 3 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_thirtyTwo.vue View File

@@ -72,7 +72,9 @@
72 72
                         <td width="10">第</td>
73 73
                         <td width="50">
74 74
                             <div class="under-line">
75
-                            {{ record.patient.total_dialysis + record.patient.user_sys_before_count }}
75
+                            <!-- {{ record.patient.total_dialysis + record.patient.user_sys_before_count }} -->
76
+
77
+                             {{ record.Count }}
76 78
                             </div>
77 79
                         </td>
78 80
                         <td width="80">次透析</td>

+ 65 - 43
src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue View File

@@ -915,6 +915,9 @@
915 915
               response => {
916 916
                 if (response.data.state == 0) {
917 917
                   this.$message.error(response.data.msg);
918
+                  if(response.data.code == 600000008){
919
+                     this.infoDialogVisible = true
920
+                   }
918 921
                   return false;
919 922
                 } else {
920 923
                   this.$notify({
@@ -975,6 +978,9 @@
975 978
           response => {
976 979
             if (response.data.state == 0) {
977 980
               this.$message.error(response.data.msg)
981
+              if(response.data.code == 600000008){
982
+               this.infoDialogVisible = true
983
+              }
978 984
               return false
979 985
             } else {
980 986
               this.$notify({
@@ -1283,6 +1289,9 @@
1283 1289
         ExecDoctorAdvice(this.patient.id, this.currentRow.id, this.execTime, mode,this.currentRow.origin).then(response => {
1284 1290
             if (response.data.state == 0) {
1285 1291
               this.$message.error(response.data.msg)
1292
+             if(response.data.code == 600000008){
1293
+               this.infoDialogVisible = true
1294
+             }
1286 1295
               this.exceLoading = false
1287 1296
               return false
1288 1297
             } else {
@@ -1377,6 +1386,9 @@
1377 1386
             this.loading = false
1378 1387
             if (response.data.state == 0) {
1379 1388
               this.$message.error(response.data.msg)
1389
+              if(response.data.code == 600000008){
1390
+               this.infoDialogVisible = true
1391
+              }
1380 1392
               return false
1381 1393
             } else {
1382 1394
               this.$notify({
@@ -1650,7 +1662,9 @@
1650 1662
               response => {
1651 1663
                 if (response.data.state == 0) {
1652 1664
                   this.$message.error(response.data.msg)
1653
-
1665
+                  if(response.data.code == 600000008){
1666
+                    this.infoDialogVisible = true
1667
+                  }
1654 1668
                   this.deleLoading = false
1655 1669
                   return false
1656 1670
                 } else {
@@ -1822,6 +1836,9 @@
1822 1836
             DeleteGroupAdvice(groupno, mode).then(response => {
1823 1837
               if (response.data.state == 0) {
1824 1838
                 this.$message.error(response.data.msg)
1839
+                if(response.data.code == 600000008){
1840
+                 this.infoDialogVisible = true
1841
+                }
1825 1842
                 return false
1826 1843
               } else {
1827 1844
                 this.$notify({
@@ -1870,6 +1887,9 @@
1870 1887
               this.deleLoading = false
1871 1888
               if (response.data.state == 0) {
1872 1889
                 this.$message.error(response.data.msg)
1890
+                if(response.data.code == 600000008){
1891
+                   this.infoDialogVisible = true
1892
+                }
1873 1893
                 return false
1874 1894
               } else {
1875 1895
                 this.$notify({
@@ -1911,6 +1931,9 @@
1911 1931
             DeleteDoctorAdvice(this.currentRow.id, mode).then(response => {
1912 1932
               this.deleLoading = false
1913 1933
               if (response.data.state == 0) {
1934
+                 if(response.data.code == 600000008){
1935
+                  this.infoDialogVisible = true
1936
+                 }
1914 1937
                 this.$message.error(response.data.msg)
1915 1938
                 return false
1916 1939
               } else {
@@ -2126,8 +2149,17 @@
2126 2149
         return true
2127 2150
       }
2128 2151
       ,
2129
-
2130
-
2152
+      mergeSpan({ row, column, rowIndex, columnIndex }) {
2153
+        if (columnIndex != 2) {
2154
+          const _row = this.tempArr[rowIndex]
2155
+          const _col = _row > 0 ? 1 : 0
2156
+          return {
2157
+            rowspan: _row,
2158
+            colspan: _col
2159
+          }
2160
+        }
2161
+      }
2162
+      ,
2131 2163
       handleSpanTempArr() {
2132 2164
         this.tempArr = []
2133 2165
 
@@ -2290,45 +2322,34 @@
2290 2322
         // });
2291 2323
       },
2292 2324
       objectSpanMethod({ row, column, rowIndex, columnIndex }) {
2293
-        console.log("hhhhhhhhhh",this.tempArrOne)
2294
-        //合并单元格
2295
-        if (columnIndex === 0 || columnIndex === 1 ) {
2296
-          const _row = this.tempArrOne[rowIndex];
2297
-          const _col = _row > 0 ? 1 : 0;
2298
-          console.log("_row====",_row)
2299
-          console.log("_row----------",_col)
2300
-          return {
2301
-            rowspan: _row,
2302
-            colspan: _col
2303
-          };
2304
-        }
2305
-        // if (columnIndex === 0) {
2306
-        //   if (rowIndex % 2 === 0) {
2307
-        //     return {
2308
-        //       rowspan: 2,
2309
-        //       colspan: 1
2310
-        //     }
2311
-        //   } else {
2312
-        //     return {
2313
-        //       rowspan: 0,
2314
-        //       colspan: 0
2315
-        //     }
2316
-        //   }
2317
-        // }
2318 2325
 
2319
-        // if (columnIndex === 1) {
2320
-        //   if (rowIndex % 2 === 0) {
2321
-        //     return {
2322
-        //       rowspan: 2,
2323
-        //       colspan: 1
2324
-        //     }
2325
-        //   } else {
2326
-        //     return {
2327
-        //       rowspan: 0,
2328
-        //       colspan: 0
2329
-        //     }
2330
-        //   }
2331
-        // }
2326
+        if (columnIndex === 0) {
2327
+          if (rowIndex % 2 === 0) {
2328
+            return {
2329
+              rowspan: 2,
2330
+              colspan: 1
2331
+            }
2332
+          } else {
2333
+            return {
2334
+              rowspan: 0,
2335
+              colspan: 0
2336
+            }
2337
+          }
2338
+        }
2339
+
2340
+        if (columnIndex === 1) {
2341
+          if (rowIndex % 2 === 0) {
2342
+            return {
2343
+              rowspan: 2,
2344
+              colspan: 1
2345
+            }
2346
+          } else {
2347
+            return {
2348
+              rowspan: 0,
2349
+              colspan: 0
2350
+            }
2351
+          }
2352
+        }
2332 2353
       }
2333 2354
       ,
2334 2355
       GetLastOrNextDoctorAdvice(params) {
@@ -2638,17 +2659,18 @@
2638 2659
           selected_date:this.selected_date,
2639 2660
           patient_id:this.$route.query.patient_id,
2640 2661
           record_date:this.$route.query.date,
2641
-          module:4,
2662
+          module:2,
2642 2663
           remark:this.remark,
2643 2664
         }
2644 2665
         saveInformation(params).then(response=>{
2645 2666
            if(response.data.state == 1){
2646 2667
              var information = response.data.data.information
2647
-             this.$message.success("提交成功!")
2668
+             this.$message.success("审核成功!")
2648 2669
              this.infoDialogVisible = false
2649 2670
            }
2650 2671
         })
2651 2672
       }
2673
+
2652 2674
     },
2653 2675
     created() {
2654 2676
 

+ 33 - 41
src/xt_pages/dialysis/details/dialog/acceptsTreatmentDialog.vue View File

@@ -1,4 +1,5 @@
1 1
 <template>
2
+  <div>
2 3
   <div>
3 4
   <el-dialog
4 5
     title="接诊评估"
@@ -141,7 +142,7 @@
141 142
           >{{ item.name }}
142 143
         </el-radio>
143 144
       </el-radio-group>
144
-     
145
+
145 146
       </el-form-item>
146 147
 
147 148
       <el-form-item
@@ -209,7 +210,7 @@
209 210
           >高风险</el-radio
210 211
         >
211 212
       </el-radio-group>
212
- 
213
+
213 214
       </el-form-item>
214 215
 
215 216
       <div style="position: relative;">
@@ -225,7 +226,7 @@
225 226
           <!--v-if="isShow('跌倒风险预防措施')" isFalldown prop="precautionTwo" @change="precautionchange" isCheckmust('跌倒风险预防措施')
226 227
             :prop="isName('跌倒风险预防措施')" :rules="isCheckmust('跌倒风险预防措施')"
227 228
             [{required: true, message: '请选择跌倒风险预防措施', trigger: 'change'}]-->
228
-            
229
+
229 230
           <el-checkbox-group v-model="precautionTwo" @change="precautionchange" >
230 231
             <el-checkbox
231 232
               v-for="item in precaution_arr"
@@ -348,7 +349,7 @@
348 349
     </div>
349 350
   </el-dialog>
350 351
 
351
-  
352
+
352 353
   <el-dialog
353 354
       title="提示"
354 355
       :visible.sync="infoDialogVisible"
@@ -374,7 +375,7 @@
374 375
             </span>
375 376
           </el-row>
376 377
         </el-form>
377
-         
378
+
378 379
       </span>
379 380
       <span slot="footer" class="dialog-footer">
380 381
         <el-button @click="infoDialogVisible = false">取 消</el-button>
@@ -501,7 +502,7 @@ export default {
501 502
     },
502 503
     // 复选框跌倒风险措施
503 504
     precautionchange(){
504
-     
505
+
505 506
       if(this.precautionTwo.length>0){
506 507
         this.$refs.receiveTreatmentAsses.clearValidate('precautionTwo');
507 508
       }
@@ -515,12 +516,12 @@ export default {
515 516
             this.arr.push(this.precaution_arr[i].id);
516 517
           }
517 518
         }
518
-      } 
519
+      }
519 520
       // this.precautionchange()
520 521
       var obj = this.arr.join(",");
521 522
       this.receiveTreatmentAsses.precaution = obj;
522 523
       let ParamsQuery = this.receiveTreatmentAsses;
523
-      
524
+
524 525
       console.log("ParamsQuery", ParamsQuery);
525 526
       ParamsQuery["patient"] = this.patient.id;
526 527
       ParamsQuery["record_date"] = this.record_date;
@@ -541,6 +542,9 @@ export default {
541 542
           postAccepts(ParamsQuery).then((response) => {
542 543
             if (response.data.state == 0) {
543 544
               this.$message.error(response.data.msg);
545
+               if(response.data.code == 600000008){
546
+                 this.infoDialogVisible = true
547
+               }
544 548
               return false;
545 549
             } else {
546 550
               this.$notify({
@@ -584,13 +588,13 @@ export default {
584 588
     isCheckmust(name) {
585 589
       let filedList = store.getters.xt_user.fileds;
586 590
       for (let i = 0; i < filedList.length; i++) {
587
-        
591
+
588 592
         if (
589 593
           filedList[i].module == 2 &&
590 594
           filedList[i].filed_name_cn == name &&
591 595
           filedList[i].is_write == 1
592 596
         ) {
593
-          // name == '跌倒风险预防措施' && filedList[i].is_write == 1
597
+          // name == '跌倒风险预防措施' && this.precautionTwo.length<=0
594 598
           if (name == "风险程度"||name == "病人情况"||name == '心理评估') {
595 599
             return [
596 600
               { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
@@ -601,21 +605,21 @@ export default {
601 605
                 trigger: ['blur','change']
602 606
               },
603 607
             ];
604
-          } 
608
+          }
605 609
           else if(name == "跌倒风险预防措施"){
606 610
             if(this.precautionTwo.length<=0){
607 611
               this.isrequired=false
608 612
               return [{ required: true, message: `请输入${name}`,trigger: ['blur','change'] }];
609
-              
613
+
610 614
             }
611 615
             this.precautionchange()
612 616
             this.isrequired=true
613 617
             // return [{ required: true, message: '',trigger: ['blur','change'] }];
614 618
           }else{
615 619
             return [{ required: true, message: `请输入${name}`,trigger: ['blur','change'] }];
616
-            
620
+
617 621
           }
618
-          
622
+
619 623
         }
620 624
       }
621 625
     },
@@ -624,28 +628,20 @@ export default {
624 628
     //   for (let i = 0; i < filedList.length; i++) {
625 629
     //     if (
626 630
     //       filedList[i].module == 2 &&
627
-    //       filedList[i].filed_name_cn == name 
628
-          
631
+    //       filedList[i].filed_name_cn == name &&
632
+    //       filedList[i].is_write == 1
629 633
     //     ) {
630
-    //       // &&filedList[i].is_write == 1
631
-    //       if (name == "跌倒风险预防措施") {
632
-    //         if(this.precautionTwo.length<=0){
633
-    //             return [
634
-    //             { required: true, message: `请选择${name}`,trigger: ['blur','change'] },
635
-    //             {
636
-    //               required: true,
637
-    //               pattern: /^[1-9]\d*$/,
638
-    //               message: `请选择${name}`,
639
-    //               trigger: ['blur','change']
640
-    //             },
641
-    //           ];
642
-    //         }
643
-    //         this.precautionchange()
644
-    //         return[{ required: true, message: '',trigger: ['blur','change'] }]
645
-    //         // this.$refs.receiveTreatmentAsses.clearValidate('precautionTwo');
646
-             
647
-    //       } 
648
-          
634
+    //       if (name == "跌倒风险预防措施" && this.precautionTwo.length<=0) {
635
+    //         return [
636
+    //           { required: true, message: `请选择${name}`,trigger: ['blur','change'] },
637
+    //           {
638
+    //             required: true,
639
+    //             pattern: /^[1-9]\d*$/,
640
+    //             message: `请选择${name}`,
641
+    //             trigger: ['blur','change']
642
+    //           },
643
+    //         ];
644
+    //       }
649 645
     //     }
650 646
     //   }
651 647
     // },
@@ -689,7 +685,8 @@ export default {
689 685
           }
690 686
         });
691 687
     },
692
-    saveInformation(){
688
+
689
+   saveInformation(){
693 690
         var params = {
694 691
           selected_date:this.selected_date,
695 692
           patient_id:this.$route.query.patient_id,
@@ -734,7 +731,6 @@ export default {
734 731
     },
735 732
   },
736 733
   created() {
737
-    
738 734
     // console.log("接诊评估", this.receiver_treatment_access);
739 735
     var date = this.$route.query && this.$route.query.date;
740 736
     this.record_date = date
@@ -751,11 +747,7 @@ export default {
751 747
     // console.log("风险", this.precaution_arr);
752 748
     this.intake_arr = getDataConfig("hemodialysis", "intake");
753 749
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
754
-    
755 750
   },
756
-  // mounted(){
757
-  //   this.isFalldown()
758
-  // }
759 751
 };
760 752
 </script>
761 753
 

+ 1 - 1
src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue View File

@@ -1600,7 +1600,7 @@ export default {
1600 1600
         }
1601 1601
       }
1602 1602
       
1603
-      if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340){
1603
+      if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 || this.$store.getters.xt_user.org.id == 10517){
1604 1604
          var date = new Date()
1605 1605
           var year = date.getFullYear()
1606 1606
           var month = date.getMonth() + 1

+ 8 - 0
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue View File

@@ -2552,6 +2552,14 @@ mu
2552 2552
             } else if (schedual.schedule_type == 3) {
2553 2553
               this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
2554 2554
             }
2555
+           }else if(this.$store.getters.xt_user.org.id == 10517){
2556
+              if (schedual.schedule_type == 1) {
2557
+              this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
2558
+            } else if (schedual.schedule_type == 2) {
2559
+              this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
2560
+            } else if (schedual.schedule_type == 3) {
2561
+              this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
2562
+            }
2555 2563
            } else {
2556 2564
             if (schedual.schedule_type == 1) {
2557 2565
               this.start_time = year + '-' + month + '-' + day + ' ' + '07:00'

+ 2 - 1
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue View File

@@ -536,6 +536,7 @@
536 536
               ((template_id == 6 &&
537 537
                 org_id != 9919 &&
538 538
                 org_id != 10191 &&
539
+                org_id!=10478 &&
539 540
                 template_id != 43 &&
540 541
                 template_id != 47) ||
541 542
                 org_id == 9779 ||
@@ -568,7 +569,7 @@
568 569
             width="100"
569 570
             v-if="
570 571
               isShow('置换量') &&
571
-              (template_id != 6 || org_id == 9919 || org_id == 10191) &&
572
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478) &&
572 573
               template_id != 9779 &&
573 574
               template_id != 11 &&
574 575
               template_id != 20 &&

+ 2 - 2
src/xt_pages/dialysis/details/dialysisMonitoring.vue View File

@@ -23,8 +23,8 @@
23 23
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410) " width="92px" > 置换率(ml/min) </th>
24 24
           <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410" width="92px" > 置换率(L/h)  </th>
25 25
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
26
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 )" width="92px"  > 置换量(ml)  </th>
27
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445)" width="92px" > 置换量(L) </th>
26
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 )" width="92px"  > 置换量(ml)  </th>
27
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445)" width="92px" > 置换量(L) </th>
28 28
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
29 29
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
30 30
           <th v-if="isShow('置换液流量') && template_id != 27" width="92px">置换液流量(ml/h)</th>

+ 18 - 6
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue View File

@@ -65,12 +65,18 @@
65 65
             </div>
66 66
67 67
           </div>
68
-          <div class="inline_block">
68
+          <div class="inline_block" v-if="receiverTreatmentAccess.condition!=1">
69 69
             门诊:
70 70
             <div class="under_line" style="width: 30px; text-align: center">
71 71
               <check-box :checked="patientInfo_source_1"></check-box>
72 72
             </div>
73 73
           </div>
74
+          <div class="inline_block" v-if="receiverTreatmentAccess.condition==1">
75
+            住院:
76
+            <div class="under_line" style="width: 30px; text-align: center">
77
+              <check-box :checked="receiverTreatmentAccess.condition == 1"></check-box>
78
+            </div>
79
+          </div>
74 80
           <div class="inline_block">
75 81
             病区:
76 82
             <div class="under_line" style="width: 50px; text-align: center">
@@ -1878,12 +1884,18 @@
1878 1884
               </div>
1879 1885
1880 1886
             </div>
1881
-            <div class="inline_block">
1882
-              门诊:
1883
-              <div class="under_line" style="width: 30px; text-align: center">
1884
-                <check-box :checked="patientInfo_source_1"></check-box>
1885
-              </div>
1887
+            <div class="inline_block" v-if="receiverTreatmentAccess.condition!=1">
1888
+            门诊:
1889
+            <div class="under_line" style="width: 30px; text-align: center">
1890
+              <check-box :checked="patientInfo_source_1"></check-box>
1886 1891
             </div>
1892
+          </div>
1893
+          <div class="inline_block" v-if="receiverTreatmentAccess.condition==1">
1894
+            住院:
1895
+            <div class="under_line" style="width: 30px; text-align: center">
1896
+              <check-box :checked="receiverTreatmentAccess.condition == 1"></check-box>
1897
+            </div>
1898
+          </div>
1887 1899
             <div class="inline_block">
1888 1900
               病区:
1889 1901
               <div class="under_line" style="width: 50px; text-align: center">

+ 64 - 56
src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue View File

@@ -21,7 +21,7 @@
21 21
           <div>
22 22
             <div>
23 23
               <div style="display:inline-block; ;">病历号:
24
-                {{patientInfo.record_number }}
24
+                {{patientInfo.record_number?patientInfo.record_number:"" }}
25 25
               </div>
26 26
               <div style="display:inline-block;margin-left: 90px;">
27 27
                 姓名:{{ patientInfo.name }}
@@ -56,7 +56,8 @@
56 56
                 <td colspan="3" style="border:1px solid black">
57 57
                   <div style="display: inline-block; word-break: break-all;word-wrap: break-word;">
58 58
                     上机前病情:
59
-                    {{ predialysis.befor_symptoms ? predialysis.befor_symptoms : "/" }}
59
+                    <!-- {{ predialysis.symptom_before_dialysis ? predialysis.symptom_before_dialysis : "/" }} -->
60
+                    {{ predialysis.befor_symptoms? predialysis.befor_symptoms:"" }}
60 61
                   </div>
61 62
 
62 63
                 </td>
@@ -65,8 +66,7 @@
65 66
                 <td colspan="3">
66 67
                   <div style="display: inline-block; word-break: break-all;word-wrap: break-word;">
67 68
                     疾病诊断:
68
-                    <!-- {{ patientInfo.diagnose }} -->
69
-                    {{getDiagnosis(prescriptionInfo.patient_diagnosis) }}
69
+                    {{ getDiagnosis(prescriptionInfo.patient_diagnosis) }}
70 70
                   </div>
71 71
                 </td>
72 72
               </tr>
@@ -82,13 +82,12 @@
82 82
                     <span v-else-if="prescription.mode_id == 6">SCUF</span>
83 83
                     <span v-else-if="prescription.mode_id == 7">IUF</span>
84 84
                     <span v-else-if="prescription.mode_id == 8">HFHD</span>
85
-                    <span v-else-if="prescription.mode_id == 9">PHF</span>
86
-                    <span v-else-if="prescription.mode_id == 10">HFR</span>
87
-                    <span v-else-if="prescription.mode_id == 11">HDF+HP</span>
85
+                    <span v-else-if="prescription.mode_id == 9">HFHD+HP</span>
86
+                    <span v-else-if="prescription.mode_id == 10">PHF</span>
87
+                    <span v-else-if="prescription.mode_id == 11">HFR</span>
88 88
                     <span v-else-if="prescription.mode_id == 12">HDF+HP</span>
89 89
                     <span v-else-if="prescription.mode_id == 13">CRRT</span>
90
-                    <span v-else-if="prescription.mode_id == 14">腹水回输</span>
91
-                 
90
+                  
92 91
                     <span v-else-if="prescription.mode_id == 19">IUF+HD</span>
93 92
                     <span v-else-if="prescription.mode_id == 20">UF</span>
94 93
                     <span v-else-if="prescription.mode_id == 21">HD+</span>
@@ -98,6 +97,11 @@
98 97
                     <span v-else-if="prescription.mode_id == 25">HD高通</span>
99 98
                     <span v-else-if="prescription.mode_id == 26">CVVH</span>
100 99
                     <span v-else-if="prescription.mode_id == 27">CVVHD</span>
100
+                    <span v-else-if="prescription.mode_id == 28">CVVHDF</span>
101
+                    <span v-else-if="prescription.mode_id == 29">PE</span>
102
+                    <span v-else-if="prescription.mode_id == 30">血浆胆红素吸附+HP</span>
103
+                    <span v-else-if="prescription.mode_id == 31">HPD</span>
104
+                    <span v-else-if="prescription.mode_id == 32">HDP</span>
101 105
                 </td>
102 106
                 <td>
103 107
                   <span
@@ -378,7 +382,6 @@
378 382
                             }}
379 383
                             </span>
380 384
                         </td >
381
-
382 385
                         <td style=" ">
383 386
                             <span v-if="getTime(monitor.operate_time) != ''">
384 387
                                 &nbsp;{{
@@ -444,10 +447,12 @@
444 447
 
445 448
                         <!-- <td style=" "> {{ getTime(monitor.operate_time, "{h}:{i}") }}</td> -->
446 449
                         <td style=" ">
447
-                          <span style="word-break: break-all;word-wrap: break-word;">
448
-
449
-                              {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{monitor.result}}
450
-                          </span>
450
+                          <!-- <span style="display:inline-block;word-break: break-all;word-wrap: break-word; text-align: left;text-indent:2em;">
451
+                            {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{monitor.result}}
452
+                          </span> -->
453
+                          <div style="word-break: break-all;word-wrap: break-word; text-align: left;text-indent:2em;">
454
+                            {{ monitor.symptom }} {{ monitor.dispose }} {{monitor.result}}
455
+                          </div>
451 456
                         </td>
452 457
                         <!-- <td>
453 458
                           <span v-if="
@@ -888,9 +893,8 @@ export default {
888 893
         // this.receiverTreatmentAccess =
889 894
         //     response.data.data.receiverTreatmentAccess;
890 895
         this.assessmentafter = response.data.data.assessmentAfterDislysis;
891
-
892
-        this.prescriptionInfo =  response.data.data.prescriptionInfo
893
-
896
+        this.prescriptionInfo = response.data.data.prescriptionInfo
897
+        this.patientDiagnose = response.data.data.patientDiagnose
894 898
         // this.sick_condition_arr.forEach((o) => {
895 899
         //     if (this.receiverTreatmentAccess.sick_condition == o.id) {
896 900
         //     this.sick_condition = o.name;
@@ -990,6 +994,7 @@ export default {
990 994
           }
991 995
         });
992 996
         this.projects = projects;
997
+
993 998
         if (this.doctor_advices.length + this.projects.length <= 6) {
994 999
           var nl = 6 - (this.doctor_advices.length + this.projects.length);
995 1000
           this.print_length = 6;
@@ -1008,20 +1013,22 @@ export default {
1008 1013
         console.log("advices",this.advices)
1009 1014
         console.log("this.projects", this.projects);
1010 1015
 
1011
-        var objProject = {advice_name:"",start_time:"",single_dose:"",single_dose_unit:"",}
1016
+        // var objProject = {advice_name:"",start_time:"",single_dose:"",single_dose_unit:"",}
1012 1017
         if(this.projects!=null && this.projects.length >0){
1013 1018
            for(let i=0;i<this.projects.length;i++){
1014
-              if(this.projects[i].project_id ==  7620){
1015
-                 objProject.advice_name = this.projects[i].project.project_name
1016
-                 objProject.start_time = this.projects[i].start_time
1017
-                 objProject.single_dose = this.projects[i].single_dose
1018
-                 objProject.single_dose_unit = this.projects[i].unit
1019
-                 objProject.execution_time = this.projects[i].execution_time
1020
-                 objProject.execution_staff= this.projects[i].execution_staff
1021
-              }
1019
+             if(this.projects[i].type== 2){
1020
+              this.projects[i].advice_name = this.projects[i].project.project_name
1021
+              this.projects[i].start_time = this.projects[i].start_time
1022
+              this.projects[i].single_dose = this.projects[i].single_dose
1023
+              this.projects[i].single_dose_unit = this.projects[i].unit
1024
+              this.projects[i].execution_time = this.projects[i].execution_time
1025
+              this.projects[i].execution_staff= this.projects[i].execution_staff 
1026
+              this.advices.push(this.projects[i])
1027
+             }
1028
+             
1022 1029
            }
1023 1030
         }
1024
-        this.advices.push(objProject)
1031
+        
1025 1032
 
1026 1033
         var tableAdvice = this.advices;
1027 1034
 
@@ -1102,7 +1109,7 @@ export default {
1102 1109
           this.advices = tableAdvice;
1103 1110
         }
1104 1111
 
1105
-        this.patientDiagnose = response.data.data.patientDiagnose
1112
+        console.log("advices-----------------",this.advices)
1106 1113
 
1107 1114
  
1108 1115
          
@@ -1184,37 +1191,38 @@ export default {
1184 1191
     //     return jsGetAge(val.birth, "-");
1185 1192
     //   }
1186 1193
     // },
1187
-    getAge: function(val) {
1188
-      if (val.id_card_no == undefined) {
1189
-        return false
1190
-      }
1191
-      var thisLen = val.id_card_no.length
1192
-      var birth = ''
1193
-      if (thisLen == 15) {
1194
-        birth = '19' + val.id_card_no.substr(6, 6)
1195
-      } else {
1196
-        birth = val.id_card_no.substr(6, 8)
1194
+    getAge: function (val) {
1195
+      if(val!=undefined){
1196
+        var thisLen = val.id_card_no.length;
1197
+        var birth = "";
1198
+        if (thisLen == 15) {
1199
+          birth = "19" + val.id_card_no.substr(6, 6);
1200
+        } else {
1201
+          birth = val.id_card_no.substr(6, 8);
1202
+        }
1203
+        var birthtwo =
1204
+          birth.substr(0, 4) +
1205
+          "-" +
1206
+          birth.substr(4, 2) +
1207
+          "-" +
1208
+          birth.substr(6, 2);
1209
+
1210
+        var age = jsGetAge(birthtwo, "-");
1211
+        return age;
1197 1212
       }
1198
-      var birthtwo =
1199
-        birth.substr(0, 4) +
1200
-        '-' +
1201
-        birth.substr(4, 2) +
1202
-        '-' +
1203
-        birth.substr(6, 2)
1204
-
1205
-      var age = jsGetAge(birthtwo, '-')
1206
-      return age
1213
+    
1207 1214
     },
1208
-    getDiagnosis(ids){
1209
-       
1210
-        let nameArr = []
1211
-        for(let i=0;i<this.patientDiagnose.length;i++){
1212
-         if(ids.indexOf(this.patientDiagnose[i].id.toString())>-1){
1213
-            nameArr.push(this.patientDiagnose[i].class_name)
1214
-         }
1215
+   
1216
+    getDiagnosis(id) {
1217
+      let arr = id.split(',')
1218
+      var name = ''
1219
+      for (let i = 0; i < this.patientDiagnose.length; i++) {
1220
+        if (arr.indexOf(String(this.patientDiagnose[i].id)) > -1) {
1221
+          name += this.patientDiagnose[i].class_name + ' '
1215 1222
         }
1216
-        return nameArr.join(' ')
1217
-     },
1223
+      }
1224
+      return name
1225
+    }
1218 1226
   },
1219 1227
   created() {
1220 1228
     var bloodAccessParOpera = getDataConfig(

+ 2 - 4
src/xt_pages/management/components/WaterForm.vue View File

@@ -152,7 +152,7 @@
152 152
          <el-row>
153 153
             <el-col :span="8">
154 154
                 <el-form-item label="精密过滤器(MPa):"  class="st">
155
-                    <el-input  v-model.number="form.ultrafilter"  style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
155
+                    <el-input  v-model="form.ultrafilter"  style="width:100px"></el-input>
156 156
                 </el-form-item>
157 157
             </el-col>
158 158
          </el-row>
@@ -164,9 +164,7 @@
164 164
          <el-row>
165 165
             <el-col :span="8">
166 166
                 <el-form-item label="硬度监测(mg/l):"  class="st">
167
-                    <el-input  v-model="form.hardness_monitoring" style="width:100px"
168
-                    oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
169
-                     ></el-input>
167
+                    <el-input  v-model="form.hardness_monitoring" style="width:100px"></el-input>
170 168
                 </el-form-item>
171 169
             </el-col>
172 170
             <el-col :span="8">

+ 40 - 7
src/xt_pages/management/components/WaterFormList.vue View File

@@ -152,7 +152,7 @@
152 152
           <el-table-column label="水质监测" align="center" min-width="110px">
153 153
             <el-table-column label="硬度" align="center" min-width="110px">
154 154
               <template slot-scope="scope">
155
-                {{ scope.row.hardness_monitoring?scope.row.hardness_monitoring:"" }}
155
+                {{ scope.row.hardness_monitoring?scope.row.hardness_monitoring:0 }}
156 156
               </template>
157 157
             </el-table-column>
158 158
             <el-table-column label="总氯" align="center" min-width="110px">
@@ -196,6 +196,7 @@
196 196
             <el-table-column label="记录人" align="center" min-width="110px">
197 197
               <template slot-scope="scope">
198 198
                  {{ getDocName(scope.row.admin_user_id) }}
199
+                
199 200
               </template>
200 201
             </el-table-column>
201 202
 
@@ -397,7 +398,7 @@
397 398
          <el-row>
398 399
             <el-col :span="8">
399 400
                 <el-form-item label="精密过滤器(MPa):"  class="st">
400
-                    <el-input  v-model="form.ultrafilter" style="width:100px" type="number"></el-input>
401
+                    <el-input  v-model="form.ultrafilter" style="width:100px"></el-input>
401 402
                 </el-form-item>
402 403
             </el-col>
403 404
          </el-row>
@@ -735,7 +736,7 @@
735 736
                 <td
736 737
                   style="text-align:center;width:60px;font-size:15px"
737 738
                 >
738
-                {{ item.hardness_monitoring }}
739
+                {{ item.hardness_monitoring?item.hardness_monitoring:0 }}
739 740
                 </td>
740 741
                 <td
741 742
                   style="text-align:center;width:60px;font-size:15px"
@@ -776,7 +777,14 @@
776 777
                 </td>
777 778
 
778 779
                 <td style="text-align:center;width:70px;font-size:15px">
779
-                  {{ getDocName(item.admin_user_id) }}
780
+                  <!-- {{ getDocName(item.admin_user_id) }} -->
781
+
782
+                  <span v-if="setAdminUserES(item.admin_user_id?item.admin_user_id:item.admin_user_id) == ''">
783
+                     {{getDocName(item.admin_user_id)}}
784
+                 </span>
785
+                  <span v-else>
786
+                      <img style="height:30px;" :src="setAdminUserES(item.admin_user_id?item.admin_user_id:item.admin_user_id)" alt="" srcset="">
787
+                  </span>
780 788
                 </td>
781 789
 
782 790
 
@@ -878,6 +886,8 @@
878 886
            nurseList:[],
879 887
            selectCulture: [],
880 888
            hiddenShow:false,
889
+           operators: [],
890
+           operatorMaps:{},
881 891
         }
882 892
       },
883 893
       methods:{
@@ -905,7 +915,17 @@
905 915
                var total = response.data.data.total
906 916
                this.total = total
907 917
                this.adminRole = response.data.data.adminRole
908
-
918
+               this.operators = response.data.data.operators
919
+               if (this.operators.length > 0) {
920
+                var operatorsLen = this.operators.length
921
+                for (var index = 0; index < operatorsLen; index++) {
922
+                this.$set(
923
+                    this.operatorMaps,
924
+                    this.operators[index].id,
925
+                    this.operators[index]
926
+                )
927
+               }
928
+              }
909 929
 
910 930
              }
911 931
           })
@@ -1047,7 +1067,7 @@
1047 1067
             this.form.snd_tank = detail.snd_tank?detail.snd_tank:""
1048 1068
             this.form.resin_tank = detail.resin_tank?detail.resin_tank:""
1049 1069
             this.form.ultrafilter = detail.ultrafilter?detail.ultrafilter:""
1050
-            this.form.hardness_monitoring = detail.hardness_monitoring?detail.hardness_monitoring:""
1070
+            this.form.hardness_monitoring = detail.hardness_monitoring?detail.hardness_monitoring:0
1051 1071
             this.form.total_chlorine_detection= detail.total_chlorine_detection?detail.total_chlorine_detection:""
1052 1072
             this.form.ph_detection = detail.ph_detection?detail.ph_detection:""
1053 1073
             this.form.concentration_of_peroxyacetic_acid = detail.concentration_of_peroxyacetic_acid?detail.concentration_of_peroxyacetic_acid:""
@@ -1336,9 +1356,22 @@
1336 1356
         formatJson(filterVal, jsonData) {
1337 1357
           return jsonData.map(v => filterVal.map(j => v[j]));
1338 1358
         },
1359
+        setAdminUserES(id) {
1360
+           
1361
+           if (id === 0) {
1362
+           return ''
1363
+           }
1364
+           var user_name = ""
1365
+           for(let i=0;i<this.operators.length;i++){
1366
+              if(id == this.operators[i].admin_user_id){
1367
+                 user_name = this.operators[i].url
1368
+              }
1369
+           }
1370
+         
1371
+          return user_name
1372
+       },
1339 1373
       },
1340 1374
       created(){
1341
-        console.log("list+++++++++++++++++++++++")
1342 1375
         this.getlist()
1343 1376
       }
1344 1377
     }

+ 20 - 1
src/xt_pages/management/index.vue View File

@@ -30,6 +30,15 @@
30 30
           @click="seahcerMacherInfo()"
31 31
           >搜索</el-button
32 32
         >
33
+
34
+        <!-- <el-button
35
+          class="filter-item"
36
+          type="primary"
37
+          icon="el-icon-search"
38
+          size="small"
39
+          @click="Auto()"
40
+          >自动生成</el-button
41
+        > -->
33 42
       </div>
34 43
 
35 44
       <div class="cell clearfix">
@@ -169,7 +178,7 @@
169 178
 
170 179
 <script>
171 180
 import BreadCrumb from "../components/bread-crumb";
172
-import { getAllMachineInfo, getAllSubregion,getUserMachTotalCount,deleteManageMent } from "@/api/manage";
181
+import { getAllMachineInfo, getAllSubregion,getUserMachTotalCount,deleteManageMent,getInformationManaList } from "@/api/manage";
173 182
 import ManageForm from "./components/ManageForm";
174 183
 
175 184
 export default {
@@ -397,6 +406,16 @@ export default {
397 406
           })
398 407
         }
399 408
       
409
+    },
410
+
411
+    Auto(){
412
+       
413
+      getInformationManaList().then(response=>{
414
+        if(response.data.state == 1){
415
+          var list = response.data.data.list
416
+          this.$message.success("保存成功!")
417
+        }
418
+      })
400 419
     }
401 420
   },
402 421
   created() {

+ 1 - 2
src/xt_pages/outpatientCharges/components/registerDialog.vue View File

@@ -634,7 +634,7 @@
634 634
           'certificates':this.form.certificates,
635 635
         }
636 636
 
637
-        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) ){
637
+        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)) {
638 638
           try {
639 639
             //检测当前浏览器是否支持websocket模式
640 640
             window.WebSocket = window.WebSocket || window.MozWebSocket;
@@ -712,7 +712,6 @@
712 712
                       that.form.phone = patient.phone
713 713
                       that.form.id_card = patient.id_card_no
714 714
                       that.form.social_type = parseInt(response.data.data.insutype)
715
-
716 715
                     }
717 716
                     that.$message({ message: '读卡成功', type: 'success' })
718 717
                   }

+ 6 - 4
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue View File

@@ -3658,7 +3658,7 @@ export default {
3658 3658
           "admin_user_id":this.$store.getters.xt_user.user.id,
3659 3659
           'his_patient_id': this.hisPatientInfo.id,
3660 3660
         }
3661
-        if ((this.$store.getters.xt_user.org_id == 10387) || (this.$store.getters.xt_user.org_id == 10318)){
3661
+        if ((this.$store.getters.xt_user.org_id == 10387)){
3662 3662
           try {
3663 3663
             //检测当前浏览器是否支持websocket模式
3664 3664
             window.WebSocket = window.WebSocket || window.MozWebSocket;
@@ -3671,9 +3671,11 @@ export default {
3671 3671
             this.ws.onopen = function(event){
3672 3672
               if (that.$store.getters.xt_user.org_id == 10387){
3673 3673
                 that.ws.send("{\"url\":\"http://10.93.33.243:20001/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01301\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"罗佳菊\",\"orgId\":\"H43082200408\"},\"orgId\":\"H43082200408\",\"transType\":\"ec.query\"}}");
3674
-              }else if(that.$store.getters.xt_user.org_id == 10318){
3675
-                that.ws.send("{\"url\":\"http://igb.hsa.gdgov.cn/prd_nation_eccode/prd_eccode/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01301\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"邹刘阳\",\"orgId\":\"H44011701749\"},\"orgId\":\"H44011701749\",\"transType\":\"ec.query\"}}");
3676
-              }else if(that.$store.getters.xt_user.org_id == 4){
3674
+              }
3675
+              // else if(that.$store.getters.xt_user.org_id == 10318){
3676
+              //   that.ws.send("{\"url\":\"http://igb.hsa.gdgov.cn/prd_nation_eccode/prd_eccode/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01301\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"邹刘阳\",\"orgId\":\"H44011701749\"},\"orgId\":\"H44011701749\",\"transType\":\"ec.query\"}}");
3677
+              // }
3678
+              else if(that.$store.getters.xt_user.org_id == 4){
3677 3679
                 that.ws.send("{\"url\":\"http://igb.hsa.gdgov.cn/prd_nation_eccode/prd_eccode/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01301\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"邹刘阳\",\"orgId\":\"H44011701749\"},\"orgId\":\"H44011701749\",\"transType\":\"ec.query\"}}");
3678 3680
               }
3679 3681
             };

+ 24 - 7
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue View File

@@ -60,7 +60,7 @@
60 60
                   </el-form-item>
61 61
 
62 62
 
63
-                
63
+
64 64
 
65 65
 
66 66
                   <el-form-item label="过敏病史: " prop="name" label-position="right">
@@ -684,7 +684,8 @@ export default {
684 684
           }
685 685
         }
686 686
       },
687
-      hisList: []
687
+      hisList: [],
688
+      patient_diagnose:[]
688 689
 
689 690
     }
690 691
   },
@@ -1912,13 +1913,14 @@ export default {
1912 1913
       this.teamList = []
1913 1914
 
1914 1915
     },
1915
-    setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data, last_info,sick,diagnoses) {
1916
+    setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data, last_info,sick,diagnoses,patient_diagnose) {
1916 1917
       console.log("诊断23333333333333",this.diagnose)
1917 1918
       this.sick = sick
1918 1919
       this.diagnoses = diagnoses
1919 1920
       this.department = department
1920 1921
       this.curMonthPrescriptions = {}
1921 1922
       this.curPrescriptions = {}
1923
+      this.patient_diagnose = patient_diagnose
1922 1924
       // this.$refs.tabProjectTeam.clearSelection()
1923 1925
 
1924 1926
       for (let i = 0; i < doctors.length; i++) {
@@ -2076,14 +2078,29 @@ export default {
2076 2078
 
2077 2079
       }
2078 2080
 
2081
+      // console.log("info233333333333333333333",info.id)
2082
+      // console.log("LAST_INFO2323232323WO",last_info.patient_diagnosis)
2083
+      this.patient_diagnose = []
2084
+      if(info.id == 0){
2085
+        if (last_info.patient_diagnosis.length == 0) {
2086
+          this.patient_diagnose = []
2087
+        } else {
2088
+          for (let i = 0; i < last_info.patient_diagnosis.split(",").length; i++) {
2089
+            if(last_info.patient_diagnosis.split(',')[i].length > 0) {
2090
+              this.patient_diagnose.push(parseInt(last_info.patient_diagnosis.split(',')[i]))
2091
+            }
2092
+          }
2093
+        }
2094
+      }
2095
+
2079 2096
       if(info.id > 0){
2080
-       
2097
+
2081 2098
         if (info.patient_diagnosis.length == 0) {
2082 2099
           this.patient_diagnose = []
2083 2100
         } else {
2084 2101
           this.patient_diagnose = []
2085 2102
           for (let i = 0; i < info.patient_diagnosis.split(",").length; i++) {
2086
-           
2103
+
2087 2104
             if(info.patient_diagnosis.split(',')[i].length > 0) {
2088 2105
               this.patient_diagnose.push(parseInt(info.patient_diagnosis.split(',')[i]))
2089 2106
             }
@@ -2370,7 +2387,7 @@ export default {
2370 2387
               reg_type: this.register_type,
2371 2388
               patient_diagnose:str
2372 2389
             }
2373
-            
2390
+
2374 2391
             for (let i = 0; i < this.prescriptions.length; i++) {
2375 2392
               if (this.prescriptions[i].advices.length > 0 && this.prescriptions[i].project.length == 0) {
2376 2393
                 this.prescriptions[i]['type'] = 1
@@ -2780,7 +2797,7 @@ export default {
2780 2797
             this.$message.error('科室不能为空')
2781 2798
             return
2782 2799
           }
2783
-          
2800
+
2784 2801
           var str = ""
2785 2802
           if(patient_diagnose!=""){
2786 2803
              str = this.patient_diagnose.join(',')

+ 6 - 6
src/xt_pages/outpatientDoctorStation/doctorDesk.vue View File

@@ -1977,7 +1977,7 @@ export default {
1977 1977
             }
1978 1978
           }
1979 1979
           console.log('~~~~~00000222222',this.prescriptions)
1980
-          this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
1980
+          this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis,this.patient_diagnoses)
1981 1981
         }
1982 1982
       })
1983 1983
 
@@ -2564,7 +2564,7 @@ export default {
2564 2564
                     //   }
2565 2565
                   }
2566 2566
                 }
2567
-                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
2567
+                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis,this.patient_diagnoses)
2568 2568
                 this.$refs.child.watchSign = 0
2569 2569
               }
2570 2570
             })
@@ -3087,7 +3087,7 @@ export default {
3087 3087
                     // }
3088 3088
                   }
3089 3089
                 }
3090
-                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
3090
+                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis,this.patient_diagnoses)
3091 3091
                 this.$refs.child.watchSign = 0
3092 3092
               }
3093 3093
             })
@@ -3601,7 +3601,7 @@ export default {
3601 3601
                   // }
3602 3602
                 }
3603 3603
               }
3604
-              this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
3604
+              this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis,this.patient_diagnoses)
3605 3605
               this.$refs.child.watchSign = 0
3606 3606
             }
3607 3607
           })
@@ -4224,7 +4224,7 @@ export default {
4224 4224
                     // }
4225 4225
                   }
4226 4226
                 }
4227
-                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
4227
+                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis,this.patient_diagnoses)
4228 4228
               }
4229 4229
             })
4230 4230
 
@@ -4747,7 +4747,7 @@ export default {
4747 4747
 
4748 4748
                   }
4749 4749
                 }
4750
-                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
4750
+                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis,this.patient_diagnoses)
4751 4751
               }
4752 4752
             })
4753 4753
           } else {

+ 13 - 12
src/xt_pages/qcd/basicInformationAnalysis.vue View File

@@ -762,6 +762,7 @@ export default {
762 762
       }
763 763
     },
764 764
     selectLapseTo(state) {
765
+      console.log("statt---23-322323",state)
765 766
       this.stateType = state;
766 767
       this.listQuery.state = state;
767 768
       //获取本月当前机构的透析模式
@@ -1338,23 +1339,23 @@ export default {
1338 1339
     },
1339 1340
     selectSource(source) {
1340 1341
       this.sourceType = source
1341
-      this.getDialysisModeType(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
1342
-      this.getTotalLapseCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
1343
-      this.getTotalSexCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
1344
-      this.getTotalInfectiousCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
1345
-      this.getTotalAgeCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
1346
-      this.getTotalDialysisCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
1342
+      this.getDialysisModeType(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
1343
+      this.getTotalLapseCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
1344
+      this.getTotalSexCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
1345
+      this.getTotalInfectiousCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
1346
+      this.getTotalAgeCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
1347
+      this.getTotalDialysisCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
1347 1348
       this.getRolloutCount(this.lapsetoType,this.sourceType)
1348 1349
     },
1349 1350
     selectLapseOne(lapseto) {
1350 1351
       console.log("lapseto22222",lapseto)
1351 1352
       this.lapsetoType = lapseto
1352
-      this.getDialysisModeType(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
1353
-      this.getTotalLapseCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
1354
-      this.getTotalSexCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
1355
-      this.getTotalInfectiousCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
1356
-      this.getTotalAgeCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
1357
-      this.getTotalDialysisCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
1353
+      this.getDialysisModeType(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
1354
+      this.getTotalLapseCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
1355
+      this.getTotalSexCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
1356
+      this.getTotalInfectiousCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
1357
+      this.getTotalAgeCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
1358
+      this.getTotalDialysisCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
1358 1359
       this.getRolloutCount(this.lapsetoType,this.sourceType)
1359 1360
     },
1360 1361
   },

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

@@ -1906,6 +1906,7 @@ export default {
1906 1906
             // if (patietInfo.registrars_id > 0) {
1907 1907
             //   this.form.registrars = patietInfo.registrars_id;
1908 1908
             // }
1909
+            this.form.record_number = patietInfo.record_number
1909 1910
             this.form.doctor = patietInfo.doctor
1910 1911
             if(this.form.doctor == 0){
1911 1912
               this.form.doctor = ""