Browse Source

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

yq1 1 year ago
parent
commit
33eabfa554

+ 1 - 0
src/api/advice.js View File

@@ -579,6 +579,7 @@ export function GetMobileScheduleList(params) {
579 579
 }
580 580
 
581 581
 export function getNewLongSchedualDoctors(params){
582
+  console.log("params-----------",params)
582 583
   return request({
583 584
     url: '/api/schedule/new/long/advices',
584 585
     method: 'get',

+ 47 - 33
src/xt_pages/Dialysisanalysis/otherIndicators/index.vue View File

@@ -7,23 +7,22 @@
7 7
       <div class="app-container">
8 8
         <div class="page_patientControlAnalysis">
9 9
           <div class="photos">
10
-            <div v-for="(item,index) in 3" :key="index"  @click="echart_click(index)"
10
+            <div v-for="(item,index) in indicators" :key="index"  @click="echart_click(item)"
11 11
               style="width: 280px;height: 360px;border:1px solid gainsboro;border-radius: 8px;margin: 0 0 30px 28px"
12 12
             >
13
-              <div v-if="index+1==1" class="background date_type1" style="background-repeat: no-repeat;"></div>
14
-              <div v-if="index+1==2" class="background date_type2" style="background-repeat: no-repeat;"></div>
15
-              <div v-if="index+1==3" class="background date_type3" style="background-repeat: no-repeat;"></div>
16
-              <p class="title">留治患者透析龄分析</p>
13
+<!--              <div v-if="index+1==1" class="background date_type1" style="background-repeat: no-repeat;"></div>-->
14
+              <div v-if="item.check_type == 1" class="background date_type2" style="background-repeat: no-repeat;"></div>
15
+              <div v-if="item.check_type == 2" class="background date_type3" style="background-repeat: no-repeat;"></div>
16
+              <p class="title">{{item.item_name}}</p>
17 17
               <div class="tag">
18 18
                 <span class="tags">留治患者</span>
19 19
                 <span class="tags">转归</span>
20 20
                 <span class="tags">死亡</span>
21 21
               </div>
22
-              <span class="use">已使用14次</span>
23
-              <!-- <span class="shoucang" style="background-repeat: no-repeat;"></span> -->
22
+<!--              <span class="use">已使用14次</span>-->
23
+               <span class="shoucang" style="background-repeat: no-repeat;"></span>
24
+              </div>
24 25
             </div>
25
-          </div>
26
-
27 26
         </div>
28 27
       </div>
29 28
     </div>
@@ -39,19 +38,7 @@ export default {
39 38
     },
40 39
     data() {
41 40
         return {
42
-          indicators:[{
43
-            name:"钾离子",
44
-            project_id:0,
45
-            item_id:0,
46
-          },{
47
-            name:"钠离子",
48
-            project_id:0,
49
-            item_id:0,
50
-          },{
51
-            name:"无机磷",
52
-            project_id:0,
53
-            item_id:0,
54
-          }],
41
+          indicators:[],
55 42
             activeName: 'first'
56 43
         }
57 44
     },
@@ -63,6 +50,29 @@ export default {
63 50
         getStatisticsList(params).then(response => {
64 51
           if (response.data.state == 1) {
65 52
             this.indicators  =  this.indicators.concat(response.data.data.configurationlist)
53
+            for(let i = 0; i < this.indicators.length; i++){
54
+              this.indicators[i]["check_type"] = 1
55
+              this.indicators[i]["sub_check_type"] = 1
56
+
57
+            }
58
+            let obj = {
59
+              "check_type":1,
60
+              "item_name":"KTV/URR",
61
+              "sub_check_type":2
62
+            }
63
+            this.indicators.push(obj)
64
+
65
+            let obj2 = {
66
+              "check_type":2,
67
+              "item_name":"指标汇总",
68
+              "sub_check_type":3
69
+
70
+            }
71
+            this.indicators.push(obj2)
72
+
73
+
74
+            console.log( this.indicators)
75
+            // this.indicators.push("")
66 76
           } else {
67 77
             this.$message.error(response.data.msg)
68 78
           }
@@ -74,17 +84,21 @@ export default {
74 84
       handleClick(tab, event) {
75 85
         console.log(tab, event);
76 86
       },
77
-      echart_click(num){
78
-        console.log(num)
79
-        if(num==0){
80
-          this.$router.push('/Dialysisanalysis/qualitycontrol/otherIndicators/components/columnarTotal')
81
-        }else if(num==1){
82
-          this.$router.push('/Dialysisanalysis/qualitycontrol/otherIndicators/components/CakeshapeTotal')
83
-        }else{
84
-          this.$router.push('/Dialysisanalysis/qualitycontrol/otherIndicators/components/tableTotal')
87
+      echart_click(item){
88
+        if(item.check_type == 1){
89
+          if(item.sub_check_type == 1){
90
+            this.$router.push('/Dialysisanalysis/qualitycontrol/Indicatorsdetail?project_id='+item.inspection_major+"&item_id="+item.inspection_minor+"&project_type="+parseInt(item.id))
91
+
92
+            // this.$router.push('/Dialysisanalysis/qualitycontrol/otherIndicators/components/columnarTotal')
93
+
94
+          }else if(item.sub_check_type == 2){
95
+            this.$router.push('/Dialysisanalysis/qualitycontrol/platelets')
96
+          }
97
+        }else if(item.check_type == 2){
98
+          this.$router.push('/Dialysisanalysis/qualitycontrol/summary')
85 99
         }
86
-        
87
-        
100
+
101
+
88 102
       }
89 103
     },
90 104
     created(){
@@ -111,7 +125,7 @@ export default {
111 125
   .date_type3{
112 126
     background: url('../../../assets/img/biaoge.png');
113 127
   }
114
-  
128
+
115 129
   .title{
116 130
     font-size: 18px;
117 131
     margin: 15px 10px;

+ 5 - 1
src/xt_pages/Dialysisanalysis/otherIndicators/otherIndicatorsall.vue View File

@@ -508,7 +508,11 @@ export default {
508 508
           this.reference = response.data.data.reference
509 509
           this.config = response.data.data.config
510 510
 
511
-          this.input = this.config.min_range + "<=" + response.data.data.reference.item_name + "<=" +this.config.large_range
511
+          for(var i = 0; i < this.indicators.length;i++){
512
+            if(this.indicators[i].id == this.project_type){
513
+              this.input = this.config.min_range + "<=" +  this.indicators[i].label + "<=" +this.config.large_range
514
+            }
515
+          }
512 516
           let objone = {
513 517
             value:  response.data.data.unusual_total ,
514 518
             name: '不达标值患者',

+ 29 - 5
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue View File

@@ -3036,6 +3036,30 @@
3036 3036
 
3037 3037
                   
3038 3038
                     </div>
3039
+                  <div
3040
+                    class="row"
3041
+                    style="padding: 2px 0; line-height: 23px; display: flex"
3042
+                  >
3043
+                    <div
3044
+                      class="inline_block"
3045
+                      style="flex: 1; display: inline-block"
3046
+                    >
3047
+                      备注:
3048
+                      <div
3049
+                        class="under_line"
3050
+                        style="
3051
+                          width: 860px;
3052
+                          line-height: 25px;
3053
+                          text-align: left;
3054
+                          margin-left: 2px;
3055
+                          display: inline-block;
3056
+                          white-space: normal;
3057
+                        "
3058
+                      >
3059
+                        {{ record.assessment_after_dislysis.remark ?record.assessment_after_dislysis.remark : "/" }}
3060
+                      </div>
3061
+                    </div>
3062
+                  </div>
3039 3063
 
3040 3064
                     <div
3041 3065
                       class="row"
@@ -3659,9 +3683,9 @@ export default {
3659 3683
             var delghTwo = 0;
3660 3684
             if (
3661 3685
               this.records[recordIndex].advices &&
3662
-              this.records[recordIndex].advices.length < 14
3686
+              this.records[recordIndex].advices.length < 10
3663 3687
             ) {
3664
-              delghTwo = 14 - this.records[recordIndex].advices.length;
3688
+              delghTwo = 10 - this.records[recordIndex].advices.length;
3665 3689
             } else {
3666 3690
               delghTwo = 0;
3667 3691
             }
@@ -3762,12 +3786,12 @@ export default {
3762 3786
                 rightIndex in advices ? advices[i + halfLen] : []
3763 3787
               );
3764 3788
             }
3765
-            if (halfLen < 8) {
3766
-              var nl = 8 - leftAdvice.length;
3789
+            if (halfLen < 6) {
3790
+              var nl = 6 - leftAdvice.length;
3767 3791
               for (let index = 0; index < nl; index++) {
3768 3792
                 leftAdvice.push([]);
3769 3793
               }
3770
-              var nl = 8 - rightAdvice.length;
3794
+              var nl = 6 - rightAdvice.length;
3771 3795
               for (let index = 0; index < nl; index++) {
3772 3796
                 rightAdvice.push([]);
3773 3797
               }

+ 47 - 9
src/xt_pages/dialysis/details/consumable/dialysisGood.vue View File

@@ -795,6 +795,7 @@
795 795
           if(response.data.state == 1){
796 796
             this.startDialogVisible = true
797 797
             var list = response.data.data.list
798
+            console.log("list===========",list)
798 799
             var kaliumCount = 0
799 800
             var sodiumCount = 0
800 801
             var calciumCount = 0
@@ -811,22 +812,59 @@
811 812
                  list[i].dialysis_irrigation_arr = []
812 813
                  list[i].puncture_needle_arr = []
813 814
                  list[i].dialysis_strainer_arr = []
814
-
815
-                 if(list[i].dialysis_solution.dialysis_dialyszers!=""){
815
+                 
816
+                 if(list[i].dialysis_prescription.dialysis_dialyszers!=""){
817
+                  if(list[i].dialysis_prescription.dialysis_dialyszers!=""){
818
+                   list[i].dialysis_dialyszers_arr = list[i].dialysis_prescription.dialysis_dialyszers.split(",")
819
+                  }
820
+                 }else{
821
+                  if(list[i].dialysis_solution.dialysis_dialyszers!=""){
816 822
                    list[i].dialysis_dialyszers_arr = list[i].dialysis_solution.dialysis_dialyszers.split(",")
823
+                  }
817 824
                  }
818
-                 if(list[i].dialysis_solution.dialyzer_perfusion_apparatus!=""){
819
-                   list[i].dialyzer_perfusion_apparatus_arr = list[i].dialysis_solution.dialyzer_perfusion_apparatus.split(",")
825
+
826
+                 if(list[i].dialysis_prescription.dialyzer_perfusion_apparatus!=""){
827
+                  if(list[i].dialysis_prescription.dialyzer_perfusion_apparatus!=""){
828
+                   list[i].dialyzer_perfusion_apparatus_arr = list[i].dialysis_prescription.dialyzer_perfusion_apparatus.split(",")
829
+                  }
830
+                 }else{
831
+                  if(list[i].dialysis_solution.dialyzer_perfusion_apparatus!=""){
832
+                    list[i].dialyzer_perfusion_apparatus_arr = list[i].dialysis_solution.dialyzer_perfusion_apparatus.split(",")
833
+                   }
820 834
                  }
821
-                 if(list[i].dialysis_solution.dialysis_irrigation!=""){
822
-                   list[i].dialysis_irrigation_arr = list[i].dialysis_solution.dialysis_irrigation.split(",")
835
+                
836
+                 if(list[i].dialysis_prescription.dialysis_irrigation!=""){
837
+                  if(list[i].dialysis_prescription.dialysis_irrigation!=""){
838
+                   list[i].dialysis_irrigation_arr = list[i].dialysis_prescription.dialysis_irrigation.split(",")
839
+                   }
840
+                 }else{
841
+                  if(list[i].dialysis_solution.dialysis_irrigation!=""){
842
+                    list[i].dialysis_irrigation_arr = list[i].dialysis_solution.dialysis_irrigation.split(",")
843
+                   }
823 844
                  }
824
-                 if(list[i].dialysis_solution.dialysis_strainer!=""){
825
-                   list[i].dialysis_strainer_arr = list[i].dialysis_solution.dialysis_strainer.split(",")
845
+                 
846
+                 if(list[i].dialysis_prescription.dialysis_strainer!=""){
847
+                  if(list[i].dialysis_prescription.dialysis_strainer!=""){
848
+                     list[i].dialysis_strainer_arr = list[i].dialysis_prescription.dialysis_strainer.split(",")
849
+                   }
850
+                 }else{
851
+                  if(list[i].dialysis_solution.dialysis_strainer!=""){
852
+                    list[i].dialysis_strainer_arr = list[i].dialysis_solution.dialysis_strainer.split(",")
853
+                  }
826 854
                  }
827
-                 if(list[i].dialysis_solution.puncture_needle!="" ){
855
+
856
+                 if(list[i].dialysis_prescription.puncture_needle!=""){
857
+                  if(list[i].dialysis_prescription.puncture_needle!="" ){
858
+                    list[i].puncture_needle_arr = list[i].dialysis_prescription.puncture_needle.split(",")
859
+                   }
860
+                 }else{
861
+                  if(list[i].dialysis_solution.puncture_needle!="" ){
828 862
                     list[i].puncture_needle_arr = list[i].dialysis_solution.puncture_needle.split(",")
863
+                  }
829 864
                  }
865
+                
866
+                
867
+                
830 868
                  kaliumCount += parseInt(list[i].dialysis_solution.kalium)
831 869
                  sodiumCount += parseInt(list[i].dialysis_solution.sodium)
832 870
                  calciumCount +=parseInt(list[i].dialysis_solution.calcium)

+ 12 - 3
src/xt_pages/dialysis/longDoctorAdvice.vue View File

@@ -39,7 +39,12 @@
39 39
             </template>
40 40
          </el-autocomplete>
41 41
          <el-button type="primary" @click="toSeach">搜索</el-button>
42
+
42 43
         </div>
44
+        <div class="filter-container">
45
+          <el-input style="width:200px" placeholder="请输入药品名称" v-model="keyword"></el-input>
46
+          <el-button type="primary" @click="toSeachOne">搜索</el-button>
47
+         </div>
43 48
         <div class="cell clearfix">
44 49
           <label class="title">
45 50
             <span class="name">日期查询:</span>
@@ -717,6 +722,7 @@
717 722
         execution_frequency:"",
718 723
         zoneIdList:[],
719 724
         partion_str:"",
725
+        keyword:""
720 726
       };
721 727
     },
722 728
     created() {
@@ -844,7 +850,7 @@
844 850
            var schedule_type = this.listQuery.schedul_type
845 851
            var partition_type = this.listQuery.partition_type
846 852
          
847
-          getNewLongSchedualDoctors({date: newTime,patient_type: 0,advice_type: 1,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id,excution_way:this.excution_way,cost_type:this.costType,execution_frequency:nameOne}).then(rs => {
853
+          getNewLongSchedualDoctors({date: newTime,patient_type: 0,advice_type: 1,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id,excution_way:this.excution_way,cost_type:this.costType,execution_frequency:nameOne,keyword:this.keyword}).then(rs => {
848 854
           var resp = rs.data
849 855
           if (resp.state == 1) {
850 856
              this.admin_users = resp.data.adminUser
@@ -1055,7 +1061,7 @@
1055 1061
            if(nameOne == '全部'){
1056 1062
             nameOne = ""
1057 1063
           }
1058
-        this.$router.push({ path: "/dialysis/signLongPrint",query:{time: new Date(this.time).getTime(),delivery_way:name,execution_frequency:nameOne,patient_id:this.patient_id} });
1064
+        this.$router.push({ path: "/dialysis/signLongPrint",query:{time: new Date(this.time).getTime(),delivery_way:name,execution_frequency:nameOne,patient_id:this.patient_id,keyword:this.keyword} });
1059 1065
   
1060 1066
       },
1061 1067
       batchPrintActionOne: function() {
@@ -2013,7 +2019,10 @@
2013 2019
         var week = weekArray[new Date(date).getDay()];//注意此处必须是先new一个Date
2014 2020
 
2015 2021
         return week;
2016
-      }
2022
+      },
2023
+      toSeachOne(){
2024
+      this.requestSchedualDoctors(this.time)
2025
+     }
2017 2026
   
2018 2027
     },
2019 2028
     components: {

+ 4 - 0
src/xt_pages/dialysis/longSignPrint.vue View File

@@ -124,6 +124,7 @@ export default {
124 124
             execution_frequency:"",
125 125
             org_id:0,
126 126
             drugList:[],
127
+            keyword:"",
127 128
         }
128 129
     },
129 130
     methods:{
@@ -147,6 +148,7 @@ export default {
147 148
             delivery_way:this.delivery_way,
148 149
             execution_frequency:this.execution_frequency,
149 150
             patient_id:this.$route.query.patient_id,
151
+            keyword:this.keyword
150 152
             }).then(rs => {
151 153
                 var resp = rs.data
152 154
                 if (resp.state == 1) {
@@ -589,6 +591,8 @@ export default {
589 591
       var execution_frequency = this.$route.query.execution_frequency
590 592
       this.execution_frequency = execution_frequency
591 593
       this.time = moment(time).format('YYYY-MM-DD')
594
+      var keyword =  this.$route.query.keyword
595
+      this.keyword = keyword
592 596
       console.log(11,this.$route.query)
593 597
       this.requestSchedualDoctors(time)
594 598
     }

+ 4 - 3
src/xt_pages/dialysis/newDoctorAdvice.vue View File

@@ -2368,14 +2368,14 @@ export default {
2368 2368
         const { columns, data } = param;
2369 2369
         const sums = [];
2370 2370
         columns.forEach((column, index) => {
2371
-          console.log("index---------",index)
2371
+        
2372 2372
           if (index === 0) {
2373 2373
             sums[index] = '总数';
2374 2374
             return;
2375 2375
           }
2376 2376
           if(index > 2){
2377 2377
             const values = data.map(item => item[column.property]);
2378
-            console.log("data0----------------",data)
2378
+           
2379 2379
 
2380 2380
           }
2381 2381
 
@@ -2454,7 +2454,8 @@ export default {
2454 2454
         //  })
2455 2455
         }
2456 2456
       })
2457
-    }
2457
+    },
2458
+   
2458 2459
 
2459 2460
   },
2460 2461
   components: {

+ 3 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderSeventythree.vue View File

@@ -551,8 +551,9 @@
551 551
                     <div class="inline_block" style="flex: 1">
552 552
                       透析时长:
553 553
                       <div class="under_line" style="width: 50px; text-align: center">
554
-                        {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "/" }}
555
-                      </div>h
554
+                        {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "/" }}h
555
+                        <span v-if="prescription.dialysis_duration_minute>0">{{prescription.dialysis_duration_minute}}min</span>
556
+                      </div>
556 557
                     </div>
557 558
                     <div class="inline_block" style="flex: 1">
558 559
                       <span >透析方式:</span>

+ 39 - 9
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue View File

@@ -221,6 +221,15 @@
221 221
                                   type="primary"
222 222
                                 >读电子凭证
223 223
                                 </el-button>
224
+
225
+
226
+                                <el-button
227
+                                  v-if="(hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0  && org_id != 10340)"
228
+                                  size="small"
229
+                                  @click="open(55,items.med_type,items.prescriptions[0].order,items.prescriptions)"
230
+                                  type="primary"
231
+                                >人脸识别
232
+                                </el-button>
224 233
 <!--                                <el-button-->
225 234
 <!--                                  v-if="(hisPatientInfo.id_card_type != 3  && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0 && org_id == 10480)"-->
226 235
 <!--                                  size="small"-->
@@ -919,13 +928,10 @@
919 928
 
920 929
     <register-dialog ref='register' :doctors="doctors" :departments="department" :sick="sick" :diagnoses="diagnoses"
921 930
                      v-on:confirm="confirm" v-on:cancel="cancel"></register-dialog>
922
-
923 931
     <call-un-association-prescription ref='call_prescription' v-on:call="call" v-on:call-cancel="callCancel"></call-un-association-prescription>
924
-
925 932
     <register-dialog9504 ref='register9504' :doctors="doctors" :departments="department" :sick="sick"
926 933
                          :diagnoses="diagnoses"
927 934
                          v-on:confirm="registerConfirm" v-on:cancel="registerCancel"></register-dialog9504>
928
-
929 935
     <charge-dialog ref='charge' v-on:confirm="chargeConfirm" v-on:cancel="chargeCancel"></charge-dialog>
930 936
     <el-dialog
931 937
       class="centerDialog"
@@ -941,8 +947,6 @@
941 947
       :visible.sync="statementVisible">
942 948
       <statementPrint ref="print" :paramsObj='orderObj'></statementPrint>
943 949
     </el-dialog>
944
-
945
-
946 950
     <el-dialog
947 951
       class="centerDialog"
948 952
       width="1200px"
@@ -951,7 +955,6 @@
951 955
 <!--      <statementPrintT ref="print" :paramsObj='orderObj'></statementPrintT>-->
952 956
       <new-statement-print-three ref="print" :paramsObj='orderObj'></new-statement-print-three>
953 957
     </el-dialog>
954
-
955 958
     <el-dialog
956 959
       class="centerDialog"
957 960
       width="1200px"
@@ -960,8 +963,6 @@
960 963
       <new-statement-print-two :params-obj="newOrderObj"></new-statement-print-two>
961 964
       <!--<newStatementPrint ref="print" :paramsObj='newOrderObj'></newStatementPrint>-->
962 965
     </el-dialog>
963
-
964
-
965 966
     <el-dialog title="输入密码" :visible.sync="pwdFormVisible">
966 967
       <el-form :model="form">
967 968
         <el-form-item label="密码" :label-width="20">
@@ -973,7 +974,6 @@
973 974
         <el-button type="primary" @click="comfirmPWDialog">确 定</el-button>
974 975
       </div>
975 976
     </el-dialog>
976
-
977 977
     <el-dialog
978 978
       class="centerDialog"
979 979
       width="1200px"
@@ -3898,6 +3898,36 @@ export default {
3898 3898
             .catch(function(error) {
3899 3899
             })
3900 3900
         }
3901
+      }else if(index == 55){
3902
+        var that = this
3903
+        let params = {
3904
+          "admin_user_id":this.$store.getters.xt_user.user.id,
3905
+          'his_patient_id': this.hisPatientInfo.id,
3906
+        }
3907
+          axios.get('http://127.0.0.1:9532/api/readelebyface', {
3908
+            params: params
3909
+          })
3910
+            .then(function(response) {
3911
+              if (response.data.state == 0) {
3912
+                that.$message.error(response.data.msg)
3913
+                return false
3914
+              } else {
3915
+                if (response.data.data.failed_code == -10) {
3916
+                  // that.$message.error(response.data.data.msg)
3917
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
3918
+                    confirmButtonText: '确 定',
3919
+                    type: 'warning'
3920
+                  }).then(() => {
3921
+
3922
+                  }).catch(() => {
3923
+                  })
3924
+                }else{
3925
+                  that.$message({ message: response.data.data.msg, type: 'success', duration: 5000 })
3926
+                }
3927
+              }
3928
+            })
3929
+            .catch(function(error) {
3930
+            })
3901 3931
       }
3902 3932
     },
3903 3933
     getName(admin_user_id) {

+ 10 - 2
src/xt_pages/outpatientCharges/statementPrint.vue View File

@@ -1493,8 +1493,16 @@ export default {
1493 1493
                   that.info['number'] = response.data.data.number
1494 1494
                   that.info['order_infos'] = response.data.data.order_infos
1495 1495
                   that.info['diagnosis'] = response.data.data.diagnosis
1496
-                  that.info['org_code'] = response.data.data.org_code
1497
-                  that.info['org_name'] = response.data.data.org_name
1496
+                  if(that.org_id == 10191){
1497
+                    that.info['org_code'] = "H36030201006"
1498
+                    that.info['org_name'] = "萍乡欣瑞怡康血液透析中心"
1499
+                  }else{
1500
+
1501
+                    that.info['org_code'] =response.data.data.org_code
1502
+                    that.info['org_name'] = response.data.data.org_name
1503
+                  }
1504
+
1505
+
1498 1506
                   that.info['doctor_code'] = response.data.data.doctor_code
1499 1507
                   that.info['department'] = response.data.data.department
1500 1508
                   that.info['health_card_no'] = response.data.data.health_card_no

+ 7 - 4
src/xt_pages/outpatientDoctorStation/components/callPrescription.vue View File

@@ -42,7 +42,11 @@
42 42
           <el-table v-if="subItem.type  == 1" :data="subItem.doctor_advice" border style="width: 99%;"
43 43
                     :row-style="{ color: '#303133' }"
44 44
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
45
-            <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
45
+            <el-table-column align="center"  width="60" label="序号">
46
+              <template slot-scope="scope">
47
+              <span>{{ scope.row.groupno}}</span>
48
+              </template>
49
+            </el-table-column>
46 50
             <el-table-column align="center" prop="drug_name"  width="160" label="名称">
47 51
               <template slot-scope="scope">
48 52
                 <span>{{ scope.row.advice_name }}</span>
@@ -278,7 +282,6 @@
278 282
             let tempProject = [];
279 283
             let tempAddition = [];
280 284
             for (let b = 0; b < prescription.doctor_advice.length; b++) {
281
-              let index = b + 1
282 285
               let obj = {
283 286
                 advice_id: 0,
284 287
                 drug_name: prescription.doctor_advice[b].advice_name,
@@ -294,7 +297,7 @@
294 297
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
295 298
                 id:prescription.doctor_advice[b].drug_id,
296 299
                 drug:prescription.doctor_advice[b].drug,
297
-                groupno: index,
300
+                groupno: prescription.doctor_advice[b].groupno,
298 301
                 hosp_appr_flag:"1",
299 302
               };
300 303
               if (obj.prescribing_number_unit == prescription.doctor_advice[b].drug.min_unit){
@@ -379,7 +382,7 @@
379 382
         this.srcPrescriptions = srcPrescriptions;
380 383
         this.start_time  = start_time
381 384
         this.end_time = end_time;
382
-      
385
+
383 386
         this.patient_id = id;
384 387
         this.name = '处方调用' + '('+name +')';
385 388
         this.allPrescription = prescriptions;

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

@@ -292,7 +292,7 @@
292 292
 
293 293
             <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
294 294
               <el-form-item
295
-                label="系统前透析次数 : "
295
+                label="系统前透析次数: "
296 296
                 prop="user_sys_before_count"
297 297
               >
298 298
                 <el-input v-model="form.user_sys_before_count"></el-input>
@@ -334,6 +334,12 @@
334 334
               </el-form-item>
335 335
             </el-col>
336 336
 
337
+            <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
338
+                  <el-form-item label="住院(门诊)号 : ">
339
+                    <el-input v-model="form.admissionNumber"></el-input>
340
+                  </el-form-item>
341
+              </el-col>
342
+
337 343
             <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
338 344
                 <el-form-item label="工作单位 : " prop="work">
339 345
                   <el-input v-model="form.work"></el-input>
@@ -704,11 +710,7 @@
704 710
                   <!-- <el-form-item label=" " style="float:left;" label-width="30px">
705 711
                   </el-form-item>-->
706 712
                 </el-col>
707
-                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
708
-                  <el-form-item label="住院(门诊)号 : ">
709
-                    <el-input v-model="form.admissionNumber"></el-input>
710
-                  </el-form-item>
711
-                </el-col>
713
+               
712 714
                 <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
713 715
                   <el-form-item label="医保类型 : " prop="reimbursementWayID">
714 716
                     <el-select v-model="form.reimbursementWayID">

+ 8 - 8
src/xt_pages/user/inspection.vue View File

@@ -150,7 +150,7 @@
150 150
                     </span>
151 151
                     </div>
152 152
                   <div v-else>
153
-                    <img :src="scope.row.value"> 
153
+                    <img :src="scope.row.value">
154 154
                   </div>
155 155
                 </template>
156 156
               </el-table-column>
@@ -202,7 +202,7 @@
202 202
                               content="点击查看大图"
203 203
                               placement="top-start"
204 204
                               >
205
-                                <img style="width: 300px;height: 150px;" :src="item.value" alt=""> 
205
+                                <img style="width: 300px;height: 150px;" :src="item.value" alt="">
206 206
                               </el-tooltip>
207 207
                           </div>
208 208
                         </div>
@@ -1231,9 +1231,9 @@ export default {
1231 1231
       } else {
1232 1232
         this.itemLoading = true
1233 1233
         this.project = row
1234
+
1234 1235
         this.items = row.inspection_reference
1235 1236
         this.itemName = row.project_name
1236
-
1237 1237
         this.queryParams.patient = this.patientID
1238 1238
         this.queryParams.project_id = this.project.project_id
1239 1239
         this.queryParams.page = 1
@@ -1347,7 +1347,7 @@ export default {
1347 1347
               }else{
1348 1348
                 this.items.push(item)
1349 1349
               }
1350
-             
1350
+
1351 1351
 
1352 1352
               console.log("items232232332wo",item.value.indexOf('http'))
1353 1353
 
@@ -1358,11 +1358,11 @@ export default {
1358 1358
               if(this.org_id!=10503){
1359 1359
                 this.isPic = false
1360 1360
               }
1361
- 
1361
+
1362 1362
               console.log("woowwoow",this.isPic)
1363
-              
1364
-              
1365
-              
1363
+
1364
+
1365
+
1366 1366
               console.log("isPicwowowow",this.items)
1367 1367
             }
1368 1368
           }