Startsida Utforska Hjälp
Registrera dig Logga in
csx
/
Vue_New
Bevaka 2
Stjärnmärk 1
Förgrening 1
Kod Ärenden 73 Pull-förfrågningar 0 Släpp 0 Wiki Activity
Bläddra i källkod

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

yq1 8 månader sedan
förälder
f23664e9a4 d76b7ff808
incheckning
dc8c816945
19 ändrade filer med 740 tillägg och 70 borttagningar
Delad Vy Visa Diff Statistik
  1. 1 1
      src/xt_pages/dialysis/batch_print/batch_print_order_Seventysix.vue
  2. 1 1
      src/xt_pages/dialysis/batch_print/batch_print_order_seventyfive.vue
  3. 30 16
      src/xt_pages/dialysis/batch_print/batch_print_order_six.vue
  4. 2 2
      src/xt_pages/dialysis/details/assessmentAfter.vue
  5. 115 0
      src/xt_pages/dialysis/details/consumable/dialysisDrug.vue
  6. 112 2
      src/xt_pages/dialysis/details/consumable/dialysisDrugPrint.vue
  7. 121 1
      src/xt_pages/dialysis/details/consumable/dialysisGood.vue
  8. 113 0
      src/xt_pages/dialysis/details/consumable/dialysisGoodPrint.vue
  9. 1 1
      src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue
  10. 7 1
      src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue
  11. 14 13
      src/xt_pages/dialysis/details/dialog/monitor_dialog.vue
  12. 5 5
      src/xt_pages/dialysis/details/dialysisMonitoring.vue
  13. 138 16
      src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue
  14. 1 1
      src/xt_pages/dialysis/template/DialysisPrintOrderSeventysix.vue
  15. 49 5
      src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue
  16. 1 1
      src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue
  17. 3 2
      src/xt_pages/hospitalStation/summary.vue
  18. 4 1
      src/xt_pages/medicalScheduling/index.vue
  19. 22 1
      src/xt_pages/workforce/remind_print_setting_two.vue

+ 1 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_Seventysix.vue Visa fil 

@@ -1327,7 +1327,7 @@
1327 1327 
                           <td width="50">动脉压<br />(mmHg)</td>
1328 1328 
                           <td width="50">静脉压<br />(mmHg)</td>
1329 1329 
                           <td width="50">跨膜压<br />(mmHg)</td>
1330 
-                          <td width="50">超滤量<br />(L)</td>
1330 
+                          <td width="50">超滤量<br />(ml)</td>
1331 1331
1332 1332 
                           <td width="200">病情变化及处理</td>
1333 1333 
                         </tr>

+ 1 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_seventyfive.vue Visa fil 

@@ -879,7 +879,7 @@
879 879
880 880 
                   </td>
881 881 
                   <td width="65" v-if="record.prescription.mode_id == 2">
882 
-                    {{monitor_record.displacement_quantity ? monitor_record.displacement_quantity : '/'}}
882 
+                    {{monitor_record.displacement_quantity_one ? monitor_record.displacement_quantity_one : '/'}}
883 883 
                   </td>
884 884 
                   <td width="200">
885 885 
                     <template

+ 30 - 16
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue Visa fil 

@@ -190,13 +190,20 @@
190 190 
                           class="under_line"
191 191 
                           style="width: 70px; text-align: center"
192 192 
                         >
193 
-                          {{
193 
+                          <!-- {{
194 194 
                             record.patient.total_dialysis +
195 195 
                             record.patient.user_sys_before_count
196 196 
                               ? record.patient.total_dialysis +
197 197 
                                 record.patient.user_sys_before_count
198 198 
                               : "/"
199 
-                          }}
199 
+                          }} -->
200 
+                          {{
201 
+                              record.Count +
202 
+                              record.patient.user_sys_before_count
203 
+                                ?  record.Count +
204 
+                                  record.patient.user_sys_before_count
205 
+                                : "/"
206 
+                            }}
200 207 
                         </div>
201 208
202 209 
                         <div
 
@@ -1613,8 +1620,7 @@
1613 1620 
                           <td width="50" v-if="org_id == 10478 || org_id ==10510">动脉压<br />(mmHg)</td>
1614 1621 
                           <td width="50">静脉压<br />(mmHg)</td>
1615 1622 
                           <td width="50">跨膜压<br />(mmHg)</td>
1616 
-                          <td width="60" v-if="org_id != 9836 && org_id!=10644">
1617 
-                            透析液温度(°C)
1623 
+                          <td width="60" v-if="org_id != 9836 && org_id!=10644">透析液温度(°C)
1618 1624 
                           </td>
1619 1625 
                           <td width="60" v-if="org_id == 9836">体温(°C)</td>
1620 1626 
                           <td
 
@@ -1655,8 +1661,8 @@
1655 1661 
                           置换液的速度<br />(ml/h)
1656 1662 
                           </td>
1657 1663 
                           <td width="50" v-if="org_id == 10375">置换率<br />(ml/h)</td>
1658 
-                          <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id!=10600 && org_id!=10683">超滤量<br />(ml)</td>
1659 
-                          <td width="50" v-if="org_id == 10600 || org_id ==10683">超滤率<br />(ml/h)</td>
1664 
+                          <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id!=10600 && org_id!=10683  && org_id!=0">超滤量<br />(ml)</td>
1665 
+                          <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0">超滤率<br />(ml/h)</td>
1660 1666 
                           <td width="50" v-if="org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
1661 1667 
                           <td
1662 1668 
                             v-if="
 
@@ -1730,12 +1736,14 @@
1730 1736 
                                 : ""
1731 1737 
                             }}
1732 1738 
                           </td>
1739 
+
1733 1740 
                           <td>
1734 1741 
                             {{
1735 1742 
                               monitor_record.pulse_frequency
1736 1743 
                                 ? monitor_record.pulse_frequency
1737 1744 
                                 : ""
1738 1745 
                             }}
1746 
+
1739 1747 
                           </td>
1740 1748 
                           <td v-if="org_id!=10489">
1741 1749 
                             {{
 
@@ -1744,20 +1752,14 @@
1744 1752 
                                 : ""
1745 1753 
                             }}
1746 1754 
                           </td>
1747 
-                          <td v-if="org_id != 10600 && org_id != 10683">
1755 
+                          <td v-if="org_id != 10600">
1748 1756 
                             {{
1749 1757 
                               monitor_record.blood_flow_volume
1750 1758 
                                 ? monitor_record.blood_flow_volume
1751 1759 
                                 : ""
1752 1760 
                             }}
1753 1761 
                           </td>
1754 
-                          <td width="50" v-if="org_id == 10600 || org_id ==10683"><br />
1755 
-                            {{
1756 
-                              monitor_record.ultrafiltration_rate
1757 
-                                ? monitor_record.ultrafiltration_rate
1758 
-                                : ""
1759 
-                            }}
1760 
-                          </td>
1762 
+
1761 1763 
                           <td v-if="org_id == 10478 || org_id ==10510">
1762 1764 
                             {{
1763 1765 
                               monitor_record.arterial_pressure
 
@@ -1783,6 +1785,7 @@
1783 1785 
                             </span>
1784 1786
1785 1787 
                           </td>
1788 
+
1786 1789 
                           <td>
1787 1790 
                             {{
1788 1791 
                               monitor_record.transmembrane_pressure
 
@@ -1813,7 +1816,8 @@
1813 1816 
                               org_id != 9675 &&
1814 1817 
                               org_id!=10490 &&
1815 1818 
                               org_id!=10600 &&
1816 
-                              org_id!=10644
1819 
+                              org_id!=10644
1820 
+
1817 1821 
                             "
1818 1822 
                           >
1819 1823 
                             {{
 
@@ -1869,7 +1873,7 @@
1869 1873 
                           <td width="50" v-if="org_id == 10375"><br />
1870 1874 
                             {{ monitor_record.replacement_rate?monitor_record.replacement_rate:"0" }}
1871 1875 
                           </td>
1872 
-                          <td>
1876 
+                          <td v-if="org_id!=10683&& org_id!=0">
1873 1877 
                             <span v-if="org_id == 9671 || org_id == 10440 || org_id == 10471">
1874 1878 
                                 {{
1875 1879 
                               monitor_record.ultrafiltration_volume
 
@@ -1884,8 +1888,18 @@
1884 1888 
                                 : ""
1885 1889 
                             }}
1886 1890 
                             </span>
1891 
+
1887 1892 
                           </td>
1888 1893
1894 
+                          <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0"><br />
1895 
+
1896 
+                                    {{
1897 
+                                      monitor_record.ultrafiltration_rate
1898 
+                                        ? monitor_record.ultrafiltration_rate
1899 
+                                        : ""
1900 
+                                    }}
1901 
+                              </td>
1902 
+
1889 1903 
                           <td
1890 1904 
                             v-if="
1891 1905 
                               (record.prescription.mode_id == 2 ||

+ 2 - 2
src/xt_pages/dialysis/details/assessmentAfter.vue Visa fil 

@@ -17,8 +17,8 @@
17 17 
           <span class="content" v-if="actual_ultrafiltration != '0'">{{
18 18 
             actual_ultrafiltration
19 19 
           }}</span>
20 
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10340 ||  this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445 ||  this.$store.getters.xt_user.template_info.org_id == 10495 ||  this.$store.getters.xt_user.template_info.org_id == 10597  ||  this.$store.getters.xt_user.template_info.org_id == 10599 ||  this.$store.getters.xt_user.template_info.org_id == 10612 ||  this.$store.getters.xt_user.template_info.org_id == 10617 ||  this.$store.getters.xt_user.template_info.org_id == 10702) " >ml</span>
21 
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10340 &&  this.$store.getters.xt_user.template_info.org_id!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432 &&  this.$store.getters.xt_user.template_info.org_id!= 10441 &&  this.$store.getters.xt_user.template_info.org_id!= 10445  &&  this.$store.getters.xt_user.template_info.org_id!= 10495 &&  this.$store.getters.xt_user.template_info.org_id!= 10597  &&  this.$store.getters.xt_user.template_info.org_id!= 10599  &&  this.$store.getters.xt_user.template_info.org_id!= 10612  &&  this.$store.getters.xt_user.template_info.org_id!= 10617  &&  this.$store.getters.xt_user.template_info.org_id!= 10702"  >L</span>
20 
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10340 ||  this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445 ||  this.$store.getters.xt_user.template_info.org_id == 10495 ||  this.$store.getters.xt_user.template_info.org_id == 10597  ||  this.$store.getters.xt_user.template_info.org_id == 10599 ||  this.$store.getters.xt_user.template_info.org_id == 10612 ||  this.$store.getters.xt_user.template_info.org_id == 10617 ||  this.$store.getters.xt_user.template_info.org_id == 10702 ||  this.$store.getters.xt_user.template_info.org_id == 10697) " >ml</span>
21 
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10340 &&  this.$store.getters.xt_user.template_info.org_id!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432 &&  this.$store.getters.xt_user.template_info.org_id!= 10441 &&  this.$store.getters.xt_user.template_info.org_id!= 10445  &&  this.$store.getters.xt_user.template_info.org_id!= 10495 &&  this.$store.getters.xt_user.template_info.org_id!= 10597  &&  this.$store.getters.xt_user.template_info.org_id!= 10599  &&  this.$store.getters.xt_user.template_info.org_id!= 10612  &&  this.$store.getters.xt_user.template_info.org_id!= 10617  &&  this.$store.getters.xt_user.template_info.org_id!= 10702  &&  this.$store.getters.xt_user.template_info.org_id!= 10697"  >L</span>
22 22 
         </li>
23 23 
         <li v-if="isShow('导管')">
24 24 
           <label>导管 : </label>

+ 115 - 0
src/xt_pages/dialysis/details/consumable/dialysisDrug.vue Visa fil 

@@ -94,6 +94,12 @@
94 94 
            </template>
95 95 
         </el-table-column>
96 96
97 
+        <el-table-column label="透析模式" align="center" width="60">
98 
+           <template slot-scope="scope">
99 
+            {{getModeId(scope.row.mode_id)}}
100 
+           </template>
101 
+        </el-table-column>
102 
+
97 103 
         <el-table-column label="推送医嘱" align="center" width="1280">
98 104 
            <template slot-scope="scope">
99 105 
              <span v-if="config.is_open !=1">{{getAdviceContent(scope.row.patient_id)}}</span> 
@@ -291,6 +297,115 @@
291 297 
        this.templateList = []
292 298 
        this.getlist()
293 299 
       },
300 
+      getModeId(val){
301 
+      var name =""
302 
+      if(val == 1){
303 
+        name ="HD"
304 
+      }
305 
+      if(val == 2){
306 
+        name ="HDF"
307 
+      }
308 
+      if(val == 3){
309 
+        name ="HD+HP"
310 
+      }
311 
+      if(val == 4){
312 
+        name ="HP"
313 
+      }
314 
+      if(val == 5){
315 
+        name ="HF"
316 
+      }
317 
+      if(val == 6){
318 
+        name ="SCUF"
319 
+      }
320 
+      if(val == 7){
321 
+        name ="IUF"
322 
+      }
323 
+      if(val == 8){
324 
+        name ="IUF"
325 
+      }
326 
+      if(val == 9){
327 
+        name ="HFHD+HP"
328 
+      }
329 
+      if(val == 10){
330 
+        name ="PHF"
331 
+      }
332 
+      if(val == 11){
333 
+        name ="HFR"
334 
+      }
335 
+      if(val == 12){
336 
+        name ="HDF+HP"
337 
+      }
338 
+      if(val == 13){
339 
+        name ="CRRT"
340 
+      }
341 
+      if(val == 14){
342 
+        name ="腹水回输"
343 
+      }
344 
+      if(val == 19){
345 
+        name ="IUF+HD"
346 
+      }
347 
+      if(val == 20){
348 
+        name ="UF"
349 
+      }
350 
+      if(val == 21){
351 
+        name ="HD+"
352 
+      }
353 
+      if(val == 22){
354 
+        name ="血浆胆红素吸附+HDF"
355 
+      }
356 
+      if(val == 23){
357 
+        name ="血浆胆红素吸附"
358 
+      }
359 
+      if(val == 24){
360 
+        name ="I-HDF"
361 
+      }
362 
+      if(val == 25){
363 
+        name ="HD高通"
364 
+      }
365 
+      if(val == 26){
366 
+        name ="CVVH"
367 
+      }
368 
+      if(val == 27){
369 
+        name ="CVVHD"
370 
+      }
371 
+      if(val == 28){
372 
+        name ="CVVHDF"
373 
+      }
374 
+      if(val == 29){
375 
+        name ="PE"
376 
+      }
377 
+      if(val == 30){
378 
+        name ="血浆胆红素吸附+HP"
379 
+      }
380 
+      if(val == 31){
381 
+        name ="HPD"
382 
+      }
383 
+      if(val == 32){
384 
+        name ="HDP"
385 
+      }
386 
+      if(val == 33){
387 
+        name = "HFD"
388 
+      }
389 
+      if(val == 34){
390 
+        name = "HDF100"
391 
+      }
392 
+      if(val == 35){
393 
+        name = "HDF600"
394 
+      }
395 
+      if(val == 36){
396 
+        name = "HDF800"
397 
+      }
398 
+      if(val == 37){
399 
+        name = "HDF1000"
400 
+      }
401 
+      if(val == 38){
402 
+        name = "HDF80"
403 
+      }
404 
+      if(val == 39){
405 
+        name = "HF16"
406 
+      }
407 
+      return name
408 
+      },
294 409 
       getlist(){
295 410
296 411 
         getDialysisAdviceTemplateList(this.query).then(response=>{

+ 112 - 2
src/xt_pages/dialysis/details/consumable/dialysisDrugPrint.vue Visa fil 

@@ -29,6 +29,7 @@
29 29 
                 <td width="100">透析机号</td>
30 30 
                 <td width="100">姓名</td>
31 31 
                 <td width="100">透析号</td>
32 
+                <td width="100">透析模式</td>
32 33 
                 <td width="800">推送医嘱</td>
33 34
34 35 
               </tr>
 
@@ -36,9 +37,10 @@
36 37 
               <tbody>
37 38 
                <tr v-for="(item,i) in list" :key="i">
38 39 
                 <td>{{i+1}}</td>
39 
-                <td> {{item.device_number.zone.name}}  {{item.device_number.number}}</td>
40 
+                <td> {{item.device_number.zone.name}}{{item.device_number.number}}</td>
40 41 
                 <td>{{item.patient.name}}</td>
41 42 
                 <td>{{item.patient.dialysis_no}}</td>
43 
+                <td>{{getModeId(item.mode_id)}}</td>
42 44 
                  <td width="800">
43 45 
                      <span v-if="config.is_open !=1">{{getAdviceContent(item.patient_id)}}</span>
44 46 
                      <span v-if="config.is_open == 1"> {{getHisAdviceContent(item.patient_id)}}</span>
 
@@ -111,7 +113,115 @@
111 113 
      this.getlist()
112 114 
     },
113 115 
     methods: {
114 
-
116 
+     getModeId(val){
117 
+      var name =""
118 
+      if(val == 1){
119 
+        name ="HD"
120 
+      }
121 
+      if(val == 2){
122 
+        name ="HDF"
123 
+      }
124 
+      if(val == 3){
125 
+        name ="HD+HP"
126 
+      }
127 
+      if(val == 4){
128 
+        name ="HP"
129 
+      }
130 
+      if(val == 5){
131 
+        name ="HF"
132 
+      }
133 
+      if(val == 6){
134 
+        name ="SCUF"
135 
+      }
136 
+      if(val == 7){
137 
+        name ="IUF"
138 
+      }
139 
+      if(val == 8){
140 
+        name ="IUF"
141 
+      }
142 
+      if(val == 9){
143 
+        name ="HFHD+HP"
144 
+      }
145 
+      if(val == 10){
146 
+        name ="PHF"
147 
+      }
148 
+      if(val == 11){
149 
+        name ="HFR"
150 
+      }
151 
+      if(val == 12){
152 
+        name ="HDF+HP"
153 
+      }
154 
+      if(val == 13){
155 
+        name ="CRRT"
156 
+      }
157 
+      if(val == 14){
158 
+        name ="腹水回输"
159 
+      }
160 
+      if(val == 19){
161 
+        name ="IUF+HD"
162 
+      }
163 
+      if(val == 20){
164 
+        name ="UF"
165 
+      }
166 
+      if(val == 21){
167 
+        name ="HD+"
168 
+      }
169 
+      if(val == 22){
170 
+        name ="血浆胆红素吸附+HDF"
171 
+      }
172 
+      if(val == 23){
173 
+        name ="血浆胆红素吸附"
174 
+      }
175 
+      if(val == 24){
176 
+        name ="I-HDF"
177 
+      }
178 
+      if(val == 25){
179 
+        name ="HD高通"
180 
+      }
181 
+      if(val == 26){
182 
+        name ="CVVH"
183 
+      }
184 
+      if(val == 27){
185 
+        name ="CVVHD"
186 
+      }
187 
+      if(val == 28){
188 
+        name ="CVVHDF"
189 
+      }
190 
+      if(val == 29){
191 
+        name ="PE"
192 
+      }
193 
+      if(val == 30){
194 
+        name ="血浆胆红素吸附+HP"
195 
+      }
196 
+      if(val == 31){
197 
+        name ="HPD"
198 
+      }
199 
+      if(val == 32){
200 
+        name ="HDP"
201 
+      }
202 
+      if(val == 33){
203 
+        name = "HFD"
204 
+      }
205 
+      if(val == 34){
206 
+        name = "HDF100"
207 
+      }
208 
+      if(val == 35){
209 
+        name = "HDF600"
210 
+      }
211 
+      if(val == 36){
212 
+        name = "HDF800"
213 
+      }
214 
+      if(val == 37){
215 
+        name = "HDF1000"
216 
+      }
217 
+      if(val == 38){
218 
+        name = "HDF80"
219 
+      }
220 
+      if(val == 39){
221 
+        name = "HF16"
222 
+      }
223 
+      return name
224 
+      },
115 225 
       getlist(){
116 226 
          var params = {
117 227 
           schedule_date:this.$route.query.schedule_date,

+ 121 - 1
src/xt_pages/dialysis/details/consumable/dialysisGood.vue Visa fil 

@@ -91,6 +91,12 @@
91 91 
            </template>
92 92 
         </el-table-column>
93 93
94 
+        <el-table-column  align="center"  width="60" label="透析模式">
95 
+           <template slot-scope="scope">
96 
+            {{getModeId(scope.row.mode_id)}}
97 
+           </template>
98 
+        </el-table-column>
99 
+
94 100 
         <el-table-column
95 101 
           align="center"
96 102 
           prop="name"
 
@@ -172,6 +178,12 @@
172 178 
            </template>
173 179 
         </el-table-column>
174 180
181 
+        <el-table-column  align="center"  width="60" label="透析模式">
182 
+           <template slot-scope="scope">
183 
+            {{getModeId(scope.row.mode_id)}}
184 
+           </template>
185 
+        </el-table-column>
186 
+
175 187 
         <el-table-column
176 188 
           align="center"
177 189 
           prop="name"
 
@@ -524,7 +536,115 @@
524 536 
       this.getlist()
525 537 
     },
526 538 
     methods: {
527 
-
539 
+     getModeId(val){
540 
+      var name =""
541 
+      if(val == 1){
542 
+        name ="HD"
543 
+      }
544 
+      if(val == 2){
545 
+        name ="HDF"
546 
+      }
547 
+      if(val == 3){
548 
+        name ="HD+HP"
549 
+      }
550 
+      if(val == 4){
551 
+        name ="HP"
552 
+      }
553 
+      if(val == 5){
554 
+        name ="HF"
555 
+      }
556 
+      if(val == 6){
557 
+        name ="SCUF"
558 
+      }
559 
+      if(val == 7){
560 
+        name ="IUF"
561 
+      }
562 
+      if(val == 8){
563 
+        name ="IUF"
564 
+      }
565 
+      if(val == 9){
566 
+        name ="HFHD+HP"
567 
+      }
568 
+      if(val == 10){
569 
+        name ="PHF"
570 
+      }
571 
+      if(val == 11){
572 
+        name ="HFR"
573 
+      }
574 
+      if(val == 12){
575 
+        name ="HDF+HP"
576 
+      }
577 
+      if(val == 13){
578 
+        name ="CRRT"
579 
+      }
580 
+      if(val == 14){
581 
+        name ="腹水回输"
582 
+      }
583 
+      if(val == 19){
584 
+        name ="IUF+HD"
585 
+      }
586 
+      if(val == 20){
587 
+        name ="UF"
588 
+      }
589 
+      if(val == 21){
590 
+        name ="HD+"
591 
+      }
592 
+      if(val == 22){
593 
+        name ="血浆胆红素吸附+HDF"
594 
+      }
595 
+      if(val == 23){
596 
+        name ="血浆胆红素吸附"
597 
+      }
598 
+      if(val == 24){
599 
+        name ="I-HDF"
600 
+      }
601 
+      if(val == 25){
602 
+        name ="HD高通"
603 
+      }
604 
+      if(val == 26){
605 
+        name ="CVVH"
606 
+      }
607 
+      if(val == 27){
608 
+        name ="CVVHD"
609 
+      }
610 
+      if(val == 28){
611 
+        name ="CVVHDF"
612 
+      }
613 
+      if(val == 29){
614 
+        name ="PE"
615 
+      }
616 
+      if(val == 30){
617 
+        name ="血浆胆红素吸附+HP"
618 
+      }
619 
+      if(val == 31){
620 
+        name ="HPD"
621 
+      }
622 
+      if(val == 32){
623 
+        name ="HDP"
624 
+      }
625 
+      if(val == 33){
626 
+        name = "HFD"
627 
+      }
628 
+      if(val == 34){
629 
+        name = "HDF100"
630 
+      }
631 
+      if(val == 35){
632 
+        name = "HDF600"
633 
+      }
634 
+      if(val == 36){
635 
+        name = "HDF800"
636 
+      }
637 
+      if(val == 37){
638 
+        name = "HDF1000"
639 
+      }
640 
+      if(val == 38){
641 
+        name = "HDF80"
642 
+      }
643 
+      if(val == 39){
644 
+        name = "HF16"
645 
+      }
646 
+      return name
647 
+      },
528 648 
       exportList(){
529 649 
         import('@/vendor/Export2Excel').then(excel => {
530 650

+ 113 - 0
src/xt_pages/dialysis/details/consumable/dialysisGoodPrint.vue Visa fil 

@@ -29,6 +29,7 @@
29 29 
                 <td width="100">透析机号</td>
30 30 
                 <td width="100">姓名</td>
31 31 
                 <td width="100">透析号</td>
32 
+                <td width="100">透析模式</td>
32 33 
                 <td width="200" v-for="(item,index) in rowList" :key="index">
33 34 
                   {{item.filed_name_cn}}
34 35 
                 </td>
 
@@ -43,6 +44,7 @@
43 44 
                   </td>
44 45 
                  <td>{{item.patient.name}}</td>
45 46 
                 <td>{{item.patient.dialysis_no}}</td>
47 
+                <td>{{ getModeId(item.mode_id) }}</td>
46 48 
                 <td v-for="(it,index) in rowList" :key="index">
47 49 
                   <!-- {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}} -->
48 50 
                   <span v-if="org_id !=10599">
 
@@ -65,6 +67,7 @@
65 67 
                 <td width="100">透析机号</td>
66 68 
                 <td width="100">姓名</td>
67 69 
                 <td width="100">透析机号</td>
70 
+                <td width="100">透析模式</td>
68 71 
                 <td width="200" v-for="(item,index) in typeList" :key="index">
69 72 
                   {{item.type_name}}
70 73 
                 </td>
 
@@ -78,6 +81,7 @@
78 81 
                   </td>
79 82 
                  <td>{{item.patient.name}}</td>
80 83 
                 <td>{{item.patient.dialysis_no}}</td>
84 
+                <td>{{ getModeId(item.mode_id) }}</td>
81 85 
                 <td v-for="(it,index) in typeList" :key="index">
82 86 
                   <span v-if="item.his_prescription_project.length>0"> {{getStr(item.typeList[index].id,item.his_prescription_project,item.patient_id)}}</span>
83 87 
                   <span v-if="item.his_prescription_project.length==0">{{getStr(item.typeList[index].id,item.projectList,item.patient_id)}}</span>
 
@@ -159,6 +163,115 @@
159 163 
       this.getlist()
160 164 
     },
161 165 
     methods: {
166 
+     getModeId(val){
167 
+      var name =""
168 
+      if(val == 1){
169 
+        name ="HD"
170 
+      }
171 
+      if(val == 2){
172 
+        name ="HDF"
173 
+      }
174 
+      if(val == 3){
175 
+        name ="HD+HP"
176 
+      }
177 
+      if(val == 4){
178 
+        name ="HP"
179 
+      }
180 
+      if(val == 5){
181 
+        name ="HF"
182 
+      }
183 
+      if(val == 6){
184 
+        name ="SCUF"
185 
+      }
186 
+      if(val == 7){
187 
+        name ="IUF"
188 
+      }
189 
+      if(val == 8){
190 
+        name ="IUF"
191 
+      }
192 
+      if(val == 9){
193 
+        name ="HFHD+HP"
194 
+      }
195 
+      if(val == 10){
196 
+        name ="PHF"
197 
+      }
198 
+      if(val == 11){
199 
+        name ="HFR"
200 
+      }
201 
+      if(val == 12){
202 
+        name ="HDF+HP"
203 
+      }
204 
+      if(val == 13){
205 
+        name ="CRRT"
206 
+      }
207 
+      if(val == 14){
208 
+        name ="腹水回输"
209 
+      }
210 
+      if(val == 19){
211 
+        name ="IUF+HD"
212 
+      }
213 
+      if(val == 20){
214 
+        name ="UF"
215 
+      }
216 
+      if(val == 21){
217 
+        name ="HD+"
218 
+      }
219 
+      if(val == 22){
220 
+        name ="血浆胆红素吸附+HDF"
221 
+      }
222 
+      if(val == 23){
223 
+        name ="血浆胆红素吸附"
224 
+      }
225 
+      if(val == 24){
226 
+        name ="I-HDF"
227 
+      }
228 
+      if(val == 25){
229 
+        name ="HD高通"
230 
+      }
231 
+      if(val == 26){
232 
+        name ="CVVH"
233 
+      }
234 
+      if(val == 27){
235 
+        name ="CVVHD"
236 
+      }
237 
+      if(val == 28){
238 
+        name ="CVVHDF"
239 
+      }
240 
+      if(val == 29){
241 
+        name ="PE"
242 
+      }
243 
+      if(val == 30){
244 
+        name ="血浆胆红素吸附+HP"
245 
+      }
246 
+      if(val == 31){
247 
+        name ="HPD"
248 
+      }
249 
+      if(val == 32){
250 
+        name ="HDP"
251 
+      }
252 
+      if(val == 33){
253 
+        name = "HFD"
254 
+      }
255 
+      if(val == 34){
256 
+        name = "HDF100"
257 
+      }
258 
+      if(val == 35){
259 
+        name = "HDF600"
260 
+      }
261 
+      if(val == 36){
262 
+        name = "HDF800"
263 
+      }
264 
+      if(val == 37){
265 
+        name = "HDF1000"
266 
+      }
267 
+      if(val == 38){
268 
+        name = "HDF80"
269 
+      }
270 
+      if(val == 39){
271 
+        name = "HF16"
272 
+      }
273 
+      return name
274 
+      },
162 275 
      getlist(){
163 276 
       var params = {
164 277 
         keywords:this.$route.query.keywords,

+ 1 - 1
src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue Visa fil 

@@ -30,7 +30,7 @@
30 30 
           <el-col :span="8" v-if="isShow('实际超滤量')">
31 31 
             <el-form-item
32 32 
               label="实际超滤量(ml): " :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')"
33 
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10558 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10693"  >
33 
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10558 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10693  || this.$store.getters.xt_user.template_info.org_id == 10697"  >
34 34 
               <el-input v-model="form.actual_ultrafiltration"></el-input>
35 35 
             </el-form-item>
36 36 
             <el-form-item label="实际超滤量(L): " v-else :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')">

+ 7 - 1
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Visa fil 

@@ -12,9 +12,10 @@
12 12 
             <el-button style="position: absolute;left: 12%;top: 2%" @click="handlePatientInfo(patient.id)">{{ patient.name }}</el-button>
13 13
14 14 
             <span style="position: absolute;left: 20%;top: 3%">
15 
-              透前体重：{{predialysis&&predialysis.weight_before?predialysis.weight_before:"" }} kg
15 
+              透前称重：{{predialysis&&predialysis.weight_before?predialysis.weight_before:"" }} kg
16 16
17 17 
             </span>
18 
+
18 19 
             <span style="position: absolute;left: 30%;top: 3%">
19 20 
               干体重：{{predialysis&&predialysis.dry_weight?predialysis.dry_weight:""}}kg
20 21 
             </span>
 
@@ -33,6 +34,11 @@
33 34 
             <span style="position: absolute;left: 70%;top: 3%">
34 35 
               透前血压:  {{predialysis&&predialysis.systolic_blood_pressure?predialysis.systolic_blood_pressure:""  }} / {{ predialysis&&predialysis.diastolic_blood_pressure?predialysis.diastolic_blood_pressure:"" }} mmHg
35 36 
             </span>
37 
+
38 
+            <!-- <span style="position: absolute;left: 20%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id ==10702">
39 
+              透前体重：{{predialysis&&(predialysis.weight_before - predialysis.additional_weight).toFixed(2)?(predialysis.weight_before-predialysis.additional_weight).toFixed(2):"" }} kg
40 
+
41 
+            </span> -->
36 42 
             <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
37 43 
             <el-form
38 44 
                     ref="dialysisPrescription"

+ 14 - 13
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue Visa fil 

@@ -387,7 +387,7 @@
387 387 
                 org_id == 10599 ||
388 388 
                 org_id == 10612 ||
389 389 
                 org_id == 10617 ||
390 
-                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667) &&
390 
+                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697) &&
391 391 
                 org_id!=10387
392 392 
             "
393 393 
           >
 
@@ -458,7 +458,7 @@
458 458 
               && org_id!=10432 && org_id!=10445
459 459 
               && org_id!=10410 && org_id!=10495 &&
460 460 
                org_id!=10485 && org_id!=10395 && org_id!=10375
461 
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667)
461 
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697)
462 462 
               || org_id == 10387
463 463 
             "
464 464 
           >
 
@@ -529,7 +529,7 @@
529 529 
                 org_id == 10410 ||
530 530 
                 org_id == 10495  ||
531 531 
                 org_id == 10395
532 
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693)
532 
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697)
533 533 
                 && org_id!=10387
534 534 
             "
535 535 
           >
 
@@ -584,7 +584,7 @@
584 584 
               org_id!=10432 &&
585 585 
               org_id!=10445 &&
586 586 
               org_id!=10410 && org_id!=10495
587 
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693) ||
587 
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697) ||
588 588 
               org_id == 10387
589 589 
             "
590 590 
           >
 
@@ -844,7 +844,7 @@
844 844 
           <el-table-column
845 845 
             prop="displacement_quantity"
846 846 
             align="center"
847 
-            label="置换量(ml)"
847 
+            label="置换量(L)"
848 848 
             width="100"
849 849 
             v-if="isShow('置换量1')"
850 850 
           >
 
@@ -1681,7 +1681,7 @@
1681 1681 
                 org_id== 10432 ||
1682 1682 
                 org_id== 10445 ||
1683 1683 
                 org_id== 10410 ||
1684 
-                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693) &&
1684 
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697) &&
1685 1685 
                 org_id!=10387
1686 1686 
             "
1687 1687 
           >
 
@@ -1729,7 +1729,7 @@
1729 1729 
               org_id!=10445 &&
1730 1730 
               org_id!=10410 &&
1731 1731 
               org_id!=10485 &&
1732 
-              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693)
1732 
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697)
1733 1733 
               || org_id == 10387
1734 1734 
             "
1735 1735 
           >
 
@@ -1802,8 +1802,8 @@
1802 1802 
                 org_id == 10599 ||
1803 1803 
                 org_id ==10612 ||
1804 1804 
                 org_id ==10617 ||
1805 
-                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693)
1806 
-                && org_id!=10387 && org_id!=10694 && org_id!=10697
1805 
+                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697)
1806 
+                && org_id!=10387 && org_id!=10694
1807 1807 
             "
1808 1808 
           >
1809 1809 
             <el-form-item label="超滤量(ml)：" :prop="isName('超滤量')"
 
@@ -1872,9 +1872,10 @@
1872 1872 
               org_id!=10629 &&
1873 1873 
               org_id!=10677 &&
1874 1874 
               org_id!=10667 &&
1875 
-              org_id!=10693
1875 
+              org_id!=10693 &&
1876 
+              org_id!=10697
1876 1877 
               )
1877 
-              || org_id == 10387 || org_id == 10694 || org_id==10697
1878 
+              || org_id == 10387 || org_id == 10694
1878 1879 
             "
1879 1880 
           >
1880 1881 
             <el-form-item label="超滤量(L)：" :prop="isName('超滤量')"
 
@@ -2046,8 +2047,8 @@
2046 2047 
             </el-form-item>
2047 2048 
           </el-col>
2048 2049
2049 
-          <el-col :span="8" v-if="isShow('置换量1') && template_id == 43">
2050 
-            <el-form-item label="置换量(ml)：" :prop="isName('置换量')"
2050 
+          <el-col :span="8" v-if="isShow('置换量1')">
2051 
+            <el-form-item label="置换量(L)：" :prop="isName('置换量')"
2051 2052 
               :rules="isCheckmust('置换量')">
2052 2053 
               <el-input v-model="form.displacement_quantity_one"></el-input>
2053 2054 
             </el-form-item>

+ 5 - 5
src/xt_pages/dialysis/details/dialysisMonitoring.vue Visa fil 

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

+ 138 - 16
src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue Visa fil 

@@ -292,35 +292,85 @@
292 292 
             <td style="text-align:left;" colspan="1">
293 293 
               <span style="display:inline-block;margin-left:15px;">
294 294 
                 <span
295 
-                  v-if="orderForm.url === ''"
296 295 
                   style="display:flex;align-items:center;"
297 
-                >责任护士:{{ orderForm.start_nurse }}</span>
296 
+                >责任护士:
298 297 
                 <span
299 
-                  v-if="orderForm.url !== ''"
300 
-                  style="display:flex;align-items:center;height:36px;"
298 
+                  style="height: 30px; display: inline-block"
299 
+                  v-if="
300 
+                    setAdminUserES(
301 
+                      dialysisOrder == null
302 
+                        ? 0
303 
+                        : dialysisOrder.start_nurse
304 
+                    ) == ''
305 
+                  "
301 306 
                 >
302 
-                  责任护士:
303 
-                  <img :src="orderForm.url" style="height:30px;" />
307 
+                  {{
308 
+                    getAdminUser(
309 
+                      dialysisOrder == null
310 
+                        ? 0
311 
+                        : dialysisOrder.start_nurse
312 
+                    )
313 
+                  }}</span
314 
+                >
315 
+                <img
316 
+                  style="height: 30px"
317 
+                  :src="
318 
+                    setAdminUserES(
319 
+                      dialysisOrder == null
320 
+                        ? 0
321 
+                        : dialysisOrder.start_nurse
322 
+                    )
323 
+                  "
324 
+                  alt=""
325 
+                  srcset=""
326 
+                  v-else
327 
+                />
328 
+
304 329 
                 </span>
305 330 
               </span>
306 331 
             </td>
307 332 
             <td style="text-align:left;" colspan="1">
308 333 
               <span style="display:inline-block;margin-left:15px;">
309 334 
                 <span
310 
-                  v-if="orderForm.url === ''"
311 335 
                   style="display:flex;align-items:center;"
312 
-                >上机护士:{{ orderForm.start_nurse }}</span>
336 
+                >上机护士:
313 337 
                 <span
314 
-                  v-if="orderForm.url !== ''"
315 
-                  style="display:flex;align-items:center;height:36px;"
338 
+                  style="height: 30px; display: inline-block"
339 
+                  v-if="
340 
+                    setAdminUserES(
341 
+                      dialysisOrder == null
342 
+                        ? 0
343 
+                        : dialysisOrder.start_nurse
344 
+                    ) == ''
345 
+                  "
316 346 
                 >
317 
-                  上机护士:
318 
-                  <img :src="orderForm.url" style="height:30px;" />
347 
+                  {{
348 
+                    getAdminUser(
349 
+                      dialysisOrder == null
350 
+                        ? 0
351 
+                        : dialysisOrder.start_nurse
352 
+                    )
353 
+                  }}</span
354 
+                >
355 
+                <img
356 
+                  style="height: 30px"
357 
+                  :src="
358 
+                    setAdminUserES(
359 
+                      dialysisOrder == null
360 
+                        ? 0
361 
+                        : dialysisOrder.start_nurse
362 
+                    )
363 
+                  "
364 
+                  alt=""
365 
+                  srcset=""
366 
+                  v-else
367 
+                />
368 
+
319 369 
                 </span>
320 370 
               </span>
321 371 
             </td>
322 372 
             <td style="text-align:left;" colspan="3">
323 
-              <span style="display:inline-block;margin-left:15px;">
373 
+              <!-- <span style="display:inline-block;margin-left:15px;">
324 374 
                 <span
325 375 
                   v-if="orderForm.url === ''"
326 376 
                   style="display:flex;align-items:center;"
 
@@ -332,6 +382,45 @@
332 382 
                   抗凝剂执行护士:
333 383 
                   <img :src="orderForm.url" style="height:30px;" />
334 384 
                 </span>
385 
+              </span> -->
386 
+
387 
+              <span style="display:inline-block;margin-left:15px;">
388 
+                <span
389 
+                  style="display:flex;align-items:center;"
390 
+                >抗凝剂执行护士:
391 
+                <span
392 
+                  style="height: 30px; display: inline-block"
393 
+                  v-if="
394 
+                    setAdminUserES(
395 
+                      dialysisOrder == null
396 
+                        ? 0
397 
+                        : dialysisOrder.start_nurse
398 
+                    ) == ''
399 
+                  "
400 
+                >
401 
+                  {{
402 
+                    getAdminUser(
403 
+                      dialysisOrder == null
404 
+                        ? 0
405 
+                        : dialysisOrder.start_nurse
406 
+                    )
407 
+                  }}</span
408 
+                >
409 
+                <img
410 
+                  style="height: 30px"
411 
+                  :src="
412 
+                    setAdminUserES(
413 
+                      dialysisOrder == null
414 
+                        ? 0
415 
+                        : dialysisOrder.start_nurse
416 
+                    )
417 
+                  "
418 
+                  alt=""
419 
+                  srcset=""
420 
+                  v-else
421 
+                />
422 
+
423 
+                </span>
335 424 
               </span>
336 425 
             </td>
337 426 
             <td style="text-align:left;" colspan="3">
 
@@ -997,16 +1086,49 @@
997 1086 
             <td style="text-align:left;" colspan="3">
998 1087 
               <span>
999 1088 
                 <span
1000 
-                  v-if="finshForm.url === ''"
1001 1089 
                   style="display:flex;align-items:center;height:36px;"
1002 
-                >下机护士:{{ finshForm.finish_nurse }}</span>
1090 
+                >下机护士:
1091 
+
1003 1092 
                 <span
1093 
+                    style="height: 30px; display: inline-block"
1094 
+                          v-if="
1095 
+                            setAdminUserES(
1096 
+                              dialysisOrder == null
1097 
+                                ? 0
1098 
+                                : dialysisOrder.start_nurse
1099 
+                            ) == ''
1100 
+                          "
1101 
+                        >
1102 
+                          {{
1103 
+                            getAdminUser(
1104 
+                              dialysisOrder == null
1105 
+                                ? 0
1106 
+                                : dialysisOrder.start_nurse
1107 
+                            )
1108 
+                          }}</span
1109 
+                        >
1110 
+                        <img
1111 
+                          style="height: 30px"
1112 
+                          :src="
1113 
+                            setAdminUserES(
1114 
+                              dialysisOrder == null
1115 
+                                ? 0
1116 
+                                : dialysisOrder.start_nurse
1117 
+                            )
1118 
+                          "
1119 
+                          alt=""
1120 
+                          srcset=""
1121 
+                          v-else
1122 
+                        />
1123 
+                </span>
1124 
+
1125 
+                <!-- <span
1004 1126 
                   v-if="finshForm.url !== ''"
1005 1127 
                   style="display:flex;align-items:center;height:36px;"
1006 1128 
                 >
1007 1129 
                   下机护士:
1008 1130 
                   <img :src="finshForm.url" style="height:30px;" />
1009 
-                </span>
1131 
+                </span> -->
1010 1132 
               </span>
1011 1133 
             </td>
1012 1134 
           </tr>

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderSeventysix.vue Visa fil 

@@ -1140,7 +1140,7 @@
1140 1140 
                               : "mmHg"
1141 1141 
                           }})
1142 1142 
                         </td>
1143 
-                        <td width="50">超滤量<br/>L</td>
1143 
+                        <td width="50">超滤量<br/>ml</td>
1144 1144 
                         <td width="200">病情变化及处理</td>
1145 1145 
                       </tr>
1146 1146

+ 49 - 5
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue Visa fil 

@@ -1855,9 +1855,13 @@
1855 1855 
                               <span v-if="org_id !=10617">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
1856 1856 
                            </span>
1857 1857 
                         </td>
1858 
-                        <td width="50" v-if="org_id == 10600 || org_id == 10598 || org_id==10644 || org_id == 10683"><br/>
1859 
-                           <span v-if="org_id!=10644">{{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: ""}}</span>
1860 
-                           <span v-if="org_id==10644">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
1858 
+                        <td width="50" v-if="org_id == 10600 || org_id == 10598 || org_id==10644 || org_id == 10683 || org_id == 0"><br/>
1859 
+                           <span v-if="org_id!=10644 && org_id!=0">{{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: ""}}</span>
1860 
+                           <span v-if="org_id==10644 || org_id == 0">
1861 
+                              <span v-if="monindex == 0">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
1862 
+                              <span v-if="monindex == monitors.length-1">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
1863 
+                              <span v-if="(monindex != monitors.length-1 && monindex != 0)">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
1864 
+                           </span>
1861 1865 
                           </td>
1862 1866 
                         <td
1863 1867 
                           v-if="
 
@@ -3363,8 +3367,8 @@
3363 3367
3364 3368
3365 3369 
                   </div>
3366 
-                  <div v-if="org_id!=0 && org_id!=10440">
3367 
-                    <div class="inline_block" style="flex: 1">
3370 
+                  <div v-if="org_id!=10440">
3371 
+                    <div class="inline_block" style="flex: 1" v-if="predialysis.catheter == ''">
3368 3372 
                       穿刺护士：
3369 3373 
                       <div
3370 3374 
                         class="under_line"
 
@@ -3403,6 +3407,46 @@
3403 3407 
                         />
3404 3408 
                       </div>
3405 3409 
                     </div>
3410 
+
3411 
+                    <div class="inline_block" style="flex: 1" v-if="predialysis.catheter != ''">
3412 
+                      换药护士：
3413 
+                      <div
3414 
+                        class="under_line"
3415 
+                        style="width: 90px; text-align: center"
3416 
+                      >
3417 
+                        <span
3418 
+                          style="height: 30px; display: inline-block"
3419 
+                          v-if="
3420 
+                            setAdminUserES(
3421 
+                              dialysisOrder == null
3422 
+                                ? 0
3423 
+                                : dialysisOrder.change_nurse
3424 
+                            ) == ''
3425 
+                          "
3426 
+                        >
3427 
+                          {{
3428 
+                            getAdminUser(
3429 
+                              dialysisOrder == null
3430 
+                                ? 0
3431 
+                                : dialysisOrder.change_nurse
3432 
+                            )
3433 
+                          }}</span
3434 
+                        >
3435 
+                        <img
3436 
+                          style="height: 35px"
3437 
+                          :src="
3438 
+                            setAdminUserES(
3439 
+                              dialysisOrder == null
3440 
+                                ? 0
3441 
+                                : dialysisOrder.change_nurse
3442 
+                            )
3443 
+                          "
3444 
+                          alt=""
3445 
+                          srcset=""
3446 
+                          v-else
3447 
+                        />
3448 
+                      </div>
3449 
+                    </div>
3406 3450 
                   </div>
3407 3451
3408 3452 
                   <div v-if="org_id==0||org_id==10440">

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue Visa fil 

@@ -612,7 +612,7 @@
612 612 
                 </td>
613 613 
                 <!--  -->
614 614 
                 <td width="65" v-if="prescription.mode == 'HDF'">
615 
-                  {{monitor.displacement_quantity ? monitor.displacement_quantity : '/'}}
615 
+                  {{monitor.displacement_quantity_one ? monitor.displacement_quantity_one : '/'}}
616 616 
                 </td>
617 617 
                 <td width="200">
618 618 
                   <template v-if=" (dialysisOrder && monitor.operate_time == dialysisOrder.start_time)">

+ 3 - 2
src/xt_pages/hospitalStation/summary.vue Visa fil 

@@ -365,13 +365,13 @@
365 365 
         :invoiceParams="invoiceParams"
366 366 
       ></shou-ju-print>
367 367 
     </el-dialog>
368 
-    <!-- <el-dialog
368 
+   <el-dialog
369 369 
                 class="centerDialog"
370 370 
                 width="1200px"
371 371 
                 title="打印"
372 372 
                 :visible.sync="settlementVisible">
373 373 
             <settlement-print ref="print" :paramsObj='orderObj'></settlement-print>
374 
-        </el-dialog> -->
374 
+        </el-dialog>
375 375
376 376
377 377 
     <el-dialog
 
@@ -1081,6 +1081,7 @@ export default {
1081 1081 
         start_time: this.start_time,
1082 1082 
         end_time: this.end_time,
1083 1083 
         p_type: this.p_type,
1084 
+        sort_type:this.sort_type,
1084 1085 
       };
1085 1086 
       getExportConsumeDetailList(params).then((response) => {
1086 1087 
         if (response.data.state == 0) {

+ 4 - 1
src/xt_pages/medicalScheduling/index.vue Visa fil 

@@ -684,6 +684,7 @@ export default {
684 684 
             }
685 685 
             this.weekNum = this.weekNum - 1
686 686 
             this.getNextWeekList()
687 
+            this.getStaffScheduleRemarkList()
687 688 
         },
688 689 
             //下一周
689 690 
         nextclick(){
 
@@ -698,6 +699,7 @@ export default {
698 699 
                 this.nowYear = this.nowYear + 1
699 700 
             }
700 701 
             this.getNextWeekList()
702 
+            this.getStaffScheduleRemarkList()
701 703 
         },
702 704
703 705 
         getYearWeek(year,month,date){
 
@@ -1355,7 +1357,8 @@ export default {
1355 1357 
                                 user_type:staffList[i].doctor_type,
1356 1358 
                                 is_sort:staffList[i].is_sort,
1357 1359 
                                 sort:staffList[i].sort,
1358 
-                                list: [{class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes}]
1360 
+                                list: [{class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes}],
1361 
+                                remark:staffList[i].remark
1359 1362 
                             })
1360 1363 
                             tempArr.push(staffList[i].user_name);
1361 1364 
                         } else {

+ 22 - 1
src/xt_pages/workforce/remind_print_setting_two.vue Visa fil 

@@ -665,7 +665,7 @@
665 665 
         name ="HFHD+HP"
666 666 
       }
667 667 
       if(val == 10){
668 
-        name ="HFHD+HP"
668 
+        name ="PHF"
669 669 
       }
670 670 
       if(val == 11){
671 671 
         name ="HFR"
 
@@ -721,6 +721,27 @@
721 721 
       if(val == 32){
722 722 
         name ="HDP"
723 723 
       }
724 
+      if(val == 33){
725 
+        name = "HFD"
726 
+      }
727 
+      if(val == 34){
728 
+        name = "HDF100"
729 
+      }
730 
+      if(val == 35){
731 
+        name = "HDF600"
732 
+      }
733 
+      if(val == 36){
734 
+        name = "HDF800"
735 
+      }
736 
+      if(val == 37){
737 
+        name = "HDF1000"
738 
+      }
739 
+      if(val == 38){
740 
+        name = "HDF80"
741 
+      }
742 
+      if(val == 39){
743 
+        name = "HF16"
744 
+      }
724 745 
       return name
725 746 
       },
726 747 
       getBloodAccess(id){