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_sixtyeight.vue

                                 {{
                               monitor_record.ultrafiltration_volume
                                 ? monitor_record.ultrafiltration_volume
-                                : ""
+                                : "0"
                             }}
                             </span>
                           </td>

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

               // 长期处方不为空
               if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
                 && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
-                && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid') {
+                && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid'&& key != 'remark') {
                 this.dialysisPrescription[key] =
                   response.data.data.solution[key]
               }
               for (const key in response.data.data.prescription) {
                 if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
                   && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
-                  && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid') {
+                  && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid' && key != 'remark') {
                   this.dialysisPrescription[key] =
                     response.data.data.prescription[key]
                 }
               for (const key in response.data.data.system_prescription) {
                 if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
                   && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
-                  && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid') {
+                  && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid' && key != 'remark') {
                   this.dialysisPrescription[key] =
                     response.data.data.system_prescription[key]
                 }
                 // 临时处方为空
                 if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
                   && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
-                  && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid') {
+                  && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid' && key != 'remark') {
                   this.dialysisPrescription[key] = ''
                 }
               }

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

                 scope.row.is_pressure
                   ? scope.row.is_pressure
                   : ""
-              }}/{{
-                scope.row.is_pressure
-                  ? scope.row.is_pressure
-                  : ""
               }}
             </template>
           </el-table-column>
         : "";
         this.form.replacement_speed = monitor.replacement_speed?monitor.replacement_speed:""
         this.form.dicarbonate = monitor.dicarbonate?monitor.dicarbonate:""
+        this.form.is_pressure = monitor.is_pressure
         // 设置三个下拉框的值，直接调用事件偷懒
         this.symptomTextareaBlur();
         this.disposeTextareaBlur();

src/xt_pages/dialysis/signPrint.vue

                 <div v-for="(item, index) in list" :key="index">
                     <div class="signPrint" v-for="it in item.parent_advice" style="page-break-after: always;">
                        
-                        <div v-if="org_id!=10278">分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
+                        <div>分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
                         <div>姓名:{{item.patient.name}}</div>  
 
                         <div>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                 this.projects[i].execution_time = this.projects[i].execution_time
                 this.projects[i].execution_staff= this.projects[i].execution_staff 
                 this.projects[i].advice_name =  this.projects[i].team.project_team
+                this.projects[i].advice_doctor = this.projects[i].doctor
               
                
                 this.doctor_advices.push(this.projects[i])
                 this.projects[i].single_dose_unit = this.projects[i].unit
                 this.projects[i].execution_time = this.projects[i].execution_time
                 this.projects[i].execution_staff= this.projects[i].execution_staff 
+                this.projects[i].advice_doctor = this.projects[i].doctor
                 this.doctor_advices.push(this.projects[i])
                 // this.doctor_advices_2.push(this.projects[i])
               }

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

                           {{ monitor.replacement_rate? monitor.replacement_rate: ""}}
                         </td>
                         <td>
-                          <span v-if="org_id!=9671 && org_id!=10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
+                          <span v-if="org_id!=9671 && org_id!=10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
                           <span v-if="org_id==9671 || org_id==10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
                         </td>
                         <!-- <td style="width:50px">

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyFour.vue

                           <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
                           <td width="60" style="height:20px;line-height:20px">透析液温度</td>
                           <td width="60" style="height:20px;line-height:20px">电导度<br />ms/cm</td>
-                          <td width="60" style="height:20px;line-height:20px">体温<br />C°</td>
+                          <td width="60" style="height:20px;line-height:20px">血流量<br />ml/min</td>
                           <td width="">病情变化及处理</td>
                           <td width="60" style="height:20px;line-height:20px">签名</td>
                       </tr>
                           <td>&nbsp;{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}</td>
                           <td>&nbsp;{{monitor.dialysate_temperature ? monitor.dialysate_temperature : ''}}</td>
                           <td>&nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
-                          <td>&nbsp;{{ monitor.temperature ? monitor.temperature : "" }}</td>
+                          <td>&nbsp;{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}</td>
                           <td style="text-align:left;padding-left:10px;">
                               <div style="line-height:20px;text-align: left;display: inline-block;">
                                   &nbsp;{{ monitor.symptom }}{{ monitor.dispose }}{{ monitor.result }}

src/xt_pages/hospitalStation/components/deskPrescription.vue

         let arr = []
         for (let i = 0; i < this.allProject.length; i++) {
 
-          if( this.allProject[i].first_letter !=undefined){
-            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
-              this.allProject[i].first_letter.indexOf(this.search_project_keyword) != -1) {
+            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
               arr = arr.concat(this.allProject[i])
             }
-          }
+          
         }
         this.tabProject = arr
       }

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

             >结算单
             </el-button>
 
+
+            <el-button v-if="this.radio == 2   && this.order.order_status == 2 && this.org_id == 10485" size="small"
+                       @click="open(100)" type="primary"
+            >结算单版本2
+            </el-button>
+
             <el-button v-if="this.radio == 2   && this.order.order_status == 2" size="small"
                        @click="open(30)" type="primary"
             >打印发票
       <statementPrint ref="print" :paramsObj='orderObj'></statementPrint>
     </el-dialog>
 
+
+    <el-dialog
+      class="centerDialog"
+      width="1200px"
+      title="打印"
+      :visible.sync="newStatementVisibleTwo">
+<!--      <statementPrintT ref="print" :paramsObj='orderObj'></statementPrintT>-->
+      <new-statement-print-three ref="print" :paramsObj='orderObj'></new-statement-print-three>
+    </el-dialog>
+
     <el-dialog
       class="centerDialog"
       width="1200px"
 import NewStatementPrintTwo from './newStatementPrintTwo'
 import RegisterDialog9504 from './components/registerDialog9504'
 import cryptoJs from 'crypto-js'
+import NewStatementPrintThree from './newStatementPrintThree.vue'
 
 const moment = require('moment')
 export default {
   components: {
+    NewStatementPrintThree,
     RegisterDialog9504,
     NewStatementPrintTwo,
     ChargeMonthPrescriptionTable,
       newOrderObj: {},
       statementVisible: false,
       newStatementVisible: false,
+      newStatementVisibleTwo: false,
+
 
       sick: [],
       diagnoses: [],
         }
         this.orderObj = obj
         // this.$refs.print.getInfo(this.order.id)
+      }else if (index == 100) {
+        this.newStatementVisibleTwo = true
+        let obj = {
+          order_id: this.order.id,
+          settle_type: this.order.settle_type,
+          start_time: this.order.settle_start_time,
+          end_time: this.order.settle_end_time,
+          balance_accounts_type: this.hisPatientInfo.balance_accounts_type
+        }
+        this.orderObj = obj
+        // this.$refs.print.getInfo(this.order.id)
       } else if (index == 10) {
 
         if (this.hisPatientInfo.balance_accounts_type == 2) {

src/xt_pages/outpatientCharges/statementPrint.vue

         @click="printThisPage"
         type="primary"
       >打印
-      </el-button
-      >
+      </el-button>
     </template>
 
     <div class="dialysisPage" style="padding-top: 40px">
           break
         case '07':
           return '护理费'
-
           break
         case '08':
           return '材料费'
           obj['price'] = parseFloat(details[a].pric)
           obj['total_price'] = parseFloat(details[a].det_item_fee_sumamt)
           obj['psn_pay'] = (details[a].selfpay_prop * details[a].det_item_fee_sumamt).toFixed(2)
+          // obj['yibao_biaozhi'] = details[a].
 
           list.push(obj)
         }
                 that.info['date'] = response.data.data.date
                 that.info['number'] = response.data.data.number
                 that.info['order_infos'] = response.data.data.order_infos
-                that.info['diagnosis'] = response.data.data.diagnosis
 
                 that.info['bedInscpTotal'] =
                   response.data.data.bedInscpTotal

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

       } else {
         let arr = []
         for (let i = 0; i < this.allProject.length; i++) {
-          console.log('wwww',(this.allProject[i].first_letter))
-          if(this.allProject[i].first_letter !=undefined){
-            if (
-            this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
-            this.allProject[i].first_letter.indexOf(this.search_project_keyword) != -1
-            ) {
+         
+            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
               arr = arr.concat(this.allProject[i])
             }
-          }
+          
         }
         this.tabProject = arr
         console.log('kkkk',this.tabProject);

src/xt_pages/outpatientTool/QueryData.vue

+<template>
+  <div class="main-contain outpatientChargesManagement">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div
+        style="
+          display: flex;
+          justify-content: space-between;
+          margin-bottom: 10px;
+        "
+      >
+        <div>
+          <el-select v-model="query_type" placeholder="退费标志" >
+            <el-option label="本地" value="1"></el-option>
+            <el-option label="异地" value="2"></el-option>
+          </el-select>
+        </div>
+        <div>
+          <el-select v-model="refd_setl_flag" placeholder="退费标志" >
+            <el-option label="是" value="0"></el-option>
+            <el-option label="否" value="1"></el-option>
+          </el-select>
+        </div>
+
+        <div>
+          <el-select v-model="med_type" placeholder="医疗类别" >
+            <el-option label="普通门诊(11)" value="11"></el-option>
+            <el-option label="门诊特殊病(14)" value="14"></el-option>
+          </el-select>
+        </div>
+        <div>
+          <el-select placeholder="证件号码" >
+            <el-input v-model="certno" placeholder="" style="width:150px;"></el-input>
+          </el-select>
+          <el-button @click="queryPsn">获取人员信息</el-button>
+        </div>
+
+        <div>
+          <el-select placeholder="人员编号" >
+            <el-input disabled v-model="psn_no" placeholder="" style="width:150px;"></el-input>
+          </el-select>
+        </div>
+
+
+      </div>
+      <div style="margin-bottom: 10px;">
+        <el-date-picker
+          size="small"
+          v-model="start_time"
+          prefix-icon="el-icon-date"
+          @change="handleStartTimeChange"
+          :editable="false"
+          :clearable="false"
+          style="width: 196px; "
+          type="date"
+          placeholder="选择开始日期"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          align="right"
+        ></el-date-picker>
+        <span style="text-align: center;">-</span>
+        <el-date-picker
+          size="small"
+          v-model="end_time"
+          prefix-icon="el-icon-date"
+          @change="handleEndTimeChange"
+          :editable="false"
+          :clearable="false"
+          style="width: 196px; "
+          type="date"
+          placeholder="选择结束日期"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          align="right"
+        ></el-date-picker>
+      </div>
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266',
+        }"
+        highlight-current-row
+      >
+        <el-table-column align="center" type="selection" width="55"></el-table-column>
+        <el-table-column
+          prop="date"
+          label="序号"
+          width="60"
+          align="center"
+          type="index"
+        >
+        </el-table-column>
+        <el-table-column align="center" width="100" prop="name" label="就诊id">
+          <template slot-scope="scope">{{ scope.row.mdtrt_id }}</template>
+        </el-table-column>
+        <el-table-column align="center" width="100" prop="name" label="结算id">
+          <template slot-scope="scope">{{ scope.row.setl_id }}</template>
+        </el-table-column>
+        <el-table-column align="center" width="100" prop="name" label="人员编码">
+          <template slot-scope="scope">{{ scope.row.psn_no }}</template>
+        </el-table-column>
+        <el-table-column align="center" width="90" prop="name" label="患者名字">
+          <template slot-scope="scope">{{ scope.row.psn_name }}</template>
+        </el-table-column>
+        <el-table-column align="center" width="90" prop="name" label="患者身份证">
+          <template slot-scope="scope">{{ scope.row.certno }}</template>
+        </el-table-column>
+        <el-table-column align="center" width="90" prop="name" label="结算时间">
+          <template slot-scope="scope">{{ scope.row.setl_time }}</template>
+        </el-table-column>
+        <el-table-column align="center" width="90" prop="name" label="医疗费总额">
+          <template slot-scope="scope">{{ scope.row.medfee_sumamt }}</template>
+        </el-table-column>
+        <el-table-column align="center" width="90" prop="name" label="基金支付总额">
+          <template slot-scope="scope">{{ scope.row.fund_pay_sumamt }}</template>
+        </el-table-column>
+        <el-table-column align="center" width="90" prop="name" label="现金支付金额">
+          <template slot-scope="scope">{{ scope.row.cash_payamt }}</template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
+        :current-page.sync="page"
+        background
+        style="margin-top: 20px; float: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import axios from "axios";
+const moment = require('moment')
+export default {
+  name: "QueryData",
+  components: {
+    BreadCrumb,
+  },
+  data() {
+    return {
+      orderObj: {},
+      batchOrderObj:{},
+      zone_options: [
+        { id: 0, text: '全部分区' }
+      ],
+      refd_setl_flag:"0",
+      med_type:"14",
+      certno:"",
+      psn_no:"",
+      start_time:"",
+      end_time:"",
+      query_type:"",
+      crumbs: [
+        {path: false, name: "门诊收费"},
+        {path: false, name: "项目消费明细汇总"},
+      ],
+      tableData: [],
+      limit: 10,
+      page: 1,
+    };
+  },
+  created() {
+    this.getInitData()
+  },
+
+  methods: {
+    queryData(row){
+      var that = this;
+      axios
+        .get("http://127.0.0.1:9532/api/querydata", {
+          params: {
+            refd_setl_flag:this.refd_setl_flag,
+            med_type: this.med_type,
+            admin_user_id: this.$store.getters.xt_user.user.id,
+            certno:"",
+            psn_no:"",
+            start_time:this.start_time,
+            end_time: this.end_time,
+          },
+        })
+        .then(function (response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.msg);
+            return false;
+          } else {
+            if (response.data.data.failed_code == -10) {
+              that
+                .$confirm(response.data.data.msg, "医保错误信息", {
+                  confirmButtonText: "确 定",
+                  type: "warning",
+                })
+                .then(() => {
+                })
+                .catch(() => {
+                });
+            } else {
+                that.tableData = response.data.data.order
+            }
+          }
+        })
+        .catch(function (error) {
+        });
+
+
+    },
+    queryPsn(){
+      var that = this;
+      axios
+        .get("http://127.0.0.1:9532/api/querydata", {
+          params: {
+            admin_user_id: this.$store.getters.xt_user.user.id,
+            certno:this.certno,
+          },
+        })
+        .then(function (response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.msg);
+            return false;
+          } else {
+            if (response.data.data.failed_code == -10) {
+              that
+                .$confirm(response.data.data.msg, "医保错误信息", {
+                  confirmButtonText: "确 定",
+                  type: "warning",
+                })
+                .then(() => {
+                })
+                .catch(() => {
+                });
+            } else {
+              that.psn_no = response.data.data.psn_no
+            }
+          }
+        })
+        .catch(function (error) {
+        });
+
+    },
+    handleSizeChange(limit) {
+      this.limit = limit;
+      this.getHisOrderList();
+    },
+    handleCurrentChange(page) {
+      this.page = page;
+      this.getHisOrderList();
+    },
+    handleStartTimeChange() {
+      this.page = 1;
+      this.keywords = "";
+      this.getHisOrderList();
+    },
+    handleEndTimeChange() {
+      this.page = 1;
+      this.keywords = "";
+      this.getHisOrderList();
+    },
+    getTimes(time) {
+      return uParseTime(time, "{y}-{m}-{d}");
+    },
+  }
+};
+</script>