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

src/xt_pages/dialysis/details/consumable/dialysisParameter.vue

              
               
               this.list[i].anticoagulant_one=""
-              this.list[i].anticoagulant_one = (this.getAnticoagualnt(this.list[i].dialysis_solution.anticoagulant)) + "(" + (this.list[i].dialysis_solution.anticoagulant_shouji) +")" + "("+(this.list[i].dialysis_solution.anticoagulant_weichi) +")"+"("+(this.list[i].dialysis_solution.anticoagulant_zongliang)+")"
+              if(this.list[i].dialysis_prescription.anticoagulant == ''){
+                this.list[i].anticoagulant_one = (this.getAnticoagualnt(this.list[i].dialysis_solution.anticoagulant)) + "(" + (this.list[i].dialysis_solution.anticoagulant_shouji) +")" + "("+(this.list[i].dialysis_solution.anticoagulant_weichi) +")"+"("+(this.list[i].dialysis_solution.anticoagulant_zongliang)+")"
+              }
+
+              if(this.list[i].dialysis_prescription.anticoagulant != ''){
+                this.list[i].anticoagulant_one = (this.getAnticoagualnt(this.list[i].dialysis_prescription.anticoagulant)) + "(" + (this.list[i].dialysis_prescription.anticoagulant_shouji) +")" + "("+(this.list[i].dialysis_prescription.anticoagulant_weichi) +")"+"("+(this.list[i].dialysis_prescription.anticoagulant_zongliang)+")"
+              }
+             
              
               this.list[i].dialysis_time = this.list[i].dialysis_solution.dialysis_duration_hour?this.list[i].dialysis_solution.dialysis_duration_hour:"" + "时"+ this.list[i].dialysis_solution.dialysis_duration_minute?this.list[i].dialysis_solution.dialysis_duration_minute:"" + "分"
               if(this.list[i].dialysis_time == 0){
                this.list[i].dialysis_time = ""
               }
               this.list[i].device_type = this.list[i].assessment_befor_dislysis.machine_type
+
               this.list[i].dialyzer_perfusion_apparatus = this.list[i].dialysis_solution.dialyzer_perfusion_apparatus
-              this.list[i].dialysis_dialyszers = this.list[i].dialysis_solution.dialysis_dialyszers
-              this.list[i].dialysis_irrigation = this.list[i].dialysis_solution.dialysis_irrigation
-              this.list[i].displace_liqui_part = this.getDisplaceLiquiPart(this.list[i].dialysis_solution.displace_liqui_part)
+              if(this.list[i].dialysis_prescription.dialysis_dialyszers == ""){
+                this.list[i].dialysis_dialyszers = this.list[i].dialysis_solution.dialysis_dialyszers
+              }
+              if(this.list[i].dialysis_prescription.dialysis_dialyszers != ""){
+                this.list[i].dialysis_dialyszers = this.list[i].dialysis_prescription.dialysis_dialyszers
+              }
+
+              if(this.list[i].dialysis_prescription.dialysis_irrigation == ""){
+                this.list[i].dialysis_irrigation = this.list[i].dialysis_solution.dialysis_irrigation
+              }
+              if(this.list[i].dialysis_prescription.dialysis_irrigation != ""){
+                this.list[i].dialysis_irrigation = this.list[i].dialysis_prescription.dialysis_irrigation
+              }
+             
+              if(this.list[i].dialysis_prescription.displace_liqui_part==""){
+                this.list[i].displace_liqui_part = this.getDisplaceLiquiPart(this.list[i].dialysis_solution.displace_liqui_part)
+              }
+
+              if(this.list[i].dialysis_prescription.displace_liqui_part!=""){
+                this.list[i].displace_liqui_part = this.getDisplaceLiquiPart(this.list[i].dialysis_prescription.displace_liqui_part)
+              }
+            
+           
               this.list[i].displace_liqui_value = this.list[i].dialysis_solution.displace_liqui_value? this.list[i].dialysis_solution.displace_liqui_value:""
               this.list[i].kalium = this.list[i].dialysis_solution.kalium?this.list[i].dialysis_solution.kalium:""
               this.list[i].sodium = this.list[i].dialysis_solution.sodium?this.list[i].dialysis_solution.sodium:""

src/xt_pages/management/home.vue

           { id: 0, name: '请选择' },
           { id: 1, name: '20%柠檬酸' },
           { id: 2, name: '50%柠檬酸' },
-          { id: 3, name: '次氯酸钠' }
+          { id: 3, name: '次氯酸钠' },
+          { id: 4, name: '25%柠檬酸' },
         ],
         germs: [
           { id: 0, name: '请选择' },

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

                 that.$message({ message: '挂号成功', type: 'success', duration: 5000 })
                 that.$refs.register.hide()
                 that.loadingone = false
+                this.CheckHISPatient(that.record_date,that.patientInfo.id)
+
               }
             }
           })

src/xt_pages/outpatientCharges/statementPrint.vue

               that.info['order_infos'] = response.data.data.order_infos
               that.info['diagnosis'] = response.data.data.diagnosis
               that.info['his'] = response.data.data.his
+              that.info['dia_config'] = response.data.data.dia_config
+
 
               for (let i = 0; i < response.data.data.order_infos.length; i++) {
                 if (response.data.data.order_infos[i].advice_id > 0 && response.data.data.order_infos[i].project_id == 0) {
                   response.data.data.otherInscpTotal
                 that.info['otherSelfTotal'] =
                   response.data.data.otherSelfTotal
-
+                that.info['dia_config'] = response.data.data.dia_config
 
                 //org_id 10485,此代码为阳春恒健血液透析中心结算单模版数据处理逻辑
                 var list = []

src/xt_pages/outpatientCharges/summary.vue

                 </tr>
                 <tr>
                   <td>起始单号:</td>
-                  <td>{{tableData2.length > 0&&tableData2[0].number}}</td>
+                  <td v-if="tableData2.length > 0">{{tableData2[0].number}}</td>
+                  <td v-else></td>
                   <td>终止单号:</td>
-                  <td>{{tableData2.length > 0&&tableData2[tableData2.length-1].number}}</td>
+                  <td v-if="tableData2.length > 0">{{tableData2[tableData2.length-1].number}}</td>
+                  <td v-else></td>
                   <td>缴款人员:</td>
                   <td>{{staff}}</td>
                 </tr>