Bladeren bron

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

yq1 1 jaar geleden
bovenliggende
commit
0b666908ce

+ 5 - 1
src/xt_pages/dialysis/longSignPrint.vue Bestand weergeven

24
                             
24
                             
25
                             </span> 
25
                             </span> 
26
                             </div>  
26
                             </div>  
27
-                            <div v-if="org_id ==0 || org_id == 10138 || org_id == 10278">
27
+                            <div v-if="org_id == 10138 || org_id == 10278">
28
                             规格:{{getSpecialName(it.drug_id)}} 
28
                             规格:{{getSpecialName(it.drug_id)}} 
29
                             
29
                             
30
+                            </div>  
31
+                            <div v-if="org_id == 0 || org_id == 10223">
32
+                            规格:{{it.advice_desc}} {{ it.drug_spec_unit }}
33
+                            
30
                             </div>  
34
                             </div>  
31
                             <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
35
                             <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
32
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{it.execution_frequency}}</div>  
36
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{it.execution_frequency}}</div>  

+ 1 - 1
src/xt_pages/dialysis/signPrint.vue Bestand weergeven

29
                             
29
                             
30
                             </div> 
30
                             </div> 
31
                             <div v-if="org_id ==0 || org_id ==10223">
31
                             <div v-if="org_id ==0 || org_id ==10223">
32
-                                规格:{{it.advice_desc }}
32
+                                规格:{{it.advice_desc }} {{ it.drug_spec_unit }}
33
                             </div> 
33
                             </div> 
34
                             <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
34
                             <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
35
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{it.execution_frequency}}</div>  
35
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{it.execution_frequency}}</div>  

+ 2 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue Bestand weergeven

1186
                           setAdminUserES(
1186
                           setAdminUserES(
1187
                             prescription == null
1187
                             prescription == null
1188
                               ? 0
1188
                               ? 0
1189
-                              : prescription.prescription_doctor
1190
-                              ? prescription.prescription_doctor
1189
+                              : prescription.creater
1190
+                              ? prescription.creater
1191
                               : ''
1191
                               : ''
1192
                           )
1192
                           )
1193
                         "
1193
                         "

+ 8 - 8
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue Bestand weergeven

1165
                       </div>
1165
                       </div>
1166
                       mmol/L
1166
                       mmol/L
1167
                     </div>
1167
                     </div>
1168
-                    <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10478 && org_id!=10598">
1168
+                    <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10478">
1169
                       碳酸氢根:
1169
                       碳酸氢根:
1170
                       <div
1170
                       <div
1171
                         class="under_line"
1171
                         class="under_line"
1177
                       </div>
1177
                       </div>
1178
                       mmol/L
1178
                       mmol/L
1179
                     </div>
1179
                     </div>
1180
-                    <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10478&&org_id!=10598">
1181
-                      流量:
1180
+                    <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10478">
1181
+                      透析液流量:
1182
                       <div
1182
                       <div
1183
                         class="under_line"
1183
                         class="under_line"
1184
                         style="width: 50px; text-align: center"
1184
                         style="width: 50px; text-align: center"
1533
                         <td width="50">脉搏<br />(次/分)</td>
1533
                         <td width="50">脉搏<br />(次/分)</td>
1534
                         <td width="50" v-if="org_id!=10489">呼吸<br />(次/分)</td>
1534
                         <td width="50" v-if="org_id!=10489">呼吸<br />(次/分)</td>
1535
                         <td width="50">血流量<br />(ml/min)</td>
1535
                         <td width="50">血流量<br />(ml/min)</td>
1536
-                        <td width="50" v-if="org_id==10478 || org_id == 0">
1536
+                        <td width="50" v-if="org_id==10478 || org_id == 10598">
1537
                           动脉压<br />({{
1537
                           动脉压<br />({{
1538
                             monitors[0] &&
1538
                             monitors[0] &&
1539
                             monitors[0]["venous_pressure_type"] == 2
1539
                             monitors[0]["venous_pressure_type"] == 2
1570
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
1570
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
1571
                         <td width="50" v-if="org_id == 10375 || org_id == 0">置换率<br />(ml/h)</td>
1571
                         <td width="50" v-if="org_id == 10375 || org_id == 0">置换率<br />(ml/h)</td>
1572
                         <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 10600">超滤量<br />(ml)</td>
1572
                         <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 10600">超滤量<br />(ml)</td>
1573
-                        <td width="50" v-if="org_id == 10600">超滤率<br/>(ml/h)</td>
1573
+                        <td width="50" v-if="org_id == 10600 || org_id ==10598">超滤率<br/>(ml/h)</td>
1574
                         <td width="50" v-if="org_id ==3877 || org_id == 10449 || org_id ==0">累计超滤量<br />(ml)</td>
1574
                         <td width="50" v-if="org_id ==3877 || org_id == 10449 || org_id ==0">累计超滤量<br />(ml)</td>
1575
                         <td v-if="(prescription.mode_id == 2 ||prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=0 && org_id!=10206" width="50">
1575
                         <td v-if="(prescription.mode_id == 2 ||prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=0 && org_id!=10206" width="50">
1576
                           置换量<br />(ml)
1576
                           置换量<br />(ml)
1592
                         <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
1592
                         <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
1593
                         <td v-if="org_id!=10489">{{monitor.breathing_rate ? monitor.breathing_rate : ""}}</td>
1593
                         <td v-if="org_id!=10489">{{monitor.breathing_rate ? monitor.breathing_rate : ""}}</td>
1594
                         <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
1594
                         <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
1595
-                        <td v-if="org_id ==10478">
1595
+                        <td v-if="org_id ==10478 || org_id == 10598">
1596
                           {{
1596
                           {{
1597
                             monitor.arterial_pressure
1597
                             monitor.arterial_pressure
1598
                               ? monitor.arterial_pressure
1598
                               ? monitor.arterial_pressure
1686
                           <span v-if="org_id!=9671 && org_id!=10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
1686
                           <span v-if="org_id!=9671 && org_id!=10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
1687
                           <span v-if="org_id==9671 || org_id==10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
1687
                           <span v-if="org_id==9671 || org_id==10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
1688
                         </td>
1688
                         </td>
1689
-                        <td width="50" v-if="org_id == 10600"><br/> {{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: "0"}}</td>
1689
+                        <td width="50" v-if="org_id == 10600 || org_id == 10598"><br/> {{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: "0"}}</td>
1690
                         <td
1690
                         <td
1691
                           v-if="
1691
                           v-if="
1692
                             (prescription.mode_id == 2 ||
1692
                             (prescription.mode_id == 2 ||
1769
                                   monitor.operate_time ==
1769
                                   monitor.operate_time ==
1770
                                     dialysisOrder.start_time)&&(org_id!=10414)
1770
                                     dialysisOrder.start_time)&&(org_id!=10414)
1771
                                 "
1771
                                 "
1772
-                                >【开始透析】
1772
+                                >【开始透析】 <span v-if="org_id ==10598">引血100ml/min</span>
1773
                                 </template>
1773
                                 </template>
1774
 
1774
 
1775
                               {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{
1775
                               {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{

+ 1 - 1
src/xt_pages/stock/stockFlow.vue Bestand weergeven

52
         <span>
52
         <span>
53
           <el-button type="primary" size="small" @click="toExprot">导出</el-button>
53
           <el-button type="primary" size="small" @click="toExprot">导出</el-button>
54
 
54
 
55
-          <!-- <el-button type="primary" size="small" @click="toTongBu">同步</el-button> -->
55
+          <el-button type="primary" size="small" @click="toTongBu">同步</el-button>
56
         </span>
56
         </span>
57
        
57
        
58
       </div>
58
       </div>