28169 il y a 8 mois
Parent
révision
9ef99cc77d

+ 9 - 0
src/api/drug/drug.js Voir le fichier

@@ -809,4 +809,13 @@ export function getSelfDrugWarehouseOutById(id,params){
809 809
     method:"get",
810 810
     params:params
811 811
   })
812
+}
813
+
814
+export function modifySelfDrugWarehouseOut(params, warehousing_time, dealer_id, manufacturer_id, type, patient_id, warehouse_out_id){
815
+
816
+  return request({
817
+    url:"/api/drug/modifyselfdrugwarehouseout?warehousing_out_time="+warehousing_time+ '&dealer_id=' + dealer_id + '&manufacturer_id=' + manufacturer_id + '&type=' + type + '&patient_id=' + patient_id + '&warehouse_out_id=' + warehouse_out_id,
818
+    method:"post",
819
+    data:params,
820
+   })
812 821
 }

+ 3 - 0
src/xt_pages/dialysis/batch_print/batch_print_order_seventeen.vue Voir le fichier

@@ -184,6 +184,9 @@
184 184
                     
185 185
                     <span style="display:inline-block;">
186 186
                     <label-box :isChecked="record.prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素钠"></label-box>:
187
+                    <label-box :isChecked="record.prescription.anticoagulant == 6 ? true : false" showValue="低分子肝素钙"></label-box>:
188
+                    <label-box :isChecked="record.prescription.anticoagulant == 8 ? true : false" showValue="依诺肝素"></label-box>:
189
+                    <label-box :isChecked="record.prescription.anticoagulant == 16 ? true : false" showValue="低分子量肝素钙"></label-box>:
187 190
                     </span>
188 191
                     <span style="display:inline-block;">
189 192
                         <div style="display:inline-block;width:30px;text-align:center">

+ 1 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_seventyfive.vue Voir le fichier

@@ -912,7 +912,7 @@
912 912
           <div  style="border: 1px solid black;border-bottom:none;width: 99%;">
913 913
             <div class="row" style="display: flex;">
914 914
               <div class="inline_block" style="flex: 1">
915
-                穿刺护士:
915
+                上机护士:
916 916
                 <div class="under_line"
917 917
                   style="width: 90px; text-align: center"
918 918
                 >

+ 2 - 2
src/xt_pages/dialysis/details/DialysisPrescription.vue Voir le fichier

@@ -170,13 +170,13 @@
170 170
         </li> -->
171 171
 
172 172
 
173
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597 && this.$store.getters.xt_user.template_info.org_id != 10571  && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702">
173
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597 && this.$store.getters.xt_user.template_info.org_id != 10571  && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635">
174 174
           <label>处方脱水量 : </label>
175 175
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
176 176
           <span class="unit">{{ prescription_water != "0" ? "ml" : "" }}</span>
177 177
         </li>
178 178
 
179
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10598 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10679 || this.$store.getters.xt_user.template_info.org_id == 10702">
179
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10598 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10679 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10635">
180 180
           <label>处方脱水量 : </label>
181 181
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
182 182
           <span class="unit">{{ prescription_water != "0" ? "L" : "" }}</span>

+ 3 - 3
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Voir le fichier

@@ -149,7 +149,7 @@
149 149
                     </el-col>
150 150
 
151 151
                     <el-col :span="8"
152
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702">
152
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635">
153 153
                         <el-form-item label="处方脱水量(ml):" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
154 154
                             <el-input
155 155
                                     type="number"
@@ -159,7 +159,7 @@
159 159
                     </el-col>
160 160
 
161 161
                     <el-col :span="8"
162
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679 || this.$store.getters.xt_user.template_info.org_id==10702">
162
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679 || this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635">
163 163
                         <el-form-item label="处方脱水量(L):" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
164 164
                             <el-input
165 165
                                     type="number"
@@ -2604,7 +2604,7 @@ mu
2604 2604
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
2605 2605
               this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
2606 2606
             }
2607
-            this.dialysisPrescription.prescription_water = ""
2607
+          
2608 2608
             if(this.dialysisPrescription.prescription_water==0 || this.dialysisPrescription.prescription_water==""){
2609 2609
               if((this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)>0){
2610 2610
                 this.dialysisPrescription.prescription_water = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)

+ 9 - 8
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue Voir le fichier

@@ -387,7 +387,7 @@
387 387
                 org_id == 10599 || 
388 388
                 org_id == 10612 ||
389 389
                 org_id == 10617 ||
390
-                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697) &&
390
+                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635) &&
391 391
                 org_id!=10387
392 392
             "
393 393
           >
@@ -458,7 +458,7 @@
458 458
               && org_id!=10432 && org_id!=10445
459 459
               && org_id!=10410 && org_id!=10495 &&
460 460
                org_id!=10485 && org_id!=10395 && org_id!=10375
461
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697)
461
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635)
462 462
               || org_id == 10387
463 463
             "
464 464
           >
@@ -529,7 +529,7 @@
529 529
                 org_id == 10410 ||
530 530
                 org_id == 10495  ||
531 531
                 org_id == 10395
532
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697)
532
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635)
533 533
                 && org_id!=10387
534 534
             "
535 535
           >
@@ -584,7 +584,7 @@
584 584
               org_id!=10432 &&
585 585
               org_id!=10445 &&
586 586
               org_id!=10410 && org_id!=10495
587
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697) ||
587
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635) ||
588 588
               org_id == 10387
589 589
             "
590 590
           >
@@ -1681,7 +1681,7 @@
1681 1681
                 org_id== 10432 ||
1682 1682
                 org_id== 10445 ||
1683 1683
                 org_id== 10410 ||
1684
-                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697) &&
1684
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635) &&
1685 1685
                 org_id!=10387
1686 1686
             "
1687 1687
           >
@@ -1729,7 +1729,7 @@
1729 1729
               org_id!=10445 &&
1730 1730
               org_id!=10410 &&
1731 1731
               org_id!=10485 &&
1732
-              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697)
1732
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635)
1733 1733
               || org_id == 10387
1734 1734
             "
1735 1735
           >
@@ -1802,7 +1802,7 @@
1802 1802
                 org_id == 10599 ||
1803 1803
                 org_id ==10612 || 
1804 1804
                 org_id ==10617 || 
1805
-                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697)
1805
+                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635)
1806 1806
                 && org_id!=10387 && org_id!=10694
1807 1807
             "
1808 1808
           >
@@ -1873,7 +1873,8 @@
1873 1873
               org_id!=10677 &&
1874 1874
               org_id!=10667 &&
1875 1875
               org_id!=10693 &&
1876
-              org_id!=10697
1876
+              org_id!=10697 &&
1877
+              org_id!=10635
1877 1878
               )
1878 1879
               || org_id == 10387 || org_id == 10694
1879 1880
             "

+ 4 - 4
src/xt_pages/dialysis/details/dialysisMonitoring.vue Voir le fichier

@@ -20,11 +20,11 @@
20 20
           <th v-if="isShow('血流量1')" width="92px">血流量(ml/min)</th>
21 21
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
22 22
           <th v-if="isShow('跨膜压1')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
23
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || 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 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
24
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  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 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
23
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || 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 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
24
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  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 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
25 25
           <th v-if=" isShow('超滤量1')"  width="76px"> 超滤量(ml) </th>
26
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
27
-          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
26
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
27
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
28 28
           <th v-if="isShow('超滤率2')" width="92px">超滤率(ml/h)</th>
29 29
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
30 30
           <th v-if="isShow('钠浓度1')" width="92px">钠浓度(mmol/L)</th>

+ 4 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue Voir le fichier

@@ -165,8 +165,11 @@
165 165
             <td style="text-align:left;padding-left:15px;" colspan="6">
166 166
               
167 167
               <span style="display:inline-block;">
168
-              <label-box :isChecked="anticoagulant == 6? true : false" showValue="低分子肝素钙"></label-box>:
168
+                <label-box :isChecked="anticoagulant == 6? true : false" showValue="低分子肝素钙"></label-box>:
169 169
                 <label-box :isChecked="anticoagulant == 7 ? true : false" showValue="低分子肝素钠"></label-box>:
170
+                <label-box :isChecked="anticoagulant == 8? true : false" showValue="依诺肝素"></label-box>:
171
+                <label-box :isChecked="anticoagulant == 16? true : false" showValue="低分子量肝素钙"></label-box>:
172
+               
170 173
               </span>
171 174
               <span style="display:inline-block;">
172 175
                   <div style="display:inline-block;width:30px;text-align:center">

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue Voir le fichier

@@ -629,7 +629,7 @@
629 629
         <div  style="border: 1px solid black;border-bottom:none;border-top:none;width: 99%;">
630 630
           <div class="row" style="display: flex;">
631 631
             <div class="inline_block" style="flex: 1">
632
-              穿刺护士:
632
+              上机护士:
633 633
               <div class="under_line"
634 634
                 style="width: 90px; text-align: center"
635 635
               >

+ 1 - 2
src/xt_pages/stock/selfPreparedMedicine/editWarehouseInfo.vue Voir le fichier

@@ -340,13 +340,12 @@
340 340
   import { uParseTime } from "@/utils/tools";
341 341
   import {
342 342
     GetAllDrugInfoByID,
343
-    postDrugWarehouse,
344 343
     toCheckWarehousingInfo,
345 344
     toReturnCheckWarehousing,
346 345
   } from "@/api/drug/drug_stock";
347 346
   import BreadCrumb from "../../components/bread-crumb";
348 347
   import { getDataConfig, getDictionaryDataConfig } from "@/utils/data";
349
-  import { getAllDrugList, postSearchDrugList } from "@/api/data";
348
+  import { getAllDrugList } from "@/api/data";
350 349
   import { getallPatientList,postSearchSelfDrugList,ModifySelfDrugWarehouse,getSelfDrugWarehouseInfoById,deleteSelfWarehouseInfo} from "@/api/drug/drug"
351 350
   export default {
352 351
     components: { BreadCrumb },

+ 79 - 10
src/xt_pages/stock/selfPreparedMedicine/editWarehouseOut.vue Voir le fichier

@@ -351,7 +351,7 @@
351 351
   import BreadCrumb from "../../components/bread-crumb";
352 352
   import { getDataConfig, getDictionaryDataConfig } from "@/utils/data";
353 353
   import { getAllDrugList, postSearchDrugList } from "@/api/data";
354
-    import { getallPatientList,postSearchSelfDrugList,postSelfDrugWarehouseOut,getSelfDrugBatchNumber,getSelfDrugWarehouseOutById} from "@/api/drug/drug"
354
+    import { getallPatientList,postSearchSelfDrugList,modifySelfDrugWarehouseOut,getSelfDrugBatchNumber,getSelfDrugWarehouseOutById} from "@/api/drug/drug"
355 355
   export default {
356 356
     components: { BreadCrumb },
357 357
     name: "stockIn",
@@ -473,6 +473,7 @@
473 473
         showReturnCheck:false,
474 474
         patientList:[],
475 475
         patient_id:"",
476
+        numberList:[]
476 477
       };
477 478
     },
478 479
     methods: {
@@ -808,11 +809,7 @@
808 809
                 this.recordInfo.recordData[i].warehouse_info_id = this.numberList[y].id;
809 810
               }
810 811
             }
811
-            // for (let s = 0; s < this.doctorList.length; s++) {
812
-            //   if (this.recordInfo.recordData[i].admin_user_id == this.doctorList[s].user_name) {
813
-            //      this.recordInfo.recordData[i].admin_user_id = this.doctorList[s].admin_user_id;
814
-            //   }
815
-            // }
812
+          
816 813
 
817 814
             this.recordInfo.recordData[i].last_price = 0
818 815
             this.recordInfo.recordData[i].stock_count = this.recordInfo.recordData[i].stock_count.toString();
@@ -821,14 +818,14 @@
821 818
             stockOut: this.recordInfo.recordData,
822 819
           };
823 820
           console.log("param22222222",params)
824
-        
821
+          console.log("haaaaaaaaaaaaaaa",this.warehouse_out_time,)
825 822
           const loading = this.$loading({
826 823
             lock: true,
827 824
             text: "Loading",
828 825
             spinner: "el-icon-loading",
829 826
             background: "rgba(0, 0, 0, 0.7)",
830 827
           });
831
-          postSelfDrugWarehouseOut(
828
+          modifySelfDrugWarehouseOut(
832 829
             params,
833 830
             this.warehouse_out_time,
834 831
             this.form.dealer,
@@ -858,6 +855,7 @@
858 855
               var dealerList = response.data.data.dealerList
859 856
               var manufacturerList = response.data.data.manufacturerList
860 857
               var drugTypeList = response.data.data.drugTypeList
858
+              
861 859
               for(let i=0;i<warehousingOutInfo.length;i++){
862 860
                 for(let j=0;j<dealerList.length;j++){
863 861
                    if(warehousingOutInfo[i].dealer == dealerList[j].id){
@@ -1165,9 +1163,80 @@
1165 1163
 
1166 1164
       getSelfDrugWarehouseOutById(id){
1167 1165
         getSelfDrugWarehouseOutById(id).then(response=>{
1168
-
1166
+          if(response.data.state ==1){
1167
+              var outInfo = response.data.data.outInfo
1168
+              this.manufacturerList = response.data.data.manufacturerList
1169
+              this.dealerList = response.data.data.dealerList
1170
+              this.drugTypeList = response.data.data.drugTypeList
1171
+              console.log("out_info",outInfo)
1172
+              const tempObj = {};
1173
+              this.patient_id = outInfo.patient_id
1174
+              this.warehouse_out_time = this.getTimeOne(outInfo.sys_record_time);
1175
+              this.warehouse_out_id  = outInfo.warehouse_out_id
1176
+              tempObj["id"] = outInfo.id;
1177
+              tempObj["drug_id"] = outInfo.drug_id;
1178
+              tempObj["max_unit"] = outInfo.count_unit;
1179
+              tempObj["min_unit"] = outInfo.min_unit, 
1180
+              tempObj["return_count"] = "";
1181
+              tempObj["price"] = "";
1182
+              tempObj["remark"] = outInfo.remark;
1183
+              tempObj["manufacturer"] = this.getManufacturer(outInfo.manufacturer)
1184
+              tempObj["batch_number"] = outInfo.batch_number;
1185
+              tempObj["drug_type"] = this.GetDrugTypeName(outInfo.drug.drug_type) 
1186
+              tempObj["dose"] = "";
1187
+              tempObj["dose_unit"] = "";
1188
+              tempObj["min_number"] = "";
1189
+              tempObj["dealer"] = this.getDealer(outInfo.dealer) 
1190
+              tempObj["number"] = "";
1191
+              tempObj["warehouse_info_id"] = outInfo.warehouse_info_id;
1192
+              tempObj["count"] = (outInfo.count).toString();
1193
+              tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name;
1194
+              tempObj["retail_price"] = 0;
1195
+              tempObj["last_price"] = "";
1196
+              tempObj["stock_count"] = "";
1197
+              tempObj["total_count"] = 0;
1198
+              tempObj["max_unit_fisrt"] = 0;
1199
+              tempObj["min_unit_fisrt"] = 0;
1200
+              tempObj["total_price"] = 0;
1201
+              tempObj["patient_id"] = outInfo.patient_id
1202
+              tempObj["product_date"] = this.getTimeOne(outInfo.product_date);
1203
+              tempObj["expiry_date"]=this.getTimeOne(outInfo.expiry_date)
1204
+              tempObj["class_type"] = ""
1205
+              tempObj["drug_name"] = outInfo.drug.drug_name
1206
+              tempObj["name"] = outInfo.drug.dose + outInfo.drug.dose_unit + "*" + outInfo.drug.min_number+outInfo.drug.min_unit +"/"+outInfo.drug.max_unit
1207
+              this.recordInfo.recordData = []
1208
+              this.recordInfo.recordData.push(tempObj);
1209
+          }
1169 1210
         })
1170
-      }
1211
+      },
1212
+
1213
+      getManufacturer(id) {
1214
+        var name = "";
1215
+        for (let i = 0; i < this.manufacturerList.length; i++) {
1216
+            if (id == this.manufacturerList[i].id) {
1217
+            name = this.manufacturerList[i].manufacturer_name;
1218
+            }
1219
+        }
1220
+        return name;
1221
+       },
1222
+        getDealer(id) {
1223
+            var name = "";
1224
+            for (let i = 0; i < this.dealerList.length; i++) {
1225
+                if (id == this.dealerList[i].id) {
1226
+                name = this.dealerList[i].dealer_name;
1227
+                }
1228
+            }
1229
+            return name;
1230
+       },
1231
+       GetDrugTypeName(drug_type){
1232
+            var name = ""
1233
+            for(let i=0;i<this.drugTypeList.length;i++){
1234
+            if(drug_type == this.drugTypeList[i].value){
1235
+                name = this.drugTypeList[i].name
1236
+            }
1237
+            }
1238
+            return name
1239
+      },
1171 1240
     
1172 1241
     
1173 1242
     },