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

src/xt_pages/dialysis/batch_print/batch_print_order_seventyfour.vue

@@ -61,9 +61,9 @@
                     <td colspan="3">
                       <div style="line-height:30px;">
                         上机前病情:
-                        <label-box :isChecked="record.assessment_before_dislysis.symptom_before_dialysis_other==''?true :false" showValue="无特殊"></label-box>&nbsp;
-                        <label-box :isChecked="record.assessment_before_dislysis.symptom_before_dialysis_other!=''?true :false" showValue="出现:"></label-box>
-                        <span>{{record.assessment_before_dislysis.symptom_before_dialysis_other}}</span>
+                        <label-box :isChecked="record.assessment_before_dislysis.symptom_before_dialysis==''?true :false" showValue="无特殊"></label-box>&nbsp;
+                        <label-box :isChecked="record.assessment_before_dislysis.symptom_before_dialysis!=''?true :false" showValue="出现:"></label-box>
+                        <span>{{record.assessment_before_dislysis.symptom_before_dialysis}}</span>
                       </div>
                     </td>
                   </tr>
@@ -228,7 +228,7 @@
                     <td>R<br/>bpm</td>
                     <td>BP<br/>mmHg</td>
                     <td>SpO₂<br/>%</td>
-                    <td>记录</td>
+                    <td width="200">记录</td>
                   </tr>
                   <tr v-for="(monitor, monindex) in record.monitor_records" :key="monindex">
                     <td style="height: 30px;">{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>

src/xt_pages/dialysis/template/DialysisPrintOrderSop.vue

@@ -36,12 +36,12 @@
                 <div style="line-height:30px;">
                   上机前病情:
                   <!-- <span v-if="predialysis.symptom_before_dialysis_other==''"> -->
-                    <label-box :isChecked="predialysis.symptom_before_dialysis_other==''?true :false" showValue="无特殊"></label-box>&nbsp;
-                    <label-box :isChecked="predialysis.symptom_before_dialysis_other!=''?true :false" showValue="出现:"></label-box>
+                    <label-box :isChecked="predialysis.symptom_before_dialysis==''?true :false" showValue="无特殊"></label-box>&nbsp;
+                    <label-box :isChecked="predialysis.symptom_before_dialysis!=''?true :false" showValue="出现:"></label-box>
                   <!-- </span> -->
 
                   <!-- <span>{{predialysis.symptom_before_dialysis}}</span> -->
-                  <span>{{predialysis.symptom_before_dialysis_other}}</span>
+                  <span>{{predialysis.symptom_before_dialysis}}</span>
                 </div>
               </td>
             </tr>
@@ -202,7 +202,7 @@
               <td>BP<br/>mmHg</td>
               <td>SpO₂<br/>%</td>
               <!-- <td>时间</td> -->
-              <td>记录</td>
+              <td width="200">记录</td>
             </tr>
             <tr v-for="(monitor, monindex) in monitors" :key="monindex">
               <td style="height: 30px;">{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1195,14 +1195,13 @@ export default {
         { value: 14, label: '门诊特殊病' },
         { value: '992102', label: '单病种(992102)' },
         { value: '140104', label: '城乡门诊特殊病(140104)' },
+        { value: '1104', label: '省外异地门诊慢特病'},
         { value: '9922', label: '家庭通道' },
         { value: '1111', label: '精一' },
         { value: '1112', label: '精二' },
-        { value: '1112', label: '精二' },
         { value: '999999', label: '自费' },
         { value: '118801', label: '118801' },
 
-
       ], register10721: [
         { value: 11, label: '普通门诊' },
         { value: 14, label: '门诊慢特病(14)' },
@@ -3550,7 +3549,7 @@ export default {
         }
 
         if (this.hisPatientInfo.id_card_type == 1) {
-          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10510 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id !=  10318 && this.$store.getters.xt_user.org_id !=  10210 && this.$store.getters.xt_user.org_id !=  10375 &&  this.$store.getters.xt_user.org_id !=  10480 &&  this.$store.getters.xt_user.org_id !=  10387  &&  this.$store.getters.xt_user.org_id !=  10598 &&  this.$store.getters.xt_user.org_id !=  10721 &&   this.$store.getters.xt_user.org_id !=  10726 &&   this.$store.getters.xt_user.org_id !=  10567 &&  this.$store.getters.xt_user.org_id !=  10697 &&   this.$store.getters.xt_user.org_id !=  10724) {
+          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10510 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id !=  10318 && this.$store.getters.xt_user.org_id !=  10210 && this.$store.getters.xt_user.org_id !=  10375 &&  this.$store.getters.xt_user.org_id !=  10480 &&  this.$store.getters.xt_user.org_id !=  10387  &&  this.$store.getters.xt_user.org_id !=  10598 &&  this.$store.getters.xt_user.org_id !=  10721 &&   this.$store.getters.xt_user.org_id !=  10726 &&   this.$store.getters.xt_user.org_id !=  10567 &&  this.$store.getters.xt_user.org_id !=  10697 &&   this.$store.getters.xt_user.org_id !=  10724 &&   this.$store.getters.xt_user.org_id !=  10571) {
             this.pwdFormVisible = true
             this.pwd = ''
           } else {