Browse Source

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

陈少旭 2 months ago
parent
commit
28ae66d949
35 changed files with 3386 additions and 900 deletions
  1. 7 0
      src/api/doctor.js
  2. 1 1
      src/api/patient.js
  3. 11 0
      src/router/modules/dialysis.js
  4. 59 46
      src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue
  5. 6 0
      src/xt_pages/dialysis/batch_print/batch_print_order_eightyTwo.vue
  6. 51 70
      src/xt_pages/dialysis/batch_print/batch_print_order_sixty.vue
  7. 1 0
      src/xt_pages/dialysis/details/index.vue
  8. 1 0
      src/xt_pages/dialysis/details/indexs.vue
  9. 2 3
      src/xt_pages/dialysis/dialysisPrintOrder.vue
  10. 34 0
      src/xt_pages/dialysis/newDoctorAdvice.vue
  11. 578 0
      src/xt_pages/dialysis/nurseInspectionPrint.vue
  12. 43 30
      src/xt_pages/dialysis/template/DialysisPrintOrderSixty.vue
  13. 24 0
      src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue
  14. 70 45
      src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue
  15. 7 3
      src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue
  16. 5 5
      src/xt_pages/outpatientCharges/invoicePrint.vue
  17. 4 3
      src/xt_pages/outpatientCharges/invoiceTemplate/printthirteen.vue
  18. 73 36
      src/xt_pages/sign/lineUp.vue
  19. 4 3
      src/xt_pages/stock/drugs/components/expiryDateDrugQuery.vue
  20. 2 2
      src/xt_pages/stock/drugs/components/expiryDateDrugQueryPrint.vue
  21. 2 0
      src/xt_pages/stock/drugs/components/purchaseDrugQuery.vue
  22. 67 12
      src/xt_pages/stock/drugs/components/purchaseNewDrugQuery.vue
  23. 55 12
      src/xt_pages/stock/drugs/components/purchaseNewDrugQueryPrint.vue
  24. 32 10
      src/xt_pages/stock/query/purchaseNewStockQuery.vue
  25. 29 9
      src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue
  26. 67 20
      src/xt_pages/user/Informed/Informedconsent.vue
  27. 266 0
      src/xt_pages/user/Informed/components/Surrender_informed.vue
  28. 9 9
      src/xt_pages/user/components/PatientSidebar.vue
  29. 559 78
      src/xt_pages/user/courseOfDisease_new.vue
  30. 126 4
      src/xt_pages/user/inspection.vue
  31. 5 7
      src/xt_pages/user/physiqueprinting.vue
  32. 440 55
      src/xt_pages/user/sickHistory_new.vue
  33. 356 50
      src/xt_pages/user/text_content.vue
  34. 389 386
      src/xt_pages/workforce/remind_print_setting_one.vue
  35. 1 1
      src/xt_permission.js

+ 7 - 0
src/api/doctor.js View File

@@ -13,3 +13,10 @@ export function fetchAllAdminUsers() {
13 13
   })
14 14
 }
15 15
 
16
+
17
+export function fetchMoibleAllDoctorAndNurse(){
18
+  return request({
19
+    url:"/api/mobilealldoctors",
20
+    method:"Get",
21
+  })
22
+}

+ 1 - 1
src/api/patient.js View File

@@ -1282,7 +1282,7 @@ export function modifySickHistoryTemplate(data){
1282 1282
 export function deleteSickHistoryTempalte(id,params){
1283 1283
 
1284 1284
   return request({
1285
-    url:"/api/patient/deletesickhistorytemplate?id="+id,
1285
+    url:"/api/patient/deletesickhistorytemplate?template_id="+id,
1286 1286
     method:"get",
1287 1287
     params:params
1288 1288
   })

+ 11 - 0
src/router/modules/dialysis.js View File

@@ -131,6 +131,17 @@ export default {
131 131
         noCache: true
132 132
       }
133 133
     },
134
+    {
135
+      path: '/dialysis/nurseInspection/print',
136
+      component: () => import('@/xt_pages/dialysis/nurseInspectionPrint'),
137
+      name: '透析项目打印',
138
+      hidden: true,
139
+      is_menu: false,
140
+      meta: {
141
+        title: '透析项目打印',
142
+        noCache: true
143
+      }
144
+    },
134 145
 
135 146
     {
136 147
       path: '/dialysis/doctorAdviceStaticPrint',

+ 59 - 46
src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue View File

@@ -191,21 +191,32 @@
191 191
                         次/分
192 192
                       </div>
193 193
                       <div class="inline_block" style="flex: 1;">
194
-                        血压:
195
-                        <div class="under_line" style="width: 50px; text-align: center">
196
-                          {{
197
-                            record.assessment_before_dislysis.systolic_blood_pressure
198
-                              ? record.assessment_before_dislysis.systolic_blood_pressure
199
-                              : ""
200
-                          }}
194
+                        血压:       
195
+                        <div class="inline_block" v-if="record.assessment_before_dislysis.systolic_blood_pressure!='' && 
196
+                          record.assessment_before_dislysis.diastolic_blood_pressure !=''"
197
+                        >
198
+                          <div class="under_line" style="width: 50px; text-align: center">
199
+                              {{
200
+                                record.assessment_before_dislysis.systolic_blood_pressure
201
+                                  ? record.assessment_before_dislysis.systolic_blood_pressure
202
+                                  : ""
203
+                              }}
204
+                          </div>
205
+                          /
206
+                          <div class="under_line" style="width: 50px; text-align: center">
207
+                            {{
208
+                              record.assessment_before_dislysis.diastolic_blood_pressure
209
+                                ? record.assessment_before_dislysis.diastolic_blood_pressure
210
+                                : ""
211
+                            }}
212
+                          </div>
201 213
                         </div>
202
-                        /
203
-                        <div class="under_line" style="width: 50px; text-align: center">
204
-                          {{
205
-                            record.assessment_before_dislysis.diastolic_blood_pressure
206
-                              ? record.assessment_before_dislysis.diastolic_blood_pressure
207
-                              : ""
208
-                          }}
214
+                        <div class="inline_block" v-else>
215
+                          <div class="under_line" 
216
+                            style="width: 100px; text-align: center"
217
+                          >
218
+                            拒测血压
219
+                          </div>
209 220
                         </div>
210 221
                         mmHg
211 222
                       </div>
@@ -701,7 +712,6 @@
701 712
                     </table>
702 713
                   </td>
703 714
                 </tr>
704
-
705 715
                 <tr>
706 716
                   <td style="padding: 0; position: relative" colspan="2">
707 717
                     <table class="inside_table">
@@ -1033,38 +1043,38 @@
1033 1043
                       </div>
1034 1044
                       <div class="inline_block" style="flex: 1">
1035 1045
                         血压:
1036
-                        <div class="under_line"
1037
-                          style="width: 50px; text-align: center"
1046
+                        <div class="inline_block" v-if="record.assessment_after_dislysis.systolic_blood_pressure!='' && 
1047
+                          record.assessment_after_dislysis.diastolic_blood_pressure !=''"
1038 1048
                         >
1039
-                          <!-- {{
1040
-                            record.assessment_after_dislysis.systolic_blood_pressure
1041
-                              ? record.assessment_after_dislysis.systolic_blood_pressure
1042
-                              : "/"
1043
-                          }} -->
1044
-                          <span v-if="record.monitor_records.length>0">
1049
+                          <div class="under_line" style="width: 50px; text-align: center">
1050
+                              {{
1051
+                                record.assessment_after_dislysis.systolic_blood_pressure
1052
+                                  ? record.assessment_after_dislysis.systolic_blood_pressure
1053
+                                  : ""
1054
+                              }}
1055
+                              <!-- <span v-if="record.monitor_records.length>0">
1056
+                                {{
1057
+                                  record.monitor_records[record.monitor_records.length-1].systolic_blood_pressure ?
1058
+                                  record.monitor_records[record.monitor_records.length-1].systolic_blood_pressure :''
1059
+                                }}
1060
+                              </span>
1061
+                              <span v-else></span> -->
1062
+                          </div>
1063
+                          /
1064
+                          <div class="under_line" style="width: 50px; text-align: center">
1045 1065
                             {{
1046
-                              record.monitor_records[record.monitor_records.length-1].systolic_blood_pressure ?
1047
-                              record.monitor_records[record.monitor_records.length-1].systolic_blood_pressure :''
1066
+                              record.assessment_after_dislysis.diastolic_blood_pressure
1067
+                                ? record.assessment_after_dislysis.diastolic_blood_pressure
1068
+                                : ""
1048 1069
                             }}
1049
-                          </span>
1050
-                          <span v-else></span>
1070
+                          </div>
1051 1071
                         </div>
1052
-                        /
1053
-                        <div class="under_line"
1054
-                          style="width: 50px; text-align: center"
1055
-                        >
1056
-                          <!-- {{
1057
-                             record.assessment_after_dislysis.diastolic_blood_pressure
1058
-                              ?  record.assessment_after_dislysis.diastolic_blood_pressure
1059
-                              : "/"
1060
-                          }} -->
1061
-                          <span v-if="record.monitor_records.length>0">
1062
-                            {{
1063
-                              record.monitor_records[record.monitor_records.length-1].diastolic_blood_pressure ?
1064
-                              record.monitor_records[record.monitor_records.length-1].diastolic_blood_pressure : ''
1065
-                            }}
1066
-                          </span>
1067
-                          <span v-else></span>
1072
+                        <div class="inline_block" v-else>
1073
+                          <div class="under_line" 
1074
+                            style="width: 100px; text-align: center"
1075
+                          >
1076
+                            拒测血压
1077
+                          </div>
1068 1078
                         </div>
1069 1079
                         mmHg
1070 1080
                       </div>
@@ -1193,12 +1203,15 @@
1193 1203
                         <div class="under_line"
1194 1204
                           style="width: 70px; text-align: center"
1195 1205
                         >
1196
-                          <span v-if="record.monitor_records !='' && record.monitor_records[record.monitor_records.length - 1].ultrafiltration_volume !=''">
1206
+                          <!-- <span v-if="record.monitor_records !='' && record.monitor_records[record.monitor_records.length - 1].ultrafiltration_volume !=''">
1197 1207
                             {{ (record.monitor_records[record.monitor_records.length - 1].ultrafiltration_volume/1000).toFixed(1) }}
1208
+                          </span> -->
1209
+                          <span v-if="record.assessment_after_dislysis.actual_ultrafiltration !=''">
1210
+                            {{ record.assessment_after_dislysis.actual_ultrafiltration>100
1211
+                              ? (record.assessment_after_dislysis.actual_ultrafiltration/1000).toFixed(1) : record.assessment_after_dislysis.actual_ultrafiltration }}
1198 1212
                           </span>
1199 1213
                           <span v-else>
1200
-                            {{ record.assessment_after_dislysis.actual_ultrafiltration
1201
-                              ? record.assessment_after_dislysis.actual_ultrafiltration : '' }}
1214
+
1202 1215
                           </span>
1203 1216
                           <!-- {{
1204 1217
                             record.assessment_after_dislysis.actual_ultrafiltration

+ 6 - 0
src/xt_pages/dialysis/batch_print/batch_print_order_eightyTwo.vue View File

@@ -273,6 +273,12 @@
273 273
               <span v-if="record.assessment_before_dislysis.is_hemorrhage != 2 && record.assessment_before_dislysis.is_hemorrhage != 1">/</span>
274 274
             </div>
275 275
           </div>
276
+          <div class="row">
277
+            备注
278
+            <div class="inline_block under_line" style="width:90%;text-align: center;white-space: normal;">
279
+              {{ record.prescription.remark ? record.prescription.remark : '/'}}
280
+            </div>
281
+          </div>
276 282
           <div class="row">
277 283
             上机医生
278 284
             <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">

+ 51 - 70
src/xt_pages/dialysis/batch_print/batch_print_order_sixty.vue View File

@@ -372,7 +372,7 @@
372 372
                       class="row"
373 373
                       style="padding: 2px 0; line-height: 23px; display: flex"
374 374
                     >
375
-                      <div class="inline_block">
375
+                      <div class="inline_block" style="flex: 1;">
376 376
                         血管通路:
377 377
                         <div
378 378
                           class="under_line"
@@ -401,7 +401,7 @@
401 401
                         内瘘:
402 402
                         <div
403 403
                           class="under_line"
404
-                          style="width: 120px; text-align: center"
404
+                          style="width: 80%; text-align: center"
405 405
                         >
406 406
                           {{
407 407
                             record.assessment_before_dislysis &&
@@ -415,12 +415,12 @@
415 415
 
416 416
                       <div
417 417
                         class="inline_block"
418
-                        style="margin-left: 10px; flex: 1"
418
+                        style="flex: 1"
419 419
                       >
420 420
                         导管:
421 421
                         <div
422 422
                           class="under_line"
423
-                          style="width: 120px; text-align: center"
423
+                          style="width: 80%; text-align: center"
424 424
                         >
425 425
                           {{
426 426
                             record.assessment_before_dislysis &&
@@ -1041,33 +1041,7 @@
1041 1041
                           class="under_line"
1042 1042
                           style="width: 150px; text-align: center"
1043 1043
                         >
1044
-                          <span v-if="record.prescription.anticoagulant == 0"
1045
-                            >&nbsp;/</span
1046
-                          >
1047
-                          <span v-if="record.prescription.anticoagulant == 1"
1048
-                            >&nbsp;无肝素</span
1049
-                          >
1050
-                          <span v-if="record.prescription.anticoagulant == 2"
1051
-                            >&nbsp;普通肝素</span
1052
-                          >
1053
-                          <span v-if="record.prescription.anticoagulant == 3"
1054
-                            >&nbsp;低分子肝素</span
1055
-                          >
1056
-                          <span v-if="record.prescription.anticoagulant == 4"
1057
-                            >&nbsp;阿加曲班</span
1058
-                          >
1059
-                          <span v-if="record.prescription.anticoagulant == 5"
1060
-                            >&nbsp;枸橼酸钠</span
1061
-                          >
1062
-                          <span v-if="record.prescription.anticoagulant == 6"
1063
-                            >&nbsp;低分子肝素钙</span
1064
-                          >
1065
-                          <span v-if="record.prescription.anticoagulant == 7"
1066
-                            >&nbsp;低分子肝素钠</span
1067
-                          >
1068
-                          <span v-if="record.prescription.anticoagulant == 8"
1069
-                            >&nbsp;依诺肝素</span
1070
-                          >
1044
+                          {{ getvalue(record.prescription.anticoagulant) }}
1071 1045
                         </div>
1072 1046
                       </div>
1073 1047
                       <div class="inline_block" style="margin-left: 20px">
@@ -1083,18 +1057,8 @@
1083 1057
                               : "/"
1084 1058
                           }}
1085 1059
                         </div>
1086
-                        <span v-if="record.prescription.anticoagulant == 4"
1087
-                          >mg</span
1088
-                        >
1089
-                        <span v-if="record.prescription.anticoagulant == 3"
1090
-                          >iu</span
1091
-                        >
1092
-                        <span v-if="record.prescription.anticoagulant == 2"
1093
-                          >iu</span
1094
-                        >
1095
-                        <span v-if="record.prescription.anticoagulant == 1"
1096
-                          >mg</span
1097
-                        >
1060
+                        {{ getshouji(record.prescription.anticoagulant) }}
1061
+                       
1098 1062
                       </div>
1099 1063
                       <div class="inline_block" style="margin-left: 20px">
1100 1064
                         维持:
@@ -1128,21 +1092,8 @@
1128 1092
                               : 0
1129 1093
                           }}
1130 1094
                         </div>
1131
-                        <span v-if="record.prescription.anticoagulant == 5"
1132
-                          >ml/h</span
1133
-                        >
1134
-                        <span v-if="record.prescription.anticoagulant == 4"
1135
-                          >mg/h</span
1136
-                        >
1137
-                        <span v-if="record.prescription.anticoagulant == 3"
1138
-                          >iu/h</span
1139
-                        >
1140
-                        <span v-if="record.prescription.anticoagulant == 2"
1141
-                          >iu/h</span
1142
-                        >
1143
-                        <span v-if="record.prescription.anticoagulant == 1"
1144
-                          >mg/h</span
1145
-                        >
1095
+                        {{ getweichi(record.prescription.anticoagulant) }}
1096
+                      
1146 1097
                       </div>
1147 1098
                       <div class="inline_block" style="margin-left: 20px">
1148 1099
                         总量:
@@ -1157,18 +1108,8 @@
1157 1108
                               : "/"
1158 1109
                           }}
1159 1110
                         </div>
1160
-                        <span v-if="record.prescription.anticoagulant == 4"
1161
-                          >mg</span
1162
-                        >
1163
-                        <span v-if="record.prescription.anticoagulant == 3"
1164
-                          >iu</span
1165
-                        >
1166
-                        <span v-if="record.prescription.anticoagulant == 2"
1167
-                          >iu</span
1168
-                        >
1169
-                        <span v-if="record.prescription.anticoagulant == 1"
1170
-                          >mg</span
1171
-                        >
1111
+                        {{ getzongliang(record.prescription.anticoagulant) }}
1112
+                        
1172 1113
                       </div>
1173 1114
                     </div>
1174 1115
                     <div
@@ -3063,6 +3004,46 @@ export default {
3063 3004
     getNumber: function (record) {
3064 3005
       console.log(record);
3065 3006
     },
3007
+    getvalue(id){
3008
+      const options = this.anticoagulantsConfit
3009
+      if(id!=0){
3010
+        for(let i in options){
3011
+          if(options[i].id == id){
3012
+            return options[i].name
3013
+          }
3014
+        }
3015
+      }
3016
+    },
3017
+    getshouji(id){
3018
+      const options = this.anticoagulantsConfit
3019
+      if(id!=0){
3020
+        for(let i in options){
3021
+          if(options[i].id == id){
3022
+            return options[i].shouji_unit
3023
+          }
3024
+        }
3025
+      }
3026
+    },
3027
+    getweichi(id){
3028
+      const options = this.anticoagulantsConfit
3029
+      if(id!=0){
3030
+        for(let i in options){
3031
+          if(options[i].id == id){
3032
+            return options[i].weichi_unit
3033
+          }
3034
+        }
3035
+      }
3036
+    },
3037
+    getzongliang(id){
3038
+      const options = this.anticoagulantsConfit
3039
+      if(id!=0){
3040
+        for(let i in options){
3041
+          if(options[i].id == id){
3042
+            return options[i].zongliang_unit
3043
+          }
3044
+        }
3045
+      }
3046
+    }
3066 3047
   },
3067 3048
 };
3068 3049
 </script>

+ 1 - 0
src/xt_pages/dialysis/details/index.vue View File

@@ -3069,6 +3069,7 @@ export default {
3069 3069
        var params = {
3070 3070
          patient_id:this.$route.query.patient_id,
3071 3071
          record_date:this.$route.query.date,
3072
+         mode_id:this.$route.query.mode_id,
3072 3073
        }
3073 3074
       getInitPrintData(params).then(response=>{
3074 3075
         if(response.data.state == 1){

+ 1 - 0
src/xt_pages/dialysis/details/indexs.vue View File

@@ -1912,6 +1912,7 @@ export default {
1912 1912
        var params = {
1913 1913
          patient_id:this.$route.query.patient_id,
1914 1914
          record_date:this.$route.query.date,
1915
+         mode_id:this.$route.query.mode_id,
1915 1916
        }
1916 1917
       getInitPrintData(params).then(response=>{
1917 1918
         if(response.data.state == 1){

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

@@ -1934,7 +1934,6 @@ export default {
1934 1934
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:16px;border-color: #000;}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #000;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}.row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line {display: inline-block;border-bottom: 1px solid #000;text-align: center;white-space: nowrap; width: 50%;}';
1935 1935
       // const style3 =
1936 1936
       //   '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 5px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 16px;padding: 5px 5px;line-height: 18px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:950px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top:1050px;left: 50%;}.print-yema5{position: absolute;top:1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}';
1937
-      //
1938 1937
       const style4 =
1939 1938
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:18px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:18px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:18px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:20px;height:20px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:23px;font-weight: 200;}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
1940 1939
       const style5 =
@@ -2701,12 +2700,12 @@ export default {
2701 2700
           this.patient_id = response.data.data.patientInfo.DialysisSchedule.patient_id
2702 2701
           this.patient_name = response.data.data.patientInfo.name
2703 2702
 
2704
-          // if(this.org_id !=10206 ){//&& this.org_id !=0
2703
+          // if(this.org_id !=0){//&& this.org_id !=0
2705 2704
             this.org_template_info.template_id= response.data.data.org_template_info.template_id
2706 2705
             this.org_template_info = response.data.data.org_template_info;
2707 2706
           // }else{
2708 2707
           //   this.org_template_info = response.data.data.org_template_info;
2709
-          //   this.org_template_info.template_id= 82
2708
+          //   this.org_template_info.template_id= 68
2710 2709
           // }
2711 2710
 
2712 2711
 

+ 34 - 0
src/xt_pages/dialysis/newDoctorAdvice.vue View File

@@ -29,6 +29,15 @@
29 29
           type="primary"
30 30
           >项目打印
31 31
       </el-button>
32
+
33
+      <el-button
34
+          size="small"
35
+          icon="el-icon-printer"
36
+          :disabled="selecting_schs.length == 0"
37
+          @click="batchPrintActionFive"
38
+          type="primary"
39
+          >化验打印
40
+      </el-button>
32 41
     </div>
33 42
     </div>
34 43
     <div class="app-container">
@@ -1596,6 +1605,31 @@ export default {
1596 1605
        }
1597 1606
        this.$router.push({ path: "/dialysis/doctocInspection/print",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way,schedulType:this.schedulType,partitionType:this.partitionType} });
1598 1607
     },
1608
+    batchPrintActionFive:function(){
1609
+      console.log("处方哈回复奥回复的话啊哈地方h")
1610
+      if(this.selecting_schs.length === 0) {
1611
+        this.$message.error("请至少选择一条需要打印的内容");
1612
+        return false;
1613
+      }
1614
+      // 模板ID为6
1615
+      var sch_ids = [];
1616
+
1617
+      for (let index = 0; index < this.selecting_schs.length; index++) {
1618
+        sch_ids.push(this.selecting_schs[index].patient_id);
1619
+      }
1620
+
1621
+      this.$store.dispatch("SetAdviceIDs", sch_ids);
1622
+       var name = ""
1623
+        for(let i=0;i<this.deliveryWay.length;i++){
1624
+            if(this.delivery_way == this.deliveryWay[i].id){
1625
+              name = this.deliveryWay[i].name
1626
+            }
1627
+        }
1628
+        if(name == '全部'){
1629
+          name = ""
1630
+       }
1631
+       this.$router.push({ path: "/dialysis/nurseInspection/print",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way,schedulType:this.schedulType,partitionType:this.partitionType} });
1632
+    },
1599 1633
     signPrintAction:function(){
1600 1634
       if (this.selecting_schs.length === 0) {
1601 1635
         this.$message.error("请至少选择一条需要打印的内容");

+ 578 - 0
src/xt_pages/dialysis/nurseInspectionPrint.vue View File

@@ -0,0 +1,578 @@
1
+package dialysis
2
+<template>
3
+    <div class="main-contain">
4
+        <div class="position">
5
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
6
+        <el-row style="float:right;">
7
+            <el-col :span="24">
8
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
9
+            </el-col>
10
+        </el-row>
11
+        </div>
12
+        <div class="app-container" style="background-color: white;">
13
+            <div id="dialysisTable">
14
+                <div class="order_title_panl">
15
+                    <span class="main_title">化验项目</span>
16
+                </div>
17
+                <p style="width: 960px;text-align: right;margin: 0 auto 10px;">日期:{{ time }}</p>
18
+                <table class="table dialysisTable" border="1" cellspacing="0" cellpadding="0">
19
+                    <tr>
20
+                    <th width="40px">姓名</th>
21
+                   
22
+                    <th width="40px">床位号</th>
23
+                 
24
+                    <th width="50px">开始时间</th>
25
+                    <th width="200px">医嘱内容</th>
26
+                    <th width="50px">执行时间</th>
27
+                    <th width="50px">执行护士</th>
28
+                    <th width="50px">校对护士</th>
29
+                    <th width="50px">校对时间</th>
30
+                    <th width="50px">开嘱医生</th>
31
+                    <th width="50px">开嘱时间</th>
32
+                    </tr>
33
+                    <template v-for="(schedules, zone_name, index) in scheduleMap">
34
+                    <tr >
35
+                        <td>{{ zone_name }}</td>
36
+                        <td></td>
37
+                        <td></td>
38
+                        <td></td>
39
+                        <td></td>
40
+                        <td></td>
41
+                        <td></td>
42
+                        <td></td>
43
+                        <td></td>
44
+                        <td></td>
45
+                    </tr>
46
+                    <template v-for="schedule in schedules">
47
+                        <template v-for="(group, group_index) in schedule.new_advice">
48
+                        <tr v-for="(advice, advice_index) in group.advices" :key="advice_index">
49
+                            <td
50
+                            v-if="advice_index == 0"
51
+                            :rowspan="group.advices.length"
52
+                            >{{ advice.parent_id == 0 ? schedule.patient.name : "" }}
53
+                            <br>
54
+                            ({{ advice.parent_id == 0 ? schedule.dialysis_no : ""}})
55
+                            <br>
56
+                            <span v-if="schedule.mode_id == 1">(HD)</span>
57
+                            <span v-if="schedule.mode_id == 2">(HDF)</span>
58
+                            <span v-if="schedule.mode_id == 3">(HD+HP)</span>
59
+                            <span v-if="schedule.mode_id == 4">(HP)</span>
60
+                            <span v-if="schedule.mode_id == 5">(HF)</span>
61
+                            <span v-if="schedule.mode_id == 6">(SCUF)</span>
62
+                            <span v-if="schedule.mode_id == 7">(IUF)</span>
63
+                            <span v-if="schedule.mode_id == 8">(HFHD)</span>
64
+                            <span v-if="schedule.mode_id == 9">(HFHD+HP)</span>
65
+                            <span v-if="schedule.mode_id == 10">(PHF)</span>
66
+                            <span v-if="schedule.mode_id == 11">(HFR)</span>
67
+                            <span v-if="schedule.mode_id == 12">(HDF+HP)</span>
68
+                            <span v-if="schedule.mode_id == 13">(CRRT)</span>
69
+                            <span v-if="schedule.mode_id == 14">(腹水回输)</span>
70
+                            <span v-if="schedule.mode_id == 24">I-HDF</span>
71
+                            </td>
72
+                           
73
+                        
74
+                            <td>
75
+                                {{ schedule.device_number.number }}
76
+                            </td>
77
+                           
78
+                            <td v-if="advice_index == 0" :rowspan="group.advices.length">
79
+                            {{
80
+                            advice.parent_id == 0
81
+                            ? parseTime(advice.start_time, "{m}-{d} {h}:{i}")
82
+                            : ""
83
+                            }}
84
+                            </td>
85
+                            <td
86
+                            :class="
87
+                                advice.parent_id == 0
88
+                                ? 'advice_content'
89
+                                : 'subadvice_content'
90
+                            "
91
+                            >
92
+                            <span>{{ advice.advice_name }}</span>
93
+                            <span>{{ advice.advice_desc }}{{ advice.drug_spec_unit }}</span>
94
+                            <span v-if="advice.prescribing_number">
95
+                                {{ advice.prescribing_number
96
+                                }}{{ advice.prescribing_number_unit }}
97
+                            </span>
98
+                            <span v-if="advice.single_dose">
99
+                                单次用量 {{ advice.single_dose
100
+                                }}{{ advice.single_dose_unit }}
101
+                            </span>
102
+                            <span>{{ advice.delivery_way }}</span>
103
+                            <span>{{ advice.execution_frequency }}</span>
104
+                            <span
105
+                                v-if="advice.parent_id == 0 && advice.remark.length > 0"
106
+                            >({{ advice.remark }})</span>
107
+                            </td>
108
+                            <td>{{ parseTime(advice.execution_time, "{m}-{d} {h}:{i}") }}</td>
109
+                            <td>{{ getName(advice.execution_staff) }}</td>
110
+                            <td>{{ getName(advice.checker) }}</td>
111
+                            <td>{{ parseTime(advice.check_time, "{m}-{d} {h}:{i}") }}</td>
112
+                            <td>{{ getName(advice.advice_doctor) }}</td>
113
+                            <td>{{ parseTime(advice.start_time, "{m}-{d} {h}:{i}") }}</td>
114
+                        </tr>
115
+                        </template>
116
+                     </template>
117
+                    </template>
118
+                </table>
119
+            </div>
120
+        </div>
121
+
122
+        
123
+    </div>
124
+</template>
125
+
126
+<script>
127
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
128
+import { getSchedualDoctors } from '@/api/advice'
129
+import { parseTime } from '@/utils'
130
+import print from 'print-js'
131
+const moment = require('moment')
132
+export default {
133
+    components:{
134
+        BreadCrumb
135
+    },
136
+    data(){
137
+        return{
138
+            crumbs: [
139
+                { path: false, name: '耗材药品' },
140
+                { path: false, name: '打印' }
141
+            ],
142
+            tableData:[],
143
+            start_time:"",
144
+            end_time:"",
145
+            print_time:moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
146
+
147
+            zone_selected: 0,
148
+            scheduleMap:[],
149
+            time:'',
150
+            show:true,
151
+            showOne:false,
152
+            delivery_way:"",
153
+            org_id:0,
154
+        }
155
+    },
156
+    methods:{
157
+        printAction: function() {
158
+            const style = '@media print { .dialysisTable{width:960px;margin: 0 auto;text-align: center;border-collapse: collapse;}.order_title_panl {text-align: center;.main_title {font-size: 18px;line-height: 40px;font-weight: 500;}}.dialysisTable tr{padding: 5px 0;}.dialysisTable th {color: #000;padding: 0;margin: 0;height: 30px;}.dialysisTable tr td {padding: 0px 0;}.subadvice_content {text-align: left;padding-left: 25px !important;padding-right: 5px !important;}.advice_content {text-align: left;padding-left: 5px !important;padding-right: 5px !important;padding: 5px 5px !important;} }'
159
+
160
+            printJS({
161
+            printable: 'dialysisTable',
162
+            type: 'html',
163
+            documentTitle: '  ',
164
+            style: style,
165
+            scanStyles: false
166
+            })
167
+        },
168
+        requestSchedualDoctors (time) {
169
+            let newTime =  moment(time).format('YYYY-MM-DD')
170
+            getSchedualDoctors({
171
+            date: newTime,
172
+            patient_type: 0,
173
+            advice_type: 2,
174
+            delivery_way:this.delivery_way,
175
+            excution_way:this.$route.query.excution_way,
176
+            }).then(rs => {
177
+                var resp = rs.data
178
+                if (resp.state == 1) {
179
+                this.admin_user = resp.data.adminUser
180
+                var config = resp.data.config
181
+                let project_config = resp.data.project_config
182
+                
183
+                if(project_config.is_open == 1){
184
+                    this.project = resp.data.project
185
+                    console.log("this.project--------------",this.project)
186
+                    resp.data.hisAdvices.map((item,index) => {
187
+                     item.doctor_advice = []
188
+                    item.new_advice = item.new_advice ? item.new_advice : []
189
+                     
190
+                    if(this.project[index].project.length > 0){
191
+                        this.project[index].project.map(it => {
192
+                        let obj = {
193
+                            advice_doctor: it.doctor,
194
+                            start_time:it.start_time,
195
+                            advice_name: it.type == 2 ? it.project.project_name : it.good_info.good_name,
196
+                            cost_classify:it.type == 2? it.project.cost_classify:"100",
197
+                            execution_time:it.execution_time,
198
+                            execution_state:it.execution_state,
199
+                            execution_staff:it.execution_staff,
200
+                            check_time:it.check_time,
201
+                            check_state:it.check_state,
202
+                            checker:it.checker,
203
+                            created_time:it.ctime,
204
+                            remark:'',
205
+                            id:it.id,
206
+                            parent_id:0,
207
+                            groupno:0,
208
+                            advice_type:6,
209
+
210
+                        }
211
+                        console.log("cost_classify-------",obj)
212
+                        if(obj.cost_classify == 3){
213
+                         item.doctor_advice.push(obj)
214
+                        }
215
+  
216
+                        
217
+                        })
218
+                    }
219
+                    
220
+                   })
221
+                }
222
+
223
+                if(config.is_open == 1){
224
+                   var schedulesArr = resp.data.hisAdvices
225
+                   let schedules = []
226
+                   var ids = this.$store.getters.temp_params.advice_ids
227
+                   console.log('ids',ids)
228
+                   schedulesArr.map(item => {
229
+                    if(ids.indexOf(item.patient_id) > -1){
230
+                        schedules.push(item)
231
+                    }
232
+
233
+                })
234
+
235
+                for (let i = 0; i < schedules.length; i++) {
236
+                    schedules[i].dialysis_no = schedules[i].patient.dialysis_no
237
+                }
238
+
239
+
240
+                var arr = []
241
+                for (let j = 0; j < schedules.length; j++) {
242
+                    arr.push(schedules[j].dialysis_no)
243
+                }
244
+                arr.sort(function (a, b) {
245
+                    return a - b
246
+                })
247
+
248
+
249
+                var arrTwo = []
250
+                for (let i = 0; i < arr.length; i++) {
251
+                    for (let j = 0; j < schedules.length; j++) {
252
+                    if (arr[i] == schedules[j].dialysis_no) {
253
+                        arrTwo.push(schedules[j])
254
+                    }
255
+                    }
256
+                }
257
+
258
+                arrTwo.map((item, index) => {
259
+
260
+                    item.doctor_advice.sort(this.compare('start_time'))
261
+                })
262
+
263
+
264
+                const res = new Map()
265
+                let a = arrTwo.filter(
266
+                    a => !res.has(a.dialysis_no) && res.set(a.dialysis_no, 1)
267
+                )
268
+
269
+
270
+
271
+                schedules = a
272
+                var zoneMap = {}
273
+                var scheduleMap = {}
274
+                for (let index = 0; index < schedules.length; index++) {
275
+                    const schedule = schedules[index]
276
+                    if (schedule.doctor_advice.length == 0) {
277
+                    continue
278
+                    }
279
+                    if (scheduleMap[schedule.device_number.zone.name] == null) {
280
+                    scheduleMap[schedule.device_number.zone.name] = []
281
+                    }
282
+                    scheduleMap[schedule.device_number.zone.name].push(schedule)
283
+                    if (zoneMap[schedule.device_number.zone.name] == null) {
284
+                    zoneMap[schedule.device_number.zone.name] =
285
+                        schedule.device_number.zone
286
+                    }
287
+                }
288
+
289
+                var zones = []
290
+                zones.push({ value: 0, text: '全部分区' })
291
+                for (var zoneName in zoneMap) {
292
+                    zones.push({ value: zoneMap[zoneName].id, text: zoneName })
293
+                }
294
+
295
+                zones = zones.sort(function (a, b) {
296
+                    return a.value > b.value
297
+                })
298
+                this.zones = zones
299
+                for (var key in scheduleMap) {
300
+                    let mapArr = scheduleMap[key]
301
+                    for (let i = 0; i < mapArr.length; i++) {
302
+                    mapArr[i]['new_advice'] = []
303
+                    }
304
+                }
305
+
306
+                for (var key in scheduleMap) {
307
+                    let mapArr = scheduleMap[key]
308
+                    for (let i = 0; i < mapArr.length; i++) {
309
+                    var maps = mapArr[i]
310
+                    var resp_advices = maps.doctor_advice
311
+                    if (resp_advices.length > 0) {
312
+                        var newGroupObject = function () {
313
+                        return Object.assign(
314
+                            {},
315
+                            {
316
+                            group_no: 0,
317
+                            advices: []
318
+                            }
319
+                        )
320
+                        }
321
+                        var initGroupBlock = function (group, advice) {
322
+                        group.group_no = advice.groupno
323
+                        }
324
+
325
+                        var advice_groups = []
326
+                        var group = newGroupObject()
327
+                        for (let index = 0; index < resp_advices.length; index++) {
328
+                        const advice = resp_advices[index]
329
+                        if (advice.groupno == 0) {
330
+                            // 老版本的医嘱
331
+                            if (advice.parent_id > 0) {
332
+                            if (advice_groups.length > 0) {
333
+                                var parent_group = advice_groups[advice_groups.length - 1]
334
+                                if (parent_group.advices.length > 0) {
335
+                                if (parent_group.advices[0].id == advice.parent_id) {
336
+                                    parent_group.advices.push(advice)
337
+                                }
338
+                                }
339
+                            }
340
+                            continue
341
+                            } else {
342
+                            if (group.group_no > 0) {
343
+                                advice_groups.push(group)
344
+                                group = newGroupObject()
345
+                            }
346
+
347
+                            initGroupBlock(group, advice)
348
+                            group.advices.push(advice)
349
+                            advice_groups.push(group)
350
+                            group = newGroupObject()
351
+                            continue
352
+                            }
353
+                        } else {
354
+                            if (group.group_no > 0 && group.group_no != advice.groupno) {
355
+                            advice_groups.push(group)
356
+                            group = newGroupObject()
357
+                            }
358
+                            if (group.group_no == 0) {
359
+                            initGroupBlock(group, advice)
360
+                            }
361
+                            if (group.group_no == advice.groupno) {
362
+                            group.advices.push(advice)
363
+                            }
364
+                        }
365
+                        }
366
+                        if (group.group_no > 0) {
367
+                        // 上述的算法会导致最后一组没有加到advice_groups,这里要手动加
368
+                        advice_groups.push(group)
369
+                        }
370
+                        advice_groups = advice_groups
371
+                    } else {
372
+                        advice_groups = []
373
+                    }
374
+                    
375
+                    maps.new_advice = advice_groups
376
+                    }
377
+                 }
378
+
379
+                    this.scheduleMap = scheduleMap
380
+
381
+                   
382
+                 
383
+                 }
384
+                
385
+              
386
+
387
+                
388
+ 
389
+
390
+                }
391
+            })
392
+        },
393
+        compare (property) {
394
+            return function (a, b) {
395
+                var value1 = a[property]
396
+                var value2 = b[property]
397
+                return value1 - value2
398
+            }
399
+        },
400
+        parseTime: function (time, layout) {
401
+            if (time == 0) {
402
+                return ''
403
+            }
404
+            return parseTime(time, layout)
405
+        },
406
+        getName (val) {
407
+            for (let i = 0; i < this.admin_user.length; i++) {
408
+                if (this.admin_user[i].id == val) {
409
+                    return this.admin_user[i].name
410
+                }
411
+            }
412
+        },
413
+    },
414
+    computed: {
415
+      filtedScheduals: function () {
416
+        var scheduleMap = new Object()
417
+        if (this.zone_selected == 0) {
418
+            for (const key in this.scheduleMap) {
419
+            scheduleMap[key] = this.scheduleMap[key]
420
+            }
421
+        } else {
422
+            var zone_name = this.zones[this.zone_selected].text
423
+            scheduleMap[zone_name] = this.scheduleMap[zone_name]
424
+        }
425
+
426
+        if (this.schedule_type_selected != 0) {
427
+            var _scheduleMap = {}
428
+            for (const key in scheduleMap) {
429
+            var origin_schedules = scheduleMap[key]
430
+            var schedules = []
431
+            for (let index = 0; index < origin_schedules.length; index++) {
432
+                const schedule = origin_schedules[index]
433
+                if (schedule.schedule_type == this.schedule_type_selected) {
434
+                schedules.push(schedule)
435
+                }
436
+            }
437
+            if (schedules.length > 0) {
438
+                _scheduleMap[key] = schedules
439
+            }
440
+            }
441
+
442
+            scheduleMap = _scheduleMap
443
+        }
444
+        for (var key in scheduleMap) {
445
+            let mapArr = scheduleMap[key]
446
+            for (let i = 0; i < mapArr.length; i++) {
447
+            mapArr[i]['new_advice'] = []
448
+            }
449
+        }
450
+
451
+        for (var key in scheduleMap) {
452
+            let mapArr = scheduleMap[key]
453
+            for (let i = 0; i < mapArr.length; i++) {
454
+            var maps = mapArr[i]
455
+            var resp_advices = maps.doctor_advice
456
+            if (resp_advices.length > 0) {
457
+                var newGroupObject = function () {
458
+                return Object.assign(
459
+                    {},
460
+                    {
461
+                    group_no: 0,
462
+                    advices: []
463
+                    }
464
+                )
465
+                }
466
+                var initGroupBlock = function (group, advice) {
467
+                group.group_no = advice.groupno
468
+                }
469
+
470
+                var advice_groups = []
471
+                var group = newGroupObject()
472
+                for (let index = 0; index < resp_advices.length; index++) {
473
+                const advice = resp_advices[index]
474
+                if (advice.groupno == 0) {
475
+                    // 老版本的医嘱
476
+                    if (advice.parent_id > 0) {
477
+                    if (advice_groups.length > 0) {
478
+                        var parent_group = advice_groups[advice_groups.length - 1]
479
+                        if (parent_group.advices.length > 0) {
480
+                        if (parent_group.advices[0].id == advice.parent_id) {
481
+                            parent_group.advices.push(advice)
482
+                        }
483
+                        }
484
+                    }
485
+                    continue
486
+                    } else {
487
+                    if (group.group_no > 0) {
488
+                        advice_groups.push(group)
489
+                        group = newGroupObject()
490
+                    }
491
+
492
+                    initGroupBlock(group, advice)
493
+                    group.advices.push(advice)
494
+                    advice_groups.push(group)
495
+                    group = newGroupObject()
496
+                    continue
497
+                    }
498
+                } else {
499
+                    if (group.group_no > 0 && group.group_no != advice.groupno) {
500
+                    advice_groups.push(group)
501
+                    group = newGroupObject()
502
+                    }
503
+                    if (group.group_no == 0) {
504
+                    initGroupBlock(group, advice)
505
+                    }
506
+                    if (group.group_no == advice.groupno) {
507
+                    group.advices.push(advice)
508
+                    }
509
+                }
510
+                }
511
+                if (group.group_no > 0) {
512
+                // 上述的算法会导致最后一组没有加到advice_groups,这里要手动加
513
+                advice_groups.push(group)
514
+                }
515
+                advice_groups = advice_groups
516
+            } else {
517
+                advice_groups = []
518
+            }
519
+            maps.new_advice = advice_groups
520
+            }
521
+        }
522
+        console.log("222222",scheduleMap)
523
+        return scheduleMap
524
+        }
525
+    },
526
+    created(){
527
+      var time = this.$route.query.time
528
+      var delivery_way = this.$route.query.delivery_way
529
+      this.delivery_way = delivery_way
530
+      this.time = moment(time).format('YYYY-MM-DD')
531
+      console.log(11,this.$route.query)
532
+      this.requestSchedualDoctors(time)
533
+      this.org_id = this.$store.getters.xt_user.template_info.org_id;
534
+    }
535
+}
536
+</script>
537
+
538
+
539
+<style rel="stylesheet/scss" lang="scss" scoped>
540
+.dialysisTable{
541
+    width:960px;
542
+    margin: 0 auto;
543
+    text-align: center;
544
+    border-collapse: collapse;
545
+}
546
+.order_title_panl {
547
+    text-align: center;
548
+
549
+    .main_title {
550
+      font-size: 18px;
551
+      line-height: 40px;
552
+      font-weight: 500;
553
+    }
554
+}
555
+.dialysisTable tr{
556
+    padding: 10px 0;
557
+}
558
+.dialysisTable th {
559
+    color: #000;
560
+    padding: 0;
561
+    margin: 0;
562
+    height: 30px;
563
+}
564
+.dialysisTable tr td {
565
+    padding: 12px 0;
566
+}
567
+.subadvice_content {
568
+    text-align: left;
569
+    padding-left: 25px !important;
570
+    padding-right: 5px !important;
571
+}
572
+.advice_content {
573
+    text-align: left;
574
+    padding-left: 5px !important;
575
+    padding-right: 5px !important;
576
+    padding: 15px 5px !important;
577
+}
578
+</style>

+ 43 - 30
src/xt_pages/dialysis/template/DialysisPrintOrderSixty.vue View File

@@ -184,8 +184,7 @@
184 184
               </tr>
185 185
               <tr>
186 186
                 <td colspan="2">
187
-                  <div
188
-                    class="row"
187
+                  <div class="row"
189 188
                     style="padding: 2px 0; line-height: 23px; display: flex"
190 189
                   >
191 190
                     <div class="inline_block" style="flex: 1">
@@ -359,11 +358,10 @@
359 358
                     </div>
360 359
                   </div>
361 360
 
362
-                  <div
363
-                    class="row"
361
+                  <div class="row"
364 362
                     style="padding: 2px 0; line-height: 23px; display: flex"
365 363
                   >
366
-                    <div class="inline_block">
364
+                    <div class="inline_block" style="flex: 1;">
367 365
                       血管通路:
368 366
                       <div
369 367
                         class="under_line"
@@ -374,12 +372,11 @@
374 372
                         {{ predialysis.blood_access_part_opera_name }}
375 373
                       </div>
376 374
                     </div>
377
-                    <div class="inline_block" style="margin-left: 10px">
375
+                    <div class="inline_block" style="flex: 1;">
378 376
                       内瘘:
379
-                      <div
380
-                        class="under_line"
377
+                      <div class="under_line"
381 378
                         style="
382
-                          width: 180px;
379
+                          width: 80%;
383 380
                           text-align: center;
384 381
                           white-space: normal;
385 382
                         "
@@ -392,10 +389,7 @@
392 389
                       </div>
393 390
                     </div>
394 391
 
395
-                    <div
396
-                      class="inline_block"
397
-                      style="margin-left: 10px; flex: 1.4"
398
-                    >
392
+                    <div class="inline_block" style="flex: 1">
399 393
                       导管:
400 394
                       <div
401 395
                         class="under_line"
@@ -941,8 +935,7 @@
941 935
                   <div class="row" style="padding: 2px 0; line-height: 23px">
942 936
                     <div class="inline_block">
943 937
                       抗凝剂:
944
-                      <div
945
-                        class="under_line"
938
+                      <div class="under_line"
946 939
                         style="width: 150px; text-align: center"
947 940
                       >
948 941
                         {{
@@ -968,10 +961,7 @@
968 961
                             : "/"
969 962
                         }}
970 963
                       </div>
971
-                      <span v-if="prescription.anticoagulant == 4">mg</span>
972
-                      <span v-if="prescription.anticoagulant == 3">iu</span>
973
-                      <span v-if="prescription.anticoagulant == 2">iu</span>
974
-                      <span v-if="prescription.anticoagulant == 1">mg</span>
964
+                      {{ getshouji(prescription.anticoagulant) }}
975 965
                     </div>
976 966
                     <div class="inline_block" style="margin-left: 20px">
977 967
                       维持:
@@ -997,11 +987,7 @@
997 987
                             : "0"
998 988
                         }}
999 989
                       </div>
1000
-                      <span v-if="prescription.anticoagulant == 5">ml/h</span>
1001
-                      <span v-if="prescription.anticoagulant == 4">mg/h</span>
1002
-                      <span v-if="prescription.anticoagulant == 3">iu/h</span>
1003
-                      <span v-if="prescription.anticoagulant == 2">iu/h</span>
1004
-                      <span v-if="prescription.anticoagulant == 1">mg/h</span>
990
+                      {{ getweichi(prescription.anticoagulant) }}
1005 991
                     </div>
1006 992
                     <div
1007 993
                       class="inline_block"
@@ -1054,10 +1040,7 @@
1054 1040
                             : "/"
1055 1041
                         }}
1056 1042
                       </div>
1057
-                      <span v-if="prescription.anticoagulant == 4">mg</span>
1058
-                      <span v-if="prescription.anticoagulant == 3">iu</span>
1059
-                      <span v-if="prescription.anticoagulant == 2">iu</span>
1060
-                      <span v-if="prescription.anticoagulant == 1">mg</span>
1043
+                      {{ getzongliang(prescription.anticoagulant) }}
1061 1044
                     </div>
1062 1045
                     <!-- <div class="inline_block" style="margin-left: 20px">
1063 1046
                       透析机号:
@@ -2786,7 +2769,6 @@ export default {
2786 2769
         );
2787 2770
       }
2788 2771
     },
2789
-
2790 2772
     getXuserName(id) {
2791 2773
       if (id <= 0) {
2792 2774
         return "";
@@ -3252,6 +3234,36 @@ export default {
3252 3234
         return "0.0";
3253 3235
       }
3254 3236
     },
3237
+    getshouji(id){
3238
+      const options = this.anticoagulantsConfit
3239
+      if(id!=0){
3240
+        for(let i in options){
3241
+          if(options[i].id == id){
3242
+            return options[i].shouji_unit
3243
+          }
3244
+        }
3245
+      }
3246
+    },
3247
+    getweichi(id){
3248
+      const options = this.anticoagulantsConfit
3249
+      if(id!=0){
3250
+        for(let i in options){
3251
+          if(options[i].id == id){
3252
+            return options[i].weichi_unit
3253
+          }
3254
+        }
3255
+      }
3256
+    },
3257
+    getzongliang(id){
3258
+      const options = this.anticoagulantsConfit
3259
+      if(id!=0){
3260
+        for(let i in options){
3261
+          if(options[i].id == id){
3262
+            return options[i].zongliang_unit
3263
+          }
3264
+        }
3265
+      }
3266
+    }
3255 3267
   },
3256 3268
   watch: {
3257 3269
     "patientInfo.gender": function () {
@@ -3297,7 +3309,8 @@ export default {
3297 3309
     this.perfusionApparatus = this.$store.getters.perfusion_apparatus;
3298 3310
     this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
3299 3311
     this.displaceLiquiPartOptions = this.$store.getters.displace_liqui;
3300
-
3312
+    console.log('this.anticoagulantsConfit',this.anticoagulantsConfit);
3313
+    
3301 3314
     this.blood_access_part = getDataConfig("hemodialysis", "vascular_access");
3302 3315
     this.blood_access_part_opera = getDataConfig(
3303 3316
       "hemodialysis",

+ 24 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue View File

@@ -1201,10 +1201,34 @@
1201 1201
                       </td>
1202 1202
                      <td></td>
1203 1203
                     </tr>
1204
+                    <tr v-if="org_id ==10016">
1205
+                      <td width="100">治疗小结:</td>
1206
+                      <td width="370">
1207
+                        {{
1208
+                          summary.dialysis_summary
1209
+                            ? summary.dialysis_summary
1210
+                            : "/"
1211
+                        }}
1212
+                      </td>
1213
+                    </tr>
1214
+                    <tr v-if="org_id ==10016">
1215
+                      <td  width="100"> 宣教知识:</td>
1216
+                      <td  width="370">
1217
+                        {{
1218
+                          summary.mission
1219
+                            ? summary.mission
1220
+                            : "/"
1221
+                        }}
1222
+                      </td>
1223
+                    </tr>
1224
+                   
1204 1225
                   </tbody>
1205 1226
                 </table>
1206 1227
 
1207 1228
                 
1229
+                
1230
+
1231
+                
1208 1232
 
1209 1233
                 <!-- <table class="table-box">
1210 1234
                   <tbody>

+ 70 - 45
src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue View File

@@ -179,20 +179,31 @@
179 179
                     </div>
180 180
                     <div class="inline_block" style="flex: 1;">
181 181
                       血压:
182
-                      <div class="under_line" style="width: 50px; text-align: center">
183
-                        {{
184
-                          predialysis.systolic_blood_pressure
185
-                            ? predialysis.systolic_blood_pressure
186
-                            : ""
187
-                        }}
182
+                      <div class="inline_block" v-if="predialysis.systolic_blood_pressure!='' && 
183
+                          predialysis.diastolic_blood_pressure !=''"
184
+                      >
185
+                        <div class="under_line" style="width: 50px; text-align: center">
186
+                          {{
187
+                            predialysis.systolic_blood_pressure
188
+                              ? predialysis.systolic_blood_pressure
189
+                              : ""
190
+                          }}
191
+                        </div>
192
+                        /
193
+                        <div class="under_line" style="width: 50px; text-align: center">
194
+                          {{
195
+                            predialysis.diastolic_blood_pressure
196
+                              ? predialysis.diastolic_blood_pressure
197
+                              : ""
198
+                          }}
199
+                        </div>
188 200
                       </div>
189
-                      /
190
-                      <div class="under_line" style="width: 50px; text-align: center">
191
-                        {{
192
-                          predialysis.diastolic_blood_pressure
193
-                            ? predialysis.diastolic_blood_pressure
194
-                            : ""
195
-                        }}
201
+                      <div class="inline_block" v-else>
202
+                        <div class="under_line" 
203
+                          style="width: 100px; text-align: center"
204
+                        >
205
+                          拒测血压
206
+                        </div>
196 207
                       </div>
197 208
                       mmHg
198 209
                     </div>
@@ -823,7 +834,6 @@
823 834
             </tbody>
824 835
           </table>
825 836
         </div>
826
-
827 837
         <div class="row" style="margin-top: -11px; position: relative">
828 838
           <table class="proj_table">
829 839
             <tbody>
@@ -873,39 +883,49 @@
873 883
                     </div>
874 884
                     <div class="inline_block"style="flex: 1">
875 885
                       血压:
876
-                      <div class="under_line"
877
-                        style="width: 50px; text-align: center"
886
+                      <div class="inline_block" v-if="afterdialysis.systolic_blood_pressure!='' && 
887
+                          afterdialysis.diastolic_blood_pressure !=''"
878 888
                       >
879
-                        <!-- {{
880
-                          afterdialysis.systolic_blood_pressure
881
-                            ? afterdialysis.systolic_blood_pressure
882
-                            : "/"
883
-                        }} -->
884
-                          <span v-if="monitors.length>0">
889
+                        <div class="under_line" 
890
+                          style="width: 50px; text-align: center"
891
+                        >
892
+                          {{
893
+                            afterdialysis.systolic_blood_pressure
894
+                              ? afterdialysis.systolic_blood_pressure
895
+                              : ""
896
+                          }}
897
+                            <!-- <span v-if="monitors.length>0">
898
+                              {{
899
+                                monitors[monitors.length-1].systolic_blood_pressure ?
900
+                                monitors[monitors.length-1].systolic_blood_pressure :""
901
+                              }}
902
+                            </span>
903
+                            <span v-else></span> -->
904
+                        </div>
905
+                        /
906
+                        <div class="under_line"
907
+                          style="width: 50px; text-align: center"
908
+                        >
909
+                          {{
910
+                            afterdialysis.diastolic_blood_pressure
911
+                              ? afterdialysis.diastolic_blood_pressure
912
+                              : ""
913
+                          }}
914
+                          <!-- <span v-if="monitors.length>0">
885 915
                             {{
886
-                              monitors[monitors.length-1].systolic_blood_pressure ?
887
-                              monitors[monitors.length-1].systolic_blood_pressure :""
916
+                              monitors[monitors.length-1].diastolic_blood_pressure ?
917
+                                monitors[monitors.length-1].diastolic_blood_pressure :""
888 918
                             }}
889 919
                           </span>
890
-                           <span v-else></span>
920
+                          <span v-else></span> -->
921
+                        </div>
891 922
                       </div>
892
-                      /
893
-                      <div
894
-                        class="under_line"
895
-                        style="width: 50px; text-align: center"
896
-                      >
897
-                        <!-- {{
898
-                          afterdialysis.diastolic_blood_pressure
899
-                            ? afterdialysis.diastolic_blood_pressure
900
-                            : "/"
901
-                        }} -->
902
-                        <span v-if="monitors.length>0">
903
-                          {{
904
-                            monitors[monitors.length-1].diastolic_blood_pressure ?
905
-                              monitors[monitors.length-1].diastolic_blood_pressure :""
906
-                          }}
907
-                        </span>
908
-                        <span v-else></span>
923
+                      <div class="inline_block" v-else>
924
+                        <div class="under_line" 
925
+                          style="width: 100px; text-align: center"
926
+                        >
927
+                          拒测血压
928
+                        </div>
909 929
                       </div>
910 930
                       mmHg
911 931
                     </div>
@@ -1050,13 +1070,18 @@
1050 1070
                       <div class="under_line"
1051 1071
                         style="width: 70px; text-align: center"
1052 1072
                       >
1053
-                        <span v-if=" monitors.length !=0 &&monitors[monitors.length - 1].ultrafiltration_volume !=''">
1073
+                        <!-- <span v-if=" monitors.length !=0 &&monitors[monitors.length - 1].ultrafiltration_volume !=''">
1054 1074
                           {{ (monitors[monitors.length - 1].ultrafiltration_volume/1000).toFixed(1) }}
1075
+                        </span> -->
1076
+                        <span v-if="afterdialysis.actual_ultrafiltration !=''">
1077
+                          {{ afterdialysis.actual_ultrafiltration>100
1078
+                            ? (afterdialysis.actual_ultrafiltration/1000).toFixed(1) : afterdialysis.actual_ultrafiltration }}
1055 1079
                         </span>
1056
-                        <span v-else>
1080
+                        <span v-else></span>
1081
+                        <!-- <span>
1057 1082
                           {{ afterdialysis.actual_ultrafiltration
1058 1083
                             ? afterdialysis.actual_ultrafiltration : "" }}
1059
-                        </span>
1084
+                        </span> -->
1060 1085
                       </div>
1061 1086
                       L
1062 1087
                     </div>

+ 7 - 3
src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue View File

@@ -116,9 +116,7 @@
116 116
           
117 117
         </div>
118 118
 
119
-        <div class="row">
120
-
121
-        </div>
119
+        
122 120
         <div class="row">
123 121
           抗凝药物&nbsp;&nbsp;
124 122
           <div class="inline_block under_line" style="width:90%;text-align: left;">
@@ -248,6 +246,12 @@
248 246
             </div>
249 247
           </div> -->
250 248
         </div>
249
+        <div class="row">
250
+          备注
251
+          <div class="inline_block under_line" style="width:90%;text-align: center;white-space: normal;">
252
+            {{ prescription.remark ? prescription.remark : '/'}}
253
+          </div>
254
+        </div>
251 255
         <div class="row">
252 256
           上机医生
253 257
           <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">

+ 5 - 5
src/xt_pages/outpatientCharges/invoicePrint.vue View File

@@ -17,10 +17,10 @@
17 17
     </template>
18 18
     <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 && org_id != 10188 && org_id != 10633"><!--&& org_id != 10188 && org_id != 0-->
19 19
         <div class='dialysisPage'>
20
-          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 " >
20
+          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 && org_id != 0" >
21 21
             <printOne v-if="org_id != 10088 && org_id != 10510 && org_id != 0" :paramsObj="invoiceParams"></printOne>
22 22
             <printThree v-if="org_id == 10088 " :paramsObj="invoiceParams" :show="showclick"></printThree>
23
-            <printfifteen v-if="org_id == 10510 || org_id == 0 " :paramsObj="invoiceParams"></printfifteen>
23
+            <printfifteen v-if="org_id == 10510 " :paramsObj="invoiceParams"></printfifteen>
24 24
           </div>
25 25
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
26 26
           <printFour v-if="org_id == 10215 " :paramsObj="invoiceParams"></printFour>
@@ -30,7 +30,7 @@
30 30
           <print-eight v-if="org_id == 10387" :paramsObj="invoiceParams"></print-eight>
31 31
           <PrintNight v-if="org_id == 10210" :paramsObj="invoiceParams"></PrintNight>
32 32
           <!-- <PrintTen v-if="org_id == 10375 ||org_id == 0 " :paramsObj="invoiceParams"></PrintTen> -->
33
-          <printtwelve :paramsObj="invoiceParams"  v-if="org_id == 10480 "></printtwelve>
33
+          <printtwelve :paramsObj="invoiceParams"  v-if="org_id == 10480 || org_id == 0 "></printtwelve>
34 34
         </div>
35 35
     </div>
36 36
 
@@ -40,7 +40,7 @@
40 40
       </div>
41 41
     </div>
42 42
 
43
-    <div class="app-container" style="" v-if="org_id == 10217 || org_id == 10633">
43
+    <div class="app-container" style="" v-if=" org_id == 10633">
44 44
       <div class='dialysisPage'>
45 45
         <printSix :paramsObj="invoiceParams"></printSix>
46 46
       </div>
@@ -57,7 +57,7 @@
57 57
       </div>
58 58
     </div>
59 59
 
60
-    <div class="app-container" style="padding-top:20px;" v-if="org_id == 10188  ">
60
+    <div class="app-container" style="padding-top:20px;" v-if="org_id == 10188 || org_id == 10217">
61 61
       <div class='dialysisPage'>
62 62
         <printthirteen  :paramsObj="invoiceParams"></printthirteen>
63 63
       </div>

+ 4 - 3
src/xt_pages/outpatientCharges/invoiceTemplate/printthirteen.vue View File

@@ -2,12 +2,13 @@
2 2
 <template>
3 3
   <div id='invoice-print'>
4 4
     <div v-for='(i,index) in pageArr.length' :key="index" style="width: 90%;margin: 0 auto;font-size: 17px;">
5
-      <div style="text-align: center;width: 100%;font-size: 20px; font-weight: bolder;">盐城响水燕舞血液透析中心收据</div>
5
+      <div v-if="org_id==10188" style="text-align: center;width: 100%;font-size: 20px; font-weight: bolder;">盐城响水燕舞血液透析中心收据</div>
6
+      <div v-if="org_id==10217" style="text-align: center;width: 100%;font-size: 20px; font-weight: bolder;">大丰燕舞血液透析中心</div>
6 7
       <div style="display: flex; margin: 15px 0 5px 0;">
7 8
         <div style="flex: 1.1;">业务流水号:{{ list.order_number }}</div>
8 9
         <div style="flex: 0.9;">医疗机构类型:</div>
9 10
         <div style="flex: 1;">医院国家编码:H32092103007</div>
10
-       
11
+
11 12
       </div>
12 13
       <div style="display: flex;">
13 14
         <!-- <div style="flex:1;">医生:{{ doctor_info.user_name }}</div>
@@ -78,7 +79,7 @@
78 79
           </div>
79 80
         </div>
80 81
         <div style="flex: 2;border-left: 1px solid black;">
81
-          
82
+
82 83
         </div>
83 84
       </div>
84 85
       <div style="display: flex;border:1px solid black;border-top: none;">

+ 73 - 36
src/xt_pages/sign/lineUp.vue View File

@@ -74,7 +74,7 @@
74 74
                                 <p style="width:16%">{{ item.end_time && item.start_time ? getDates(item.end_time) : '--' }}</p>
75 75
                             </div>
76 76
                         </div>
77
-                    </div> 
77
+                    </div>
78 78
                     <div class="callingBox">
79 79
                         <div :class="(queueConfig.jzjhyc == 1 && queueConfig.sjjhyc == 0) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.jzjhyc == 1">
80 80
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
@@ -123,10 +123,10 @@
123 123
                             </div>
124 124
                         </div>
125 125
                     </div>
126
-                </div> 
127
-                
126
+                </div>
127
+
128 128
              </div>
129
-        
129
+
130 130
             <!-- <div class="page_lineUp">
131 131
                 <div class="lineUpTitle">
132 132
                     <div>{{ this.$store.getters.xt_user.org.org_name }}<span>&nbsp;&nbsp;温馨提示:请注意排队叫号,依次叫号就诊上机,谢谢配合</span></div>
@@ -159,7 +159,7 @@
159 159
                                 <p style="width:16%">07:38:00</p>
160 160
                             </div>
161 161
                         </div>
162
-                    </div> 
162
+                    </div>
163 163
                     <div class="callingBox">
164 164
                         <div class="callingBoxLeft">
165 165
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
@@ -209,7 +209,7 @@
209 209
                         </div>
210 210
                     </div>
211 211
                 </div>
212
-                
212
+
213 213
             </div> -->
214 214
         </div>
215 215
         <div class="app-container">
@@ -251,7 +251,7 @@
251 251
                                 <p style="width:16%">{{ item.end_time && item.start_time ? getDates(item.end_time) : '--' }}</p>
252 252
                             </div>
253 253
                         </div>
254
-                    </div> 
254
+                    </div>
255 255
                     <div class="callingBox">
256 256
                         <div :class="(queueConfig.jzjhyc == 1 && queueConfig.sjjhyc == 0) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.jzjhyc == 1">
257 257
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
@@ -301,9 +301,9 @@
301 301
                         </div>
302 302
                     </div>
303 303
                 </div>
304
-                
304
+
305 305
             </div>
306
-        
306
+
307 307
             <!-- <div class="page_lineUp">
308 308
                 <div class="lineUpTitle">
309 309
                     <div>{{ this.$store.getters.xt_user.org.org_name }}<span>&nbsp;&nbsp;温馨提示:请注意排队叫号,依次叫号就诊上机,谢谢配合</span></div>
@@ -336,7 +336,7 @@
336 336
                                 <p style="width:16%">07:38:00</p>
337 337
                             </div>
338 338
                         </div>
339
-                    </div> 
339
+                    </div>
340 340
                     <div class="callingBox">
341 341
                         <div class="callingBoxLeft">
342 342
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
@@ -386,7 +386,7 @@
386 386
                         </div>
387 387
                     </div>
388 388
                 </div>
389
-                
389
+
390 390
             </div> -->
391 391
         </div>
392 392
     </div>
@@ -410,7 +410,7 @@ export default {
410 410
             dialogTableVisible:false,
411 411
             showSetting: false,
412 412
             lineUpList:[],
413
-            count:0,
413
+            // count:0,
414 414
             page:1,
415 415
             timer:null,
416 416
             queueConfig:{
@@ -428,8 +428,8 @@ export default {
428 428
 
429 429
             voice:true,
430 430
             a:1,
431
-            newTimes:null
432
-            
431
+            newTimes:null,
432
+
433 433
         }
434 434
     },
435 435
     computed: {
@@ -445,10 +445,19 @@ export default {
445 445
             sessionStorage.removeItem('lineUpKey')
446 446
             sessionStorage.removeItem('signInKey')
447 447
         }
448
-        this.initData = {
449
-            cmd: "queue/join",
450
-            data: {type:2,page:1,size:6},
451
-        };
448
+        if(this.queueConfig.jzjhyc ==1&&this.queueConfig.sjjhyc ==1){
449
+          this.initData = {
450
+              cmd: "queue/join",
451
+              data: {type:2,page:1,size:6},
452
+          };
453
+        }else{
454
+          this.initData = {
455
+              cmd: "queue/join",
456
+              data: {type:2,page:1,size:10},
457
+          };
458
+        }
459
+        console.log('11111111222',this.initData);
460
+
452 461
         this.websocketSend(this.initData)
453 462
         let newobj = {
454 463
             cmd: "queue/callreturn",
@@ -483,33 +492,61 @@ export default {
483 492
         // this.websocketMess();
484 493
     },
485 494
     mounted(){
486
-        
495
+      console.log('queueConfig.jzjhyc1111',this.queueConfig.jzjhyc,this.queueConfig.sjjhyc);
496
+
487 497
         this.timer = setInterval(() => {
498
+
499
+          if(this.queueConfig.jzjhyc ==1&&this.queueConfig.sjjhyc ==1){
488 500
             if(this.page < Math.ceil(this.count / 6)){
489
-                console.log('执行',Math.ceil(this.count / 6),this.page)
490
-                this.page++
491
-                let obj = {
501
+              console.log('执行',Math.ceil(this.count / 6),this.page)
502
+              this.page++
503
+              let obj = {
504
+                  cmd: "queue/queuelist",
505
+                  data: {page:this.page,size:6,sort:0}
506
+              };
507
+              this.websocketSend(obj)
508
+              setTimeout(() => {
509
+                  this.websocketMess();
510
+              }, 1000);
511
+            }else{
512
+                console.log('执行22223333')
513
+                this.page = 1
514
+                let a = {
492 515
                     cmd: "queue/queuelist",
493 516
                     data: {page:this.page,size:6,sort:0}
494 517
                 };
495
-                this.websocketSend(obj)
518
+                this.websocketSend(a)
496 519
                 setTimeout(() => {
497 520
                     this.websocketMess();
498 521
                 }, 1000);
522
+
523
+            }
524
+          }else{
525
+            if(this.page < Math.ceil(this.count / 10)){
526
+              console.log('执行',Math.ceil(this.count / 10),this.page)
527
+              this.page++
528
+              let obj = {
529
+                  cmd: "queue/queuelist",
530
+                  data: {page:this.page,size:10,sort:0}
531
+              };
532
+              this.websocketSend(obj)
533
+              setTimeout(() => {
534
+                  this.websocketMess();
535
+              }, 1000);
499 536
             }else{
500
-                console.log('执行22223333')
537
+                console.log('执行22223333444444')
501 538
                 this.page = 1
502 539
                 let a = {
503 540
                     cmd: "queue/queuelist",
504
-                    data: {page:this.page,size:6,sort:0}
541
+                    data: {page:this.page,size:10,sort:0}
505 542
                 };
506 543
                 this.websocketSend(a)
507 544
                 setTimeout(() => {
508 545
                     this.websocketMess();
509 546
                 }, 1000);
510
-                
511 547
             }
512
-            console.log('切换时间',this.queueConfig)
548
+          }
549
+          console.log('切换时间11',this.queueConfig)
513 550
         }, 1000 * parseInt(this.queueConfig.qhsj));
514 551
         this.timerID = setInterval(() => {
515 552
             this.updateTime()
@@ -543,7 +580,7 @@ export default {
543 580
         websocketSend(data) {
544 581
             try {
545 582
                 this.websocket.send(JSON.stringify(data))
546
-                
583
+
547 584
             } catch (error) {
548 585
                 this.showError = true;
549 586
                 this.showIndex = 4;
@@ -551,12 +588,12 @@ export default {
551 588
             }
552 589
         },
553 590
         websocketMess() {
554
-            console.log('测试')
591
+            console.log('测试',this.websocket)
555 592
             this.websocket.onmessage = e => {
556 593
                 let res = JSON.parse(e.data);
557 594
                 // let res = re.data;
558 595
                 console.log('res',res)
559
-                
596
+
560 597
                     if(res.channel == 'queue/join'){
561 598
                         if(res.data.type == 2){
562 599
                             this.queueConfig = res.data.queueConfig
@@ -587,7 +624,7 @@ export default {
587 624
                         console.log(999999999999,res.data)
588 625
                         let second = res.data.second
589 626
                         let newType = res.data.type
590
-                    
627
+
591 628
                         console.log('执行几次',this.voiceNum)
592 629
                         if(this.voice == true){
593 630
                             this.patient_id = res.data.patientInfo.patient_id
@@ -606,7 +643,7 @@ export default {
606 643
                                     this.voicePrompt(res.data.callVolUrl)
607 644
                                 }else{
608 645
                                     this.voiceNum = 1;
609
-                                    this.voice = true 
646
+                                    this.voice = true
610 647
                                     let obj = {
611 648
                                         cmd: "queue/callreturn",
612 649
                                         data: {patient_id:this.patient_id,type:newType},
@@ -624,13 +661,13 @@ export default {
624 661
                         }
625 662
                     }else if(res.channel == 'updateCallList'){
626 663
                         this.receivingPatient = res.data.queue_list
627
-                        
664
+
628 665
                     }else if(res.channel == 'updateWaitCallList'){
629 666
                         this.waitDoctorList = res.data.queue_list
630 667
                     }else if(res.channel == 'updateUpCallList'){
631 668
                         this.upPatientList = res.data.queue_list
632 669
                     }
633
-                
670
+
634 671
                 // else if(res.channel == "patientQueueInfo"){
635 672
                 //     this.queueInfo = res.data.queueInfo
636 673
                 //     let obj = {
@@ -638,7 +675,7 @@ export default {
638 675
                 //         data: {page:1,size:10}
639 676
                 //     };
640 677
                 //     this.websocketSend(obj)
641
-                    
678
+
642 679
                 // }
643 680
             }
644 681
         },
@@ -719,7 +756,7 @@ export default {
719 756
         border-radius: 15px;
720 757
         display: flex;
721 758
         flex-direction: column;
722
-        
759
+
723 760
     }
724 761
     .lineUpMainLeftTitle{
725 762
         display: flex;

+ 4 - 3
src/xt_pages/stock/drugs/components/expiryDateDrugQuery.vue View File

@@ -76,8 +76,9 @@
76 76
             </el-table-column>
77 77
             <el-table-column label="库存" align="center">
78 78
               <template slot-scope="scope">
79
-                <span v-if="scope.row.stock_max_number > 0"> {{scope.row.stock_max_number}}{{scope.row.XtBaseDrug.max_unit}}</span>
80
-                <span v-if="scope.row.stock_min_number > 0">{{scope.row.stock_min_number}}{{scope.row.XtBaseDrug.min_unit}}</span>  
79
+                <span v-if="scope.row.stock_max_number > 0"> {{scope.row.stock_max_number}}{{scope.row.max_unit}}</span>
80
+                <span v-if="scope.row.stock_min_number > 0">{{scope.row.stock_min_number}}{{scope.row.min_unit}}</span>  
81
+                
81 82
               </template>
82 83
             </el-table-column>
83 84
         
@@ -559,7 +560,7 @@ export default {
559 560
           this.tableList[i].specification_name = this.tableList[i].XtBaseDrug.dose + this.tableList[i].XtBaseDrug.dose_unit +"*"+this.tableList[i].XtBaseDrug.min_number+this.tableList[i].XtBaseDrug.min_unit+"/"+this.tableList[i].XtBaseDrug.max_unit
560 561
           this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
561 562
           this.tableList[i].expiry = this.getTime(this.tableList[i].expiry_date)
562
-          this.tableList[i].stock_count =  this.tableList[i].stock_max_number + this.tableList[i].XtBaseDrug.max_unit + this.tableList[i].stock_min_number + this.tableList[i].XtBaseDrug.min_unit
563
+          this.tableList[i].stock_count =  this.tableList[i].stock_max_number + this.tableList[i].max_unit + this.tableList[i].stock_min_number + this.tableList[i].min_unit
563 564
           this.tableList[i].flush_date = this.getDaysBetween(this.getTime(this.tableList[i].expiry_date),this.getTime(this.nowtime))
564 565
        }
565 566
       import('@/vendor/Export2Excel').then(excel => {

+ 2 - 2
src/xt_pages/stock/drugs/components/expiryDateDrugQueryPrint.vue View File

@@ -42,8 +42,8 @@
42 42
                                   <td width="80">{{getManufacturName(item.manufacturer)}} </td>
43 43
                                   <td width="80">{{item.price}}</td>    
44 44
                                   <td width="80">
45
-                                     <span v-if="item.stock_max_number > 0">{{item.stock_max_number}}{{item.XtBaseDrug.max_unit}}</span>
46
-                                     <span v-if="item.stock_min_number >0">{{item.stock_min_number}}{{item.XtBaseDrug.min_unit}}</span>
45
+                                     <span v-if="item.stock_max_number > 0">{{item.stock_max_number}}{{item.max_unit}}</span>
46
+                                     <span v-if="item.stock_min_number >0">{{item.stock_min_number}}{{item.min_unit}}</span>
47 47
                                   </td>   
48 48
                                   <td width="80">{{item.batch_number}}</td>  
49 49
                                   <td width="80">{{getTime(item.expiry_date)}}</td>  

+ 2 - 0
src/xt_pages/stock/drugs/components/purchaseDrugQuery.vue View File

@@ -1090,6 +1090,8 @@ export default {
1090 1090
 
1091 1091
    },
1092 1092
    drugAddInfoOnePirce(arr,min_number,min_unit,max_unit,arr2){
1093
+    console.log("arr----------------",arr)
1094
+    console.log("newArr----------------",arr2)
1093 1095
     var total = 0
1094 1096
     var totalone_price = 0
1095 1097
     var total_two_price = 0

+ 67 - 12
src/xt_pages/stock/drugs/components/purchaseNewDrugQuery.vue View File

@@ -217,6 +217,7 @@ export default {
217 217
   },
218 218
   methods:{
219 219
     GetInitStartFlowPice(val1,val2,val3,val4,val5,min_number,min_unit,max_unit){
220
+     
220 221
       var total_one_price =0
221 222
       var total_two_price = 0
222 223
       var total_three_price =0
@@ -226,15 +227,18 @@ export default {
226 227
    
227 228
       if(val1!=null && val1.length>0){
228 229
          for(let i=0;i<val1.length;i++){
229
-          total_one_price +=val1[i].count*val1[i].price
230
+          total_one_price +=val1[i].count/min_number*val1[i].price
230 231
          }
231 232
       }  
233
+      console.log("total_one_price",total_one_price)
232 234
 
233 235
       if(val2!=null && val2.length>0){
234 236
          for(let i=0;i<val2.length;i++){
235
-          total_two_price +=val2[i].count*val2[i].price
237
+         
238
+          total_two_price +=val2[i].count/min_number*val2[i].price
236 239
          }
237 240
       }  
241
+      console.log("total_two_price",total_two_price)
238 242
     
239 243
       console.log("val3",val3)
240 244
       if(val3!=null && val3.length>0){
@@ -242,41 +246,71 @@ export default {
242 246
           total_three_price +=val3[i].count*val3[i].price
243 247
          }
244 248
       }  
249
+      console.log("total_three_price",total_three_price)
245 250
       if(val4!=null && val4.length>0){
246 251
          for(let i=0;i<val4.length;i++){
247 252
           total_four_price +=val4[i].count*val4[i].price
248 253
          }
249 254
       }  
255
+      console.log("total_four_price",total_four_price)
250 256
 
251 257
       if(val5!=null && val5.length>0){
252 258
          for(let i=0;i<val5.length;i++){
253 259
           total_five_price +=val5[i].count*val5[i].price
254 260
          }
255 261
       }  
256
-     
257
-      var total = (total_one_price + total_two_price -total_three_price-total_four_price + total_five_price).toFixed(2)
258
-      if(total >0){
259
-        return ""
262
+      console.log("total_five_price",total_five_price)
263
+      if(total_one_price == ""){
264
+        total_one_price = 0
265
+      }
266
+      if(total_two_price == ""){
267
+        total_two_price = 0
268
+      }
269
+      if(total_three_price == ""){
270
+        total_three_price = 0
271
+      }
272
+      if(total_four_price == ""){
273
+        total_four_price = 0
274
+      }
275
+      if(total_five_price == ""){
276
+        total_five_price = 0
277
+      }
278
+      console.log("total_one_price----",total_one_price)
279
+      console.log("total_two_price----",total_two_price)
280
+      console.log("total_three_price----",total_three_price)
281
+      console.log("total_four_price----",total_four_price)
282
+      console.log("total_five_price----",total_five_price)
283
+    
284
+      var total =  total_one_price + total_two_price - total_three_price - total_four_price + total_five_price
285
+      if(total >1){
286
+        return total.toFixed(2)
260 287
       }else{
261
-        return total
288
+        return ""
262 289
       }
290
+     
263 291
        
264 292
     },
265 293
     drugAddInfoOnePirce(arr,min_number,min_unit,max_unit,arr2){
266
-      
294
+        
267 295
         var total = 0
268 296
         var totalone_price = 0
269 297
         var total_two_price = 0
270 298
         if(arr!=null && arr.length > 0){
271 299
           for(let i=0;i<arr.length;i++){
272
-            totalone_price += arr[i].count * arr[i].price
300
+            totalone_price += arr[i].count/min_number * arr[i].price
273 301
           }
274 302
         }
275 303
         if(arr2!=null && arr2.length >0){
276 304
           for(let i=0;i<arr2.length;i++){ 
277
-            total_two_price += arr2[i].count * arr2[i].price
305
+            total_two_price += arr2[i].count/min_number * arr2[i].price
278 306
           }
279 307
         }
308
+        if(totalone_price== ""){
309
+           totalone_price = 0
310
+        }
311
+        if(total_two_price== ""){
312
+           total_two_price = 0
313
+        }
280 314
         total = totalone_price + total_two_price
281 315
 
282 316
         if(total>0){
@@ -307,6 +341,15 @@ export default {
307 341
         total_three_price +=arr3[i].count * arr3[i].price
308 342
       }
309 343
     }
344
+    if(totalone_price==""){
345
+      totalone_price=0
346
+    }
347
+    if(total_two_price == ""){
348
+      total_two_price =0
349
+    }
350
+    if(total_three_price == ""){
351
+      total_three_price =0
352
+    }
310 353
  
311 354
     total = (totalone_price + total_two_price - total_three_price).toFixed(2)
312 355
     if(total >0){
@@ -317,11 +360,23 @@ export default {
317 360
     
318 361
    },
319 362
    GetDrugOverOnePrice(totalone,totaltwo,totalthree,min_number,min_unit,max_unit){
320
-
363
+    
364
+     if(totalone == ""){
365
+        totalone =0
366
+     }
367
+     if(totaltwo == ""){
368
+       totaltwo =0
369
+     }
370
+     if(totalone == ""){
371
+        totalone =0
372
+     }
373
+     if(totalthree == ""){
374
+      totalthree =0
375
+     }
321 376
    
322 377
      var total = 0
323 378
       total = (parseFloat(totalone)  + parseFloat(totaltwo)  - parseFloat(totalthree))
324
-      console.log("total-=---------------",total)
379
+     
325 380
       if(total >0){
326 381
         return total.toFixed(2)
327 382
       }else{

+ 55 - 12
src/xt_pages/stock/drugs/components/purchaseNewDrugQueryPrint.vue View File

@@ -1498,13 +1498,13 @@ export default {
1498 1498
    
1499 1499
       if(val1!=null && val1.length>0){
1500 1500
          for(let i=0;i<val1.length;i++){
1501
-          total_one_price +=val1[i].count*val1[i].price
1501
+          total_one_price +=val1[i].count/min_number*val1[i].price
1502 1502
          }
1503 1503
       }  
1504 1504
 
1505 1505
       if(val2!=null && val2.length>0){
1506 1506
          for(let i=0;i<val2.length;i++){
1507
-          total_two_price +=val2[i].count*val2[i].price
1507
+          total_two_price +=val2[i].count/min_number*val2[i].price
1508 1508
          }
1509 1509
       }  
1510 1510
     
@@ -1526,9 +1526,25 @@ export default {
1526 1526
          }
1527 1527
       }  
1528 1528
      
1529
+      if(total_one_price == ""){
1530
+        total_one_price = 0
1531
+      }
1532
+      if(total_two_price == ""){
1533
+        total_two_price = 0
1534
+      }
1535
+      if(total_three_price == ""){
1536
+        total_three_price = 0
1537
+      }
1538
+      if(total_four_price == ""){
1539
+        total_four_price = 0
1540
+      }
1541
+      if(total_five_price == ""){
1542
+        total_five_price = 0
1543
+      }
1544
+
1529 1545
       var total = (total_one_price + total_two_price -total_three_price-total_four_price + total_five_price)
1530 1546
        
1531
-      if(total >0){
1547
+      if(total >1){
1532 1548
         return total.toFixed(2)
1533 1549
       }else{
1534 1550
         return ""
@@ -1542,13 +1558,19 @@ export default {
1542 1558
       var total_two_price = 0
1543 1559
       if(arr!=null && arr.length > 0){
1544 1560
         for(let i=0;i<arr.length;i++){
1545
-          totalone_price += arr[i].count * arr[i].price
1561
+          totalone_price += arr[i].count/min_number * arr[i].price
1546 1562
         }
1547 1563
       }
1548 1564
       if(arr2!=null && arr2.length >0){
1549 1565
         for(let i=0;i<arr2.length;i++){ 
1550
-          total_two_price += arr2[i].count * arr2[i].price
1566
+          total_two_price += arr2[i].count/min_number * arr2[i].price
1567
+        }
1568
+      }
1569
+      if(totalone_price== ""){
1570
+           totalone_price = 0
1551 1571
         }
1572
+      if(total_two_price== ""){
1573
+          total_two_price = 0
1552 1574
       }
1553 1575
       total = totalone_price + total_two_price
1554 1576
 
@@ -1580,6 +1602,16 @@ export default {
1580 1602
           total_three_price +=arr3[i].count * arr3[i].price
1581 1603
         }
1582 1604
       }
1605
+      if(totalone_price==""){
1606
+        totalone_price=0
1607
+      }
1608
+      if(total_two_price == ""){
1609
+        total_two_price =0
1610
+      }
1611
+      if(total_three_price == ""){
1612
+        total_three_price =0
1613
+      }
1614
+ 
1583 1615
   
1584 1616
       total = (totalone_price + total_two_price - total_three_price)
1585 1617
       if(total >0){
@@ -1590,13 +1622,24 @@ export default {
1590 1622
     
1591 1623
    },
1592 1624
    GetDrugOverOnePrice(totalone,totaltwo,totalthree,min_number,min_unit,max_unit){
1593
-      console.log("totalone----------------",totalone)
1594
-      console.log("totaltwo----------------",totalone)
1595
-      console.log("totalthree----------------",totalthree)
1596
-      var total = 0
1597
-      total = totalone  + totaltwo  - totalthree
1598
-      if(total >0 || total!="NaN"){
1599
-        console.log("haaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
1625
+     
1626
+    if(totalone == ""){
1627
+        totalone =0
1628
+     }
1629
+     if(totaltwo == ""){
1630
+       totaltwo =0
1631
+     }
1632
+     if(totalone == ""){
1633
+        totalone =0
1634
+     }
1635
+     if(totalthree == ""){
1636
+      totalthree =0
1637
+     }
1638
+   
1639
+     var total = 0
1640
+      total = (parseFloat(totalone)  + parseFloat(totaltwo)  - parseFloat(totalthree))
1641
+     
1642
+      if(total >0){
1600 1643
         return total.toFixed(2)
1601 1644
       }else{
1602 1645
         return ""

+ 32 - 10
src/xt_pages/stock/query/purchaseNewStockQuery.vue View File

@@ -754,7 +754,7 @@ export default {
754 754
     }
755 755
     if(val2!=null && val2.length > 0){
756 756
      for(let i=0;i<val2.length;i++){
757
-      count_one_price +=val2[i].count * val[i].price
757
+      count_one_price +=val2[i].count * val2[i].price
758 758
      }
759 759
     }
760 760
     all_count_price = count_price + count_one_price
@@ -804,7 +804,7 @@ export default {
804 804
    if(all_price >0 ){
805 805
     return all_price.toFixed(2)
806 806
    }else{
807
-    return "0.00"
807
+    return ""
808 808
    }
809 809
   },
810 810
   getWarehouseOut(val){
@@ -911,7 +911,7 @@ export default {
911 911
     if (total_price_all > 0) {
912 912
        return total_price_all.toFixed(2)
913 913
      }else{
914
-      return  "0.00"
914
+      return  ""
915 915
      }
916 916
    },
917 917
    getWarehosueOutInfo(val,val2,val3){
@@ -957,12 +957,12 @@ export default {
957 957
      }
958 958
      if(val2!=null && val2.length > 0){
959 959
       for(let i=0;i<val2.length;i++){
960
-        count_one_price +=val2[i].count  * val[i].price
960
+        count_one_price +=val2[i].count  * val2[i].price
961 961
       }
962 962
      }
963 963
      if(val3!=null && val3.length > 0){
964 964
       for(let i=0;i<val3.length;i++){
965
-        count_two_price +=val3[i].count  * val[i].price
965
+        count_two_price +=val3[i].count  * val3[i].price
966 966
       }
967 967
      }
968 968
      console.log("本期减少",count_price)
@@ -971,7 +971,9 @@ export default {
971 971
      all_count_price = count_price +count_one_price - count_two_price
972 972
      console.log("数据我哦我我",all_count_price)
973 973
      if(all_count_price >0){
974
-       return all_count_price
974
+       return all_count_price.toFixed(2)
975
+     }else{
976
+      return "0.00"
975 977
      }
976 978
    },
977 979
    stockOutprice(val,val2,val3){
@@ -1288,7 +1290,12 @@ export default {
1288 1290
          }
1289 1291
 
1290 1292
        }
1291
-       return total_price
1293
+       if(total_price>0){
1294
+        return total_price.toFixed(2)
1295
+       }else{
1296
+        return ""
1297
+       }
1298
+      
1292 1299
     },
1293 1300
 
1294 1301
     getAllOutStockIn(val){
@@ -1307,7 +1314,12 @@ export default {
1307 1314
           total_price += val[i].count * val[i].price
1308 1315
          }
1309 1316
        }
1310
-       return total_price
1317
+       if(total_price>0){
1318
+        return total_price.toFixed(2)
1319
+       }else{
1320
+        return ""
1321
+       }
1322
+       
1311 1323
     },
1312 1324
     getAllStockInFlow(val){
1313 1325
       var count = 0
@@ -1325,7 +1337,12 @@ export default {
1325 1337
           total_price+= val[i].count * val[i].total_price
1326 1338
         }
1327 1339
       }
1328
-      return total_price
1340
+      if(total_price>0){
1341
+        return total_price.toFixed(2)
1342
+      }else{
1343
+        return ""
1344
+      }
1345
+     
1329 1346
     },
1330 1347
     getAllStockOutFlow(val){
1331 1348
       var count = 0
@@ -1343,7 +1360,12 @@ export default {
1343 1360
           total_price+= val[i].count * val[i].price
1344 1361
         }
1345 1362
       }
1346
-      return total_price
1363
+      if(total_price>0){
1364
+         return total_price.toFixed(2)
1365
+      }else{
1366
+        return ""
1367
+      }
1368
+     
1347 1369
     },
1348 1370
     getAllQuery(){
1349 1371
 

+ 29 - 9
src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue View File

@@ -817,7 +817,12 @@ export default {
817 817
          }
818 818
 
819 819
        }
820
-       return total_price
820
+       if(total_price>0){
821
+        return total_price.toFixed(2)
822
+       }else{
823
+        return ""
824
+       }
825
+      
821 826
     },
822 827
     getAllOutStockIn(val){
823 828
        var count = 0 
@@ -835,7 +840,12 @@ export default {
835 840
           total_price+= val[i].count * val[i].total_price
836 841
         }
837 842
       }
838
-      return total_price
843
+      if(total_price>0){
844
+        return total_price.toFixed(2)
845
+      }else{
846
+        return ""
847
+      }
848
+      
839 849
     },
840 850
     getAllStockInFlow(val){
841 851
       var count = 0
@@ -862,7 +872,12 @@ export default {
862 872
           total_price += val[i].count * val[i].price
863 873
          }
864 874
        }
865
-       return total_price
875
+       if(total_price>0){
876
+        return total_price.toFixed(2)
877
+      }else{
878
+        return ""
879
+      }
880
+     
866 881
     },
867 882
     getAllStockOutFlowPrice(val){
868 883
       var total_price = 0
@@ -871,7 +886,12 @@ export default {
871 886
           total_price+= val[i].count * val[i].price
872 887
         }
873 888
       }
874
-      return total_price
889
+      if(total_price>0){
890
+        return total_price.toFixed(2)
891
+      }else{
892
+        return ""
893
+      }
894
+    
875 895
     },
876 896
     getWarehouseInfoOnePrice(val,val2){
877 897
       var count_price =0 
@@ -884,13 +904,13 @@ export default {
884 904
       }
885 905
       if(val2!=null && val2.length > 0){
886 906
       for(let i=0;i<val2.length;i++){
887
-        count_one_price +=val2[i].count * val[i].price
907
+        count_one_price +=val2[i].count * val2[i].price
888 908
       }
889 909
       }
890 910
       all_count_price = count_price + count_one_price
891 911
 
892 912
       if(all_count_price > 0 ){
893
-        return all_count_price
913
+        return all_count_price.toFixed(2)
894 914
       }else{
895 915
         return 0
896 916
       }
@@ -907,12 +927,12 @@ export default {
907 927
      }
908 928
      if(val2!=null && val2.length > 0){
909 929
       for(let i=0;i<val2.length;i++){
910
-        count_one_price +=val2[i].count  * val[i].price
930
+        count_one_price +=val2[i].count  * val2[i].price
911 931
       }
912 932
      }
913 933
      if(val3!=null && val3.length > 0){
914 934
       for(let i=0;i<val3.length;i++){
915
-        count_two_price +=val3[i].count  * val[i].price
935
+        count_two_price +=val3[i].count  * val3[i].price
916 936
       }
917 937
      }
918 938
      console.log("本期减少",count_price)
@@ -921,7 +941,7 @@ export default {
921 941
      all_count_price = count_price +count_one_price - count_two_price
922 942
      console.log("数据我哦我我",all_count_price)
923 943
      if(all_count_price >0){
924
-       return all_count_price
944
+       return all_count_price.toFixed(2)
925 945
      }else{
926 946
       return 0
927 947
      }

+ 67 - 20
src/xt_pages/user/Informed/Informedconsent.vue View File

@@ -151,6 +151,9 @@
151 151
                 <div v-if="show22">
152 152
                   <Death_informed :patient_id ="this.patientID" ref="childrtwotytwo" :patientDeathPlan="patientDeathPlan" @getPatientDeathRecord="getPatientDeathRecord"></Death_informed>
153 153
                 </div>
154
+                <div v-if="show23">
155
+                  <Surrender_informed :patient_id ="this.patientID" ref="childrtwotythree"></Surrender_informed>
156
+                </div>
154 157
               </div>
155 158
             </div>
156 159
           </el-tab-pane>
@@ -184,6 +187,7 @@ import nonheparin_informed from './components/nonheparin_informed'
184 187
 import CRRT_informed from './components/CRRT_informed'
185 188
 import Terminate_informed from './components/Terminate_informed'
186 189
 import hemodialysis from './components/hemodialysis'
190
+import Surrender_informed from './components/Surrender_informed'
187 191
 import { getPatientDetailInformedconsent,getFallOutBedPrintList,getFilterInformed,getProfundaInformed,
188 192
   getArterOvernous,getHighRiskInformed,getPatientMeDicalList,getAnticoagulationInformed,getCriticalInformed,
189 193
   getHemoperfusionInformed,getInformedConsent,getCatheterization,getDialyzerInformed, getTherapyInformed,
@@ -211,7 +215,8 @@ export default {
211 215
     nonheparin_informed,
212 216
     CRRT_informed,
213 217
     Terminate_informed,
214
-    hemodialysis
218
+    hemodialysis,
219
+    Surrender_informed
215 220
   },
216 221
   data() {
217 222
     return {
@@ -226,7 +231,8 @@ export default {
226 231
                 // {date:'疾病诊断证明书',value:'17'},{date:'无肝素血液透析风险知情同意书',value:'18'},
227 232
                 // {date:'连续肾脏替代治疗(CRRT)治疗知情同意书',value:'19'},{date:'患方要求终止治疗及风险、责任承担承诺书',value:'20'},
228 233
                 // {date:'血液透析知情同意书',value:'21'}
229
-                {date:'死亡病例讨论记录',value:'22'}
234
+                {date:'死亡病例讨论记录',value:'22'},
235
+                // {date:'拒绝或放弃医学治疗告知书',value:'23'}
230 236
       ],
231 237
 
232 238
       face_show:true,
@@ -250,6 +256,7 @@ export default {
250 256
       show20:false,
251 257
       show21:false,
252 258
       show22:false,
259
+      show23:false,
253 260
       patientID:0,
254 261
       patient:{},
255 262
       tableData:[],
@@ -448,7 +455,7 @@ export default {
448 455
        getPatientDeathRecord().then(response=>{
449 456
          if(response.data.state == 1){
450 457
             var list = response.data.data.record
451
-          
458
+
452 459
             this.patientDeathPlan = list
453 460
             console.log("list=================",this.patientDeathPlan)
454 461
             this.$refs.childrtwotytwo.show(list)
@@ -505,7 +512,8 @@ export default {
505 512
           this.show19 = false,
506 513
           this.show20 = false,
507 514
           this.show21 = false,
508
-          this.show22 = false
515
+          this.show22 = false,
516
+          this.show23 = false,
509 517
           this.getFilterInformed()
510 518
         }
511 519
         if(row.value==3){
@@ -528,7 +536,8 @@ export default {
528 536
           this.show19 = false,
529 537
           this.show20 = false,
530 538
           this.show21 = false,
531
-          this.show22 = false
539
+          this.show22 = false,
540
+          this.show23 = false,
532 541
           this.getProfundaInformed()
533 542
         }
534 543
         if(row.value==4){
@@ -551,7 +560,8 @@ export default {
551 560
           this.show19 = false,
552 561
           this.show20 = false,
553 562
           this.show21 = false,
554
-          this.show22 = false
563
+          this.show22 = false,
564
+          this.show23 = false,
555 565
           this.getArterOvernous()
556 566
         }
557 567
         if(row.value==5){
@@ -574,7 +584,8 @@ export default {
574 584
           this.show19 = false,
575 585
           this.show20 = false,
576 586
           this.show21 = false,
577
-          this.show22 = false
587
+          this.show22 = false,
588
+          this.show23 = false,
578 589
           this.getHighRiskInformed()
579 590
         }
580 591
         if(row.value==6){
@@ -597,7 +608,8 @@ export default {
597 608
           this.show19 = false,
598 609
           this.show20 = false,
599 610
           this.show21 = false,
600
-          this.show22 = false
611
+          this.show22 = false,
612
+          this.show23 = false,
601 613
           this.getAnticoagulationInformed()
602 614
         }
603 615
         if(row.value==7){
@@ -620,7 +632,8 @@ export default {
620 632
           this.show19 = false,
621 633
           this.show20 = false,
622 634
           this.show21 = false,
623
-          this.show22 = false
635
+          this.show22 = false,
636
+          this.show23 = false,
624 637
           this.getCriticalInformed()
625 638
         }
626 639
         if(row.value==8){
@@ -643,7 +656,8 @@ export default {
643 656
           this.show19 = false,
644 657
           this.show20 = false,
645 658
           this.show21 = false,
646
-          this.show22 = false
659
+          this.show22 = false,
660
+          this.show23 = false,
647 661
           this.getHemoperfusionInformed()
648 662
         }
649 663
         if(row.value==9){
@@ -689,7 +703,8 @@ export default {
689 703
           this.show19 = false,
690 704
           this.show20 = false,
691 705
           this.show21 = false,
692
-          this.show22 = false
706
+          this.show22 = false,
707
+          this.show23 = false
693 708
         }
694 709
         // if(row.value==11){
695 710
         //   this.face_show=false
@@ -731,7 +746,8 @@ export default {
731 746
           this.show19 = false,
732 747
           this.show20 = false,
733 748
           this.show21 = false,
734
-          this.show22 = false
749
+          this.show22 = false,
750
+          this.show23 = false,
735 751
           this.getTherapyInformed()
736 752
         }
737 753
         if(row.value==13){
@@ -754,7 +770,8 @@ export default {
754 770
           this.show19 = false,
755 771
           this.show20 = false,
756 772
           this.show21 = false,
757
-          this.show22 = false
773
+          this.show22 = false,
774
+          this.show23 = false,
758 775
           this.getPatientMeDicalList()
759 776
         }
760 777
         if(row.value==14){
@@ -777,7 +794,8 @@ export default {
777 794
           this.show19 = false,
778 795
           this.show20 = false,
779 796
           this.show21 = false,
780
-          this.show22 = false
797
+          this.show22 = false,
798
+          this.show23 = false,
781 799
           this.getTreamentPlan()
782 800
         }
783 801
         // if(row.value==15){
@@ -842,7 +860,8 @@ export default {
842 860
           this.show19 = false,
843 861
           this.show20 = false,
844 862
           this.show21 = false,
845
-          this.show22 = false
863
+          this.show22 = false,
864
+          this.show23 = false
846 865
         }
847 866
         if(row.value==18){
848 867
           this.filter_show=false
@@ -864,7 +883,8 @@ export default {
864 883
           this.show19 = false,
865 884
           this.show20 = false,
866 885
           this.show21 = false,
867
-          this.show22 = false
886
+          this.show22 = false,
887
+          this.show23 = false
868 888
         }
869 889
         if(row.value==19){
870 890
           this.filter_show=false
@@ -886,7 +906,8 @@ export default {
886 906
           this.show19 = true,
887 907
           this.show20 = false,
888 908
           this.show21 = false,
889
-          this.show22 = false
909
+          this.show22 = false,
910
+          this.show23 = false
890 911
         }
891 912
         if(row.value==20){
892 913
           this.filter_show=false
@@ -908,7 +929,8 @@ export default {
908 929
           this.show19 = false,
909 930
           this.show20 = true,
910 931
           this.show21 = false,
911
-          this.show22 = false
932
+          this.show22 = false,
933
+          this.show23 = false
912 934
         }
913 935
         if(row.value==21){
914 936
           this.filter_show=false
@@ -930,7 +952,8 @@ export default {
930 952
           this.show19 = false,
931 953
           this.show20 = false,
932 954
           this.show21 = true,
933
-          this.show22 = false
955
+          this.show22 = false,
956
+          this.show23 = false
934 957
         }
935 958
         if(row.value==22){
936 959
           this.filter_show=false
@@ -952,9 +975,33 @@ export default {
952 975
           this.show19 = false,
953 976
           this.show20 = false,
954 977
           this.show21 = false,
955
-          this.show22 = true
978
+          this.show22 = true,
979
+          this.show23 = false,
956 980
           this.getPatientDeathRecord()
957 981
         }
982
+        if(row.value==23){
983
+          this.filter_show=false
984