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

src/api/role/admin.js

@@ -176,4 +176,13 @@ export function toTestElement(params){
     method:"get",
     params:params
   })
+}
+
+export function toTestThrityMent(params){
+  
+  return request({
+    url:"/api/sign/totestthrityment",
+    method:"Get",
+    params:params,
+  })
 }

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -81,16 +81,16 @@
                 <check-box :checked="record.patient.source == 1"></check-box>
               </div>
             </div>
-            <div class="inline_block">
+            <div class="inline_block" v-if="org_id!=10510">
               病区：
               <div class="under_line" style="width: 50px; text-align: center">
-                {{ "/" }}
+                {{ record.device_zone.name}}
               </div>
             </div>
-            <div class="inline_block">
+            <div class="inline_block" v-if="org_id!=10510">
               床号：
               <div class="under_line" style="width: 50px; text-align: center">
-                {{ "/" }}
+                {{ record.device_number.number }}
               </div>
             </div>
             <div class="inline_block">
@@ -915,7 +915,7 @@
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
                       <div class="inline_block" style="flex: 1"
-                        v-if="org_id!=10440 && org_id!=0  && org_id!=10469 && org_id!=10490 && org_id!=10478 && org_id!=10495">
+                        v-if="org_id!=10440 && org_id!=0  && org_id!=10469 && org_id!=10490 && org_id!=10478 && org_id!=10495 && org_id!=10510">
                         上次透后体重：
                         <div
                           class="under_line"
@@ -941,7 +941,7 @@
                       </div>
 
                       <div class="inline_block" style="flex: 1"
-                        v-if="org_id==10440 ||  org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495">
+                        v-if="(org_id==10440 ||  org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495)&& org_id!=10510">
                         上次透后体重：
                         <div
                           class="under_line"
@@ -1081,7 +1081,7 @@
                         </div>
                         mmol/L
                       </div>
-                      <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10478">
+                      <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10478 && org_id!=0&&org_id!=10510">
                         流量：
                         <div
                           class="under_line"

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

@@ -905,6 +905,9 @@
             </template>
           </el-table-column>
 
+
+         
+
           <el-table-column
             prop="heparin"
             align="center"

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -44,6 +44,7 @@
           <th v-if="isShow('肝素量')" width="92px">肝素量(mg)</th>
           <th v-if="isShow('脱水')" width="92px">脱水(L)</th>
           <th v-if="isShow('滤前压')" width="92px">滤前压(mmHg)</th>
+        
           <th v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800 || org_id ==  9598)" width="92px">KT/V</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
 
@@ -96,6 +97,7 @@
           <th v-if="isShow('肝素量')" width="92px">{{monitor.heparin_amount ? monitor.heparin_amount : ""}}</th>
           <th v-if="isShow('脱水')" width="92px">{{monitor.dehydration ? monitor.dehydration : ""}}</th>
           <th v-if="isShow('滤前压')" width="92px">{{monitor.filter_pressure ? monitor.filter_pressure : ""}}</th>
+          
           <td v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800 || org_id ==  9598)">{{ monitor.ktv?monitor.ktv:""}}</td>
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}
             <span v-if="(index == monitores.length-1) && (org_id == 0 || org_id == 10340)">累计血容量:{{monitor.accumulated_blood_volume }}L</span>

src/xt_pages/dialysis/doctorAdvicePrint.vue

@@ -110,7 +110,7 @@
                             <td>{{ getName(advice.checker) }}</td>
                             <td>{{ parseTime(advice.check_time, "{m}-{d} {h}:{i}") }}</td>
                             <td>{{ getName(advice.advice_doctor) }}</td>
-                            <td>{{ parseTime(advice.created_time, "{m}-{d} {h}:{i}") }}</td>
+                            <td>{{ parseTime(advice.start_time, "{m}-{d} {h}:{i}") }}</td>
                         </tr>
                         </template>
                     </template>
@@ -292,7 +292,7 @@ export default {
                     this.project = resp.data.project
                     resp.data.hisAdvices.map((item,index) => {
                     item.new_advice = item.new_advice ? item.new_advice : []
-                      if(this.org_id!=9671 && this.org_id!= 10318){
+                      if(this.org_id!=9671 && this.org_id!= 10318 && this.org_id!=0){
                         if(this.project[index].project.length > 0){
                             this.project[index].project.map(it => {
                             let obj = {

src/xt_pages/dialysis/doctorAdvicePrintOne.vue

@@ -11,7 +11,7 @@
         <div class="app-container" style="background-color: white;" v-show="show">
             <div id="dialysisTable">
                 <div class="order_title_panl">
-                    <span class="main_title">透析医嘱</span>
+                    <span class="main_title">临时医嘱</span>
                 </div>
                 <p style="width: 960px;text-align: right;margin: 0 auto 10px;">日期：{{ time }}</p>
                 <table class="table dialysisTable" border="1" cellspacing="0" cellpadding="0">
@@ -254,7 +254,7 @@ export default {
                     this.project = resp.data.project
                     resp.data.hisAdvices.map((item,index) => {
                     item.new_advice = item.new_advice ? item.new_advice : []
-                      if(this.org_id!=9671 && this.org_id!= 10318){
+                      if(this.org_id!=9671 && this.org_id!= 10318 && this.org_id!=0 && this.org_id!=10375){
                         if(this.project[index].project.length > 0){
                             this.project[index].project.map(it => {
                             let obj = {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -80,7 +80,7 @@
           <div class="inline_block">
             病区：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447">{{
+              <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447 || org_id == 0 || org_id ==10460">{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
                   : ""
@@ -91,7 +91,7 @@
           <div class="inline_block">
             床号：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675">{{
+              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id == 0 || org_id ==10460">{{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
                 dialysisOrder.DeviceNumber.number.length > 0
@@ -944,7 +944,7 @@
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-                    <div class="inline_block" style="flex: 1" v-if="org_id!=10440">
+                    <div class="inline_block" style="flex: 1" v-if="org_id!=10440 && org_id!=10510">
                       上次透后体重：
                       <div
                         class="under_line"
@@ -1489,7 +1489,7 @@
                         <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
                         <td>{{monitor.breathing_rate ? monitor.breathing_rate : ""}}</td>
                         <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
-                        <td v-if="org_id == 0 ||org_id ==10478">
+                        <td v-if="org_id ==10478">
                           {{
                             monitor.arterial_pressure
                               ? monitor.arterial_pressure
@@ -1500,7 +1500,7 @@
                           {{
                             monitor.venous_pressure
                               ? monitor.venous_pressure
-                              : "/"
+                              : ""
                           }}
                         </td>
                         <td>
@@ -1600,13 +1600,13 @@
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">{{ monitor.filter_pressure?monitor.filter_pressure:""}}</td>
                         <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671">
-                          {{ monitor.ktv }}
+                          {{ monitor.ktv?monitor.ktv:"" }}
                         </td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id == 9671">
-                          {{ monitor.accumulated_blood_volume }}
+                          {{ monitor.accumulated_blood_volume? monitor.accumulated_blood_volume:"" }}
                         </td>
                         <td width="50" v-if="org_id ==10490 || org_id == 0">
-                          {{ monitor.dicarbonate }}
+                          {{ monitor.dicarbonate?monitor.dicarbonate:"" }}
                         </td>
                         <td style="line-height: 16px; padding: 0px">
                           <div
@@ -1911,10 +1911,10 @@
               <check-box :checked="receiverTreatmentAccess.condition == 1"></check-box>
             </div>
           </div>
-            <div class="inline_block">
+            <div class="inline_block" v-if="org_id!=10510">
               病区：
               <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10138 || org_id == 9675 || org_id == 10447">{{
+              <span v-if="org_id == 10121||org_id == 10138 || org_id == 9675 || org_id == 10447 || org_id == 0 || org_id ==10460">{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
                   : ""
@@ -1922,10 +1922,10 @@
               <span v-else>{{ "/" }}</span>
             </div>
             </div>
-            <div class="inline_block">
+            <div class="inline_block" v-if="org_id!=10510" >
               床号：
               <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121 || org_id == 9675 || org_id == 10447">{{
+              <span v-if="org_id == 10121 || org_id == 9675 || org_id == 10447 || org_id == 0 ||org_id == 10460">{{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
                 dialysisOrder.DeviceNumber.number.length > 0
@@ -1949,7 +1949,7 @@
               style="width: 70px; text-align: left"
               v-if="receiverTreatmentAccess.admission_number"
             >
-              {{ receiverTreatmentAccess.admission_number }}
+             {{ receiverTreatmentAccess.admission_number }}
             </div>
             <div
               class="under_line"

src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue

@@ -349,34 +349,32 @@
                   height="32px"
                   class="advice-name"
                   style="padding-left: 7px"
-
+                 
                 >
-                  <span v-if="advice.parent_id > 0">---></span>
-                  <span>{{ advice.advice_name }}</span>
-                  <span v-if="advice && advice.advice_desc"
-                    >({{ advice.advice_desc
-                    }}{{ advice.drug_spec_unit }})</span
-                  >
-                  <span v-if="advice.prescribing_number"
-                    >&nbsp;&nbsp; {{ advice.prescribing_number
-                    }}{{ advice.prescribing_number_unit }}</span
-                  >
-                  <span v-if="advice.single_dose != 0"
-                    >{{ advice.single_dose
-                    }}{{ advice.single_dose_unit }}</span
-                  >
-                  <span v-if="advice.parent_id == 0">{{
-                    advice.delivery_way
-                  }}</span>
-                  <span v-if="advice.parent_id == 0">{{
-                    advice.execution_frequency
-                  }}</span>
-                  <span
-                    v-if="
-                      advice.parent_id == 0 && advice.remark.length > 0
-                    "
-                    >({{ advice.remark }})</span
-                  >
+                 <div :rowspan="advice.prescriptionChild.length"  v-for="(it,key)  in advice.prescriptionChild" style="border: none;">
+                   <div style="border: none;">
+                    <span>{{ it.advice_name }}</span>
+                          <span v-if="it && it.advice_desc"
+                            >({{ it.advice_desc
+                            }}{{ it.drug_spec_unit }})</span
+                          >
+                          <span v-if="it.prescribing_number"
+                            >&nbsp;&nbsp; {{ it.prescribing_number
+                            }}{{ it.prescribing_number_unit }}</span
+                          >
+                          <span v-if="it.single_dose != 0"
+                            >{{ it.single_dose
+                            }}{{ it.single_dose_unit }}</span
+                          >
+                          <span>{{ it.delivery_way}}</span>
+                          <span>{{
+                            it.execution_frequency
+                          }}</span>
+                          <span v-if="it.remark.length > 0"
+                            >({{ it.remark }})</span
+                          >
+                   </div>
+                 </div>
                 </td>
 
                 <td height="32px">
@@ -1323,9 +1321,65 @@ export default {
              }
            }
         }
-        this.doctor_advices = []
+        this.doctor_advices = [] 
         this.doctor_advices = docArr
-        // console.log(this.advice_groups);
+      
+
+
+       
+          
+        if(this.doctor_advices!=null && this.doctor_advices.length>0){
+
+            for(let i=0;i<this.doctor_advices.length;i++){
+              this.doctor_advices[i].groupPrescriptionId = this.doctor_advices[i].prescription_id + "_"  + this.doctor_advices[i].groupno 
+            }
+            console.log("医嘱内容我我哦我我哦doctor_advices",this.doctor_advices)
+
+            let dataInfo = {}
+            this.doctor_advices.forEach((item, index) => {
+        
+            let { groupPrescriptionId } = item
+            if (!dataInfo[groupPrescriptionId]) {
+              dataInfo[groupPrescriptionId] = {
+                groupPrescriptionId:item.groupPrescriptionId,
+                start_time:item.start_time,
+                advice_name:item.advice_name,
+                advice_desc:item.advice_desc,
+                parent_id:item.parent_id,
+                drug_spec_unit:item.drug_spec_unit,
+                prescribing_number:item.prescribing_number,
+                prescribing_number_unit:item.prescribing_number_unit,
+                single_dose:item.single_dose,
+                single_dose_unit:item.single_dose_unit,
+                delivery_way:item.delivery_way,
+                execution_frequency:item.execution_frequency,
+                remark:item.remark,
+                execution_time:item.execution_time,
+                execution_staff:item.execution_staff,
+                prescriptionChild:[],
+                advice_doctor:item.advice_doctor,
+              }
+            }
+          })
+          let newArr = Object.values(dataInfo)
+          
+          if(newArr!=null && newArr.length >0){
+             for(let i=0;i<newArr.length;i++){
+               for(let j=0;j<this.doctor_advices.length;j++){
+                 if(newArr[i].groupPrescriptionId == this.doctor_advices[j].groupPrescriptionId){
+                    newArr[i].prescriptionChild.push(this.doctor_advices[j])
+                 }
+               }
+             }
+          }
+          console.log("newArr",newArr)
+            
+          this.doctor_advices = []
+          this.doctor_advices = newArr
+         
+        }
+        
+
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");

src/xt_pages/hospitalStation/statementPrint.vue

@@ -30,7 +30,7 @@
     <div class='dialysisPage' style="padding-top:40px;" v-if="this.$store.getters.xt_user.org_id == 10210 || this.$store.getters.xt_user.org_id == 0">
 <!--      <private-charge-print :info="info" ></private-charge-print>-->
 <!--      <print-ten :info="info" ></print-ten>-->
-      <print-ten></print-ten>
+      <print-ten :info="info"></print-ten>
     </div>
 
 <!--    <div class='dialysisPage' style="padding-top:40px;" v-else>-->
@@ -392,6 +392,52 @@ export default {
             that.info['order_infos'] = response.data.data.order_infos
             that.info['diagnosis'] = response.data.data.diagnosis
 
+            that.info['bedInscpTotal'] =
+              response.data.data.bedInscpTotal
+            that.info['bedSelfTotal'] =
+              response.data.data.bedSelfTotal
+
+            that.info['operationInscpTotal'] =
+              response.data.data.operationInscpTotal
+            that.info['operationSelfTotal'] =
+              response.data.data.operationSelfTotal
+
+            that.info['checkInscpTotal'] =
+              response.data.data.checkInscpTotal
+            that.info['checkSelfTotal'] =
+              response.data.data.checkSelfTotal
+
+            that.info['treatInscpTotal'] =
+              response.data.data.treatInscpTotal
+            that.info['treatSelfTotal'] =
+              response.data.data.treatSelfTotal
+
+            that.info['laboratoryInscpTotal'] =
+              response.data.data.laboratoryInscpTotal
+            that.info['laboratorySelfTotal'] =
+              response.data.data.laboratorySelfTotal
+
+            that.info['westernMedicineInscpTotal'] =
+              response.data.data.westernMedicineInscpTotal
+            that.info['westernMedicineSelfTotal'] =
+              response.data.data.westernMedicineSelfTotal
+
+            that.info['materialInscpTotal'] =
+              response.data.data.materialInscpTotal
+            that.info['materialSelfTotal'] =
+              response.data.data.materialSelfTotal
+
+            that.info['chineseTraditionalInscpTotal'] =
+              response.data.data.chineseTraditionalInscpTotal
+            that.info['chineseTraditionalSelfTotal'] =
+              response.data.data.chineseTraditionalSelfTotal
+
+            that.info['otherInscpTotal'] =
+              response.data.data.otherInscpTotal
+            that.info['otherSelfTotal'] =
+              response.data.data.otherSelfTotal
+
+
             //获取所有项目类型进行去重
             let med_chrgitm_types = []
             for (let i = 0; i < response.data.data.order_infos.length; i++) {
@@ -511,6 +557,54 @@ export default {
                 that.info['diagnosis'] = response.data.data.diagnosis
                 that.info['his'] = response.data.data.his_hospital
 
+
+                that.info['bedInscpTotal'] =
+                  response.data.data.bedInscpTotal
+                that.info['bedSelfTotal'] =
+                  response.data.data.bedSelfTotal
+
+                that.info['operationInscpTotal'] =
+                  response.data.data.operationInscpTotal
+                that.info['operationSelfTotal'] =
+                  response.data.data.operationSelfTotal
+
+                that.info['checkInscpTotal'] =
+                  response.data.data.checkInscpTotal
+                that.info['checkSelfTotal'] =
+                  response.data.data.checkSelfTotal
+
+                that.info['treatInscpTotal'] =
+                  response.data.data.treatInscpTotal
+                that.info['treatSelfTotal'] =
+                  response.data.data.treatSelfTotal
+
+                that.info['laboratoryInscpTotal'] =
+                  response.data.data.laboratoryInscpTotal
+                that.info['laboratorySelfTotal'] =
+                  response.data.data.laboratorySelfTotal
+
+                that.info['westernMedicineInscpTotal'] =
+                  response.data.data.westernMedicineInscpTotal
+                that.info['westernMedicineSelfTotal'] =
+                  response.data.data.westernMedicineSelfTotal
+
+                that.info['materialInscpTotal'] =
+                  response.data.data.materialInscpTotal
+                that.info['materialSelfTotal'] =
+                  response.data.data.materialSelfTotal
+
+                that.info['chineseTraditionalInscpTotal'] =
+                  response.data.data.chineseTraditionalInscpTotal
+                that.info['chineseTraditionalSelfTotal'] =
+                  response.data.data.chineseTraditionalSelfTotal
+
+                that.info['otherInscpTotal'] =
+                  response.data.data.otherInscpTotal
+                that.info['otherSelfTotal'] =
+                  response.data.data.otherSelfTotal
+
+
+
                 console.log("22222222")
                 that.list = []
                 //获取所有项目类型进行去重

src/xt_pages/hospitalStation/statementTemplate/printTen.vue

@@ -103,7 +103,7 @@
             <td style="border: 1px solid gray;width: 150px;height: 30px;">床号</td>
             <td style="border: 1px solid gray;width: 150px;height: 30px;"></td>
             <td style="border: 1px solid gray;width: 150px;height: 30px;">参保区划</td>
-            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.insu_optins}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.his.insuplc_admdvs}}</td>
           </tr>
           <tr>
             <td style="border: 1px solid gray;width: 150px;height: 30px;">入院日期</td>
@@ -274,7 +274,7 @@
             <td style="border: 1px solid gray;width: 150px;height: 30px;">个人账户支付</td>
             <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.acct_pay}}</td>
             <td style="border: 1px solid gray;width: 150px;height: 30px;">个人现金支付</td>
-            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.psn_cash_pay}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.cash_payamt}}</td>
             <td style="border: 1px solid gray;width: 150px;height: 30px;">其他基金支付</td>
             <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.oth_pay}}</td>
           </tr>

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -490,7 +490,7 @@ export default {
         }
 
         if(details[a].advice_id == 0 && details[a].project_id > 0 && details[a].project.type == 2) {
-          obj['yibao_code'] = details[a].project.project.medical_insurance_number
+          obj['yibao_code'] = details[a].project.project.medical_code
           obj['yiyuan_code'] = details[a].project.project.id
           obj['name'] = details[a].project.project.project_name
           obj['unit'] = details[a].project.project.unit

src/xt_pages/role/admin.vue

@@ -93,6 +93,14 @@
           icon="el-icon-circle-plus-outline"
           style="float:left"
           @click="toTestElement">创建企业用章</el-button> -->
+
+
+          <!-- <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toTestThrityMent">生成PDF</el-button>  -->
           
      </div>
     
@@ -248,7 +256,7 @@
 </template>
 
 <script>
-import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight,toTestNight,toTestTen,toTestElement } from "@/api/role/admin";
+import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight,toTestNight,toTestTen,toTestElement,toTestThrityMent } from "@/api/role/admin";
 import { getRoles } from "@/api/role/role";
 
 import { parseTime } from "@/utils";
@@ -631,6 +639,13 @@ export default {
           this.$message.success("保存")
          }
       })
+    },
+    toTestThrityMent(){
+      toTestThriytyMent().then(response=>{
+        var sign =  response.data.data.sign
+        console.log("sign",sign)
+        this.$message.success("保存")
+      })
     }
   },
   watch: {

src/xt_pages/workforce/components/tableData.vue

@@ -58,7 +58,7 @@
         <el-switch
           v-model="value1"
           :active-value=true
-          active-text="显示灌流器"
+          active-text="显示透析器/灌流器"
           @change="switchThis(value1)">
 
         </el-switch>
@@ -1041,7 +1041,7 @@ export default {
       if(this.value1==false){
          sessionStorage.removeItem('value1')
       }else{
-            sessionStorage.setItem('value1',this.value1)
+         sessionStorage.setItem('value1',this.value1)
       }
         console.log('this.value1',this.value1);
         console.log('flag',flag);