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

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -1244,6 +1244,24 @@
                       
                       <span>&nbsp;&nbsp;&nbsp;</span>
                     </div>
+
+                    <div class="row" style="padding: 2px 0; line-height: 23px">
+                        <div class="inline_block">
+                          备注：
+                          <div
+                            class="under_line"
+                            style="width: 150px; text-align: center"
+                          >
+                          {{
+                              record.assessment_before_dislysis &&
+                              record.assessment_before_dislysis.remark
+                                ? record.assessment_before_dislysis.remark
+                                : "/"
+                            }}
+                          </div>
+                        </div>
+                     </div>
+
                   </td>
                 </tr>
                 <tr>

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -1156,6 +1156,24 @@
 
                   </div>
 
+
+                  <div class="row" style="padding: 2px 0; line-height: 23px">
+                    <div class="inline_block">
+                      备注：
+                      <div
+                        class="under_line"
+                        style="width: 600px; text-align: center"
+                      >
+                        {{
+                          predialysis.remark
+                            ? predialysis.remark
+                            : "/"
+                        }}
+                      </div>
+                    </div>
+                  
+                  </div>
+
                   <div class="row" style="padding: 2px 0; line-height: 23px">
                    
                   </div>

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -682,7 +682,7 @@
           label: "港澳地区身份证"
         }],
         medicalCare: [{
-          value: 1,
+          value: 310,
           label: '职工基本医疗保险'
         }, {
           value: 2,
@@ -694,7 +694,7 @@
           value: 4,
           label: "离休人员医疗"
         }, {
-          value: 5,
+          value: 390,
           label: "城乡居民基本医疗保险"
         }, {
           value: 6,