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

src/xt_pages/outpatientCharges/statementTemplate/printthirteen.vue

 <template>
   <div id="statement-print" class="statement-print">
-    
+
     <div class="statementTitle" >湖北省基本医疗保险门诊费用结算单</div>
 
     <!-- <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 10387 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088 &&this.$store.getters.xt_user.org_id != 10510 &&this.$store.getters.xt_user.org_id != 0">广东省社会医疗保险医疗费用结算单</div> -->
 
       </tr>
       <tr>
-        <td>单位名称</td>
-        <td colspan="5">{{info.emp_name}}</td>
+        <td>地址</td>
+        <td colspan="5">{{info.patient.home_address}}</td>
         <td width="80">联系电话</td>
         <td width="110">{{info.patient.phone}}</td>
         <td width="80">身份证号</td>
         <td colspan="3">{{info.certno}}</td>
       </tr>
-      <tr v-if="this.$store.getters.xt_user.org_id != 10387">
-        <td>住院号</td>
-        <td>{{info.number}}</td>
-        <td>科别</td>
-        <td width="100"></td>
-        <td>床号</td>
-        <td></td>
-        <td>入院日期</td>
-        <td>{{info.begndate ? info.begndate.split(' ')[0] : ''}}</td>
-        <td>出院日期</td>
-        <td width="100">{{info.enddate ? info.enddate.split(' ')[0] : ''}}</td>
-        <td>住院天数</td>
-        <td>{{getDay(info.begndate,info.enddate)}}</td>
-
+      <tr>
+        <td>门诊号</td>
+        <td colspan="5">{{info.mdtrt_id}}</td>
+        <td>门诊日期</td>
+        <td colspan="5">{{getTime(info.date)}}</td>
       </tr>
       <tr>
         <td>险种</td>
-        <td colspan="2" v-if="info.insutype == '310'">职工基本医疗保险</td>
-        <td colspan="2" v-if="info.insutype == '320'">公务员医疗补助</td>
-        <td colspan="2" v-if="info.insutype == '330'">大额医疗费用补助</td>
-        <td colspan="2" v-if="info.insutype == '340'">离休人员医疗保障</td>
-        <td colspan="2" v-if="info.insutype == '390'">城乡居民基本医疗保险</td>
-        <td colspan="2" v-if="info.insutype == '392'">城乡居民大病医疗保险</td>
-        <td colspan="2" v-if="info.insutype == '510'">生育保险</td>
-
-        <td v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217">入院第一诊断</td>
-        <td v-else>病种名称</td>
-        <td v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217" colspan="3">{{info.dise_name}}</td>
-        <td v-else colspan="3">{{'慢性肾功能衰竭'}}</td>
-        <td v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217">出院第一诊断</td>
-        <td v-else>病种编码</td>
-        <td v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217" colspan="6">{{info.dise_name}}</td>
-        <td v-else colspan="6">{{'M07800'}}</td>
+        <td colspan="5" v-if="info.insutype == '310'">职工基本医疗保险</td>
+        <td colspan="5" v-if="info.insutype == '320'">公务员医疗补助</td>
+        <td colspan="5" v-if="info.insutype == '330'">大额医疗费用补助</td>
+        <td colspan="5" v-if="info.insutype == '340'">离休人员医疗保障</td>
+        <td colspan="5" v-if="info.insutype == '390'">城乡居民基本医疗保险</td>
+        <td colspan="5" v-if="info.insutype == '392'">城乡居民大病医疗保险</td>
+        <td colspan="5" v-if="info.insutype == '510'">生育保险</td>
+        <td>诊断</td>
+        <td colspan="5">{{info.diagnosis}}</td>
       </tr>
       <tr>
         <td>业务类别</td>
   </div>
 </template>
 <script>
+import { uParseTime } from '@/utils/tools'
   export default {
     props: {
       info: {
         }
       }
     },methods:{
+      getTime(val) {
+        if (val < 0) {
+          return ""
+        }
+        if (val == "") {
+          return ""
+        } else {
+          return uParseTime(val, '{y}-{m}-{d}')
+        }
+      },
       getBirth(idNo){
         var year = idNo.substring(6, 10);
         var month = idNo.substring(10, 12);

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

 
                   </el-form-item>
 
-
-
-
-
                   <el-form-item label="过敏病史: " prop="name" label-position="right">
                       <el-autocomplete
                               style="width:100%;"
       <save-template ref='saveTemplate' v-on:save_template="saveTemplate"></save-template>
       <next-or-last-prescription ref='next_or_last_prescription' v-on:save="setValue"
                                  v-on:cancel="cancel"></next-or-last-prescription>
-
-
       <!--<next-or-last-prescription ref='next_or_last_prescription' v-on:save="setValue" v-on:cancel="cancel"></next-or-last-prescription>-->
       <call-prescription ref='call_prescription' v-on:call="call" v-on:call-cancel="callCancel"></call-prescription>
-
-
   </div>
 </template>
 
       display: flex;
       flex-direction: column;
       position: relative;
+      width: 30%;
 
   .el-form-item {
       width: 33%;

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

         <el-table v-if="activeType  == 1" :data="prescription.advices" border style="width: 99%;"
                   :row-style="{ color: '#303133' }"
                   :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-            <el-table-column align="center" prop="day" width="70" label="序号">
+            <el-table-column align="center" prop="day" width="70" label="序号" fixed>
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
                         <el-input :disabled="prescription.is_medicine_status" v-model="scope.row.groupno" placeholder=""></el-input>
             </el-table-column>
 
 
-            <el-table-column align="center" prop="drug_name" label="名称">
+            <el-table-column align="center" prop="drug_name" label="名称" fixed>
                 <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span>
                 </template>
             </el-table-column>
                 </template>
             </el-table-column>
 
-
             <el-table-column align="center" prop="day" width="70" label="天数">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
                     <el-input :disabled="prescription.is_medicine_status"  v-model="scope.row.remark" :title="scope.row.remark" placeholder=""></el-input>
                 </template>
             </el-table-column>
-            <el-table-column align="center" width="40" prop="name" label="操作">
+            <el-table-column align="center" width="40" prop="name" label="操作" fixed="right">
                 <template slot-scope="scope">
                     <i class="el-icon-delete" @click="deleteDrug(scope.$index, scope.row)"></i>
                 </template>
         <el-table v-if="activeType == 2" :data="prescription.project" border style="width: 99%;"
                   :row-style="{ color: '#303133' }"
                   :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-            <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
-            <el-table-column align="center" prop="project_name" label="名称">
+            <el-table-column align="center" type="index" width="40" label="序号" fixed></el-table-column>
+            <el-table-column align="center" prop="project_name" label="名称" fixed>
                 <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span>
                 </template>
             </el-table-column>
                     <el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>
                 </template>
             </el-table-column>
-            <el-table-column align="center" width="40" prop="name" label="操作">
+            <el-table-column align="center" width="40" prop="name" label="操作" fixed="right">
                 <template slot-scope="scope">
                     <i class="el-icon-delete" @click="deleteProject(scope.row,scope.$index)"></i>
                 </template>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

             </el-button>
             <el-button size="small" ref="button_three" @click="open_two()" type="primary">处方调用</el-button>
             <el-button size="small" @click="open_three()" type="primary">保存模板</el-button>
-
-            <!-- <el-popover
-                                placement="bottom"
-                                width="300"
-                                trigger="click">
-                            <el-button size="small" ref="button_two" @click="open(2)">处方单</el-button>
-                            <el-button size="small" ref="button_six" @click="open(6)">治疗单</el-button>
-                            <el-button size="small" ref="button_six" @click="open(20)">检验单</el-button>
-                            <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印
-                            </el-button>
-
-                        </el-popover> -->
             <el-button size="small" @click="openPrint" type="primary">打印</el-button>
-
-            <!-- <el-button size="small" ref="button_four"  @click="open(5)" type="primary" :disabled='prescriptions && prescriptions[0].advices && prescriptions[0].project ? prescriptions[0].advices.length == 0 && prescriptions[0].project.length == 0 : false'>存模板</el-button> -->
           </div>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子病历'">
             <el-button size="small" @click="opentwo(1)" type="primary">保存</el-button>
             </el-button>
           </div>
         </div>
+
+        <!-- <div> -->
+          <desk-prescription v-on:setData="setData" :diagnoses="diagnoses" :loading="isloading"
+                        :sick="sick" :record_date="record_date"
+                        :drugs="drugs"
+                        :allDrugs="allDrugs"
+                        :advices_template="advices_template"
+                        :additions="additions"
+                        :doctors="doctors"
+                        :department="department"
+                        v-on:change="changeOther"
+                        v-on:month="changeMonth"
+                        v-on:day="changeDay"
+
+                        :month_prescriptions="month_prescriptions"
+                        :org_id="org_id"
+                        ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
+                        v-on:getSunziValue="getSunziValue"
+                        :hisPatientInfo="hisPatientInfo" :patient_diagnoses="patient_diagnoses"
+                        @event1="changetwo($event)" @editKeepLoad="editKeepLoad"
+                        v-if="titleType == '电子处方'" style="flex:1;"></desk-prescription>
+        <!-- </div> -->
+
         <!--<desk-prescription ref="prescriptions"   :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"-->
         <!--v-if="titleType == '处方'" style="flex:1;"></desk-prescription>-->
-        <desk-prescription v-on:setData="setData" :diagnoses="diagnoses" :loading="isloading"
+
+        <!-- <desk-prescription v-on:setData="setData" :diagnoses="diagnoses" :loading="isloading"
                            :sick="sick" :record_date="record_date"
                            :drugs="drugs"
                            :allDrugs="allDrugs"
                            v-on:getSunziValue="getSunziValue"
                            :hisPatientInfo="hisPatientInfo" :patient_diagnoses="patient_diagnoses"
                            @event1="changetwo($event)" @editKeepLoad="editKeepLoad"
-                           v-if="titleType == '电子处方'" style="flex:1;"></desk-prescription>
+                           v-if="titleType == '电子处方'" style="flex:1;"></desk-prescription> -->
 
 
         <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"

src/xt_pages/outpatientTool/detailPrint.vue

           </tr>
           <tr>
             <td>总费用：{{ getAllPice() }}</td>
-            <td>个人支付：
-             {{getActPay()}}
+            <td>个人支付金额：
+             {{getPsnCashPay()}}
             <!-- <span v-if="his_record_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>
             <span v-if="his_record_patient.balance_accounts_type != 2">{{ getActPay() }}</span> -->
             </td>
+
+            <td>个人账户支付金额：
+              {{getActPay()}}
+              <!-- <span v-if="his_record_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>
+              <span v-if="his_record_patient.balance_accounts_type != 2">{{ getActPay() }}</span> -->
+            </td>
             <td>基金支付记账：{{ getFundPaySumamt() }}</td>
             <td>补充医疗支付记账：{{ getHifesPay() }}</td>
           </tr>
       }
       return total_price;
     },
-    getActPay() {
+    getPsnCashPay() {
       var act_pay = 0;
       for (let i = 0; i < this.list.length; i++) {
         for (let j = 0; j < this.list[i].orders.length; j++) {
       }
 
       return act_pay.toFixed(2);
-    },
-    getFundPaySumamt() {
-      var fund_pay_sumamt = 0;
+    },getActPay() {
+      var act_pay = 0;
       for (let i = 0; i < this.list.length; i++) {
         for (let j = 0; j < this.list[i].orders.length; j++) {
-          fund_pay_sumamt += this.list[i].orders[j].fund_pay_sumamt;
+            act_pay = act_pay + this.list[i].orders[j].acct_pay
+          }
+        }
+      return act_pay.toFixed(2);
+    },
+    getFundPaySumamt() {
+      if (this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10278 || this.$store.getters.xt_user.org_id ==10537){
+        var fund_pay_sumamt = 0;
+        for (let i = 0; i < this.list.length; i++) {
+          for (let j = 0; j < this.list[i].orders.length; j++) {
+            fund_pay_sumamt += this.list[i].orders[j].hifp_pay + this.list[i].orders[j].maf_pay + this.list[i].orders[j].hifmi_pay;
+          }
+        }
+        return fund_pay_sumamt.toFixed(2);
+      }else{
+        var fund_pay_sumamt = 0;
+        for (let i = 0; i < this.list.length; i++) {
+          for (let j = 0; j < this.list[i].orders.length; j++) {
+            fund_pay_sumamt += this.list[i].orders[j].fund_pay_sumamt;
+          }
         }
+        return fund_pay_sumamt.toFixed(2);
       }
-      return fund_pay_sumamt;
     },
     getHifesPay() {
       var hifes_pay = 0;
           hifes_pay += this.list[i].orders[j].hifes_pay;
         }
       }
-      return hifes_pay;
+      return hifes_pay.toFixed(2);
     },
     getMafPay() {
       var maf_pay = 0;
           maf_pay += this.list[i].orders[j].maf_pay;
         }
       }
-      return maf_pay;
+      return maf_pay.toFixed(2);
     },
     getDepartment(id) {
       var name = "";