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

src/api/dialysis_record.js

@@ -193,3 +193,12 @@ export function getInitPrintDataOne(params) {
     params: params
   })
 }
+
+export function getPatientDialysisRecordList(params){
+
+   return request({
+    url:"/api/getpatientdialysisrecordlist",
+    method:'get',
+    params:params,
+   })
+}

src/xt_pages/data/druguse.vue

@@ -875,7 +875,7 @@ export default {
       this.currentIndex = index;
       this.efForm = {
         name: row.name,
-        id: row.id
+        id: row.id,
       };
 
       this.efFormVisible = true;
@@ -886,6 +886,7 @@ export default {
       this.$refs[formName].validate(valid => {
         if (valid) {
           if (this.isEdit) {
+            console.log("eeeeeeeeeeee",this.efForm)
             UpdateExecutionFrequency(this.efForm.id, this.efForm).then(
               response => {
                 if (response.data.state == 0) {

src/xt_pages/data/druguseTemplate.vue

@@ -2118,6 +2118,7 @@
               }else{
                 this.efForm.count =1
               }
+              console.log("this.efForm",this.efForm)
               UpdateExecutionFrequency(this.efForm.id, this.efForm).then(
                 response => {
                   if (response.data.state == 0) {

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1300,6 +1300,34 @@
                           }}
                         </div>
                       </div>
+
+                      
+                      <div
+                        class="row"
+                        style="padding: 2px 0; line-height: 23px; display: flex"
+                        v-if="org_id != 10223"
+                      >
+                        <div
+                          class="inline_block"
+                          style="flex: 1; display: inline-block"
+                          v-if="org_id!=9675 && org_id!=10447"
+                        >
+                          备注：
+                          <div
+                            class="under_line"
+                            style="
+                              width: 860px;
+                              line-height: 25px;
+                              text-align: left;
+                              margin-left: 2px;
+                              display: inline-block;
+                              white-space: normal;
+                            "
+                          >
+                            {{ record.assessment_before_dislysis.remark ?record.assessment_before_dislysis.remark : "/" }}
+                          </div>
+                        </div>
+                      </div>
                     </div>
 
                     <div class="row" style="padding: 2px 0; line-height: 23px" v-if="org_id == 3877">
@@ -1380,7 +1408,7 @@
                           <td width="50">脉搏<br />(次/分)</td>
                           <td width="50" v-if="org_id!=10489">呼吸<br />(次/分)</td>
                           <td width="50">血流量<br />(ml/min)</td>
-                          <td width="50" v-if="org_id == 10478">动脉压<br />(mmHg)</td>
+                          <td width="50" v-if="org_id == 10478 || org_id ==10510">动脉压<br />(mmHg)</td>
                           <td width="50">静脉压<br />(mmHg)</td>
                           <td width="50">跨膜压<br />(mmHg)</td>
                           <td width="60" v-if="org_id != 9836">
@@ -1521,7 +1549,7 @@
                                 : ""
                             }}
                           </td>
-                          <td v-if="org_id == 10478">
+                          <td v-if="org_id == 10478 || org_id ==10510">
                             {{
                               monitor_record.arterial_pressure
                                 ? monitor_record.arterial_pressure

src/xt_pages/dialysis/details/index.vue

@@ -19,12 +19,12 @@
           >下一位</el-button
         >   
 
-        <el-button
+        <!-- <el-button
           size="small"
           type="primary"
           @click="history_click"
           
-          >透析历史</el-button>
+          >透析历史</el-button> -->
 
         <el-button
           size="small"
@@ -1252,7 +1252,8 @@ import {
   getLongAdviceTwo,
   getDialysisRecordInitData,
   getDialysisSchedules,
-  getInitPrintData
+  getInitPrintData,
+  getPatientDialysisRecordList
 } from '@/api/dialysis_record'
 import { getDataConfig } from '@/utils/data'
 import { parseTime } from '@/utils'

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -82,7 +82,7 @@
           <div class="inline_block" v-if="org_id!=10624">
             病区：
             <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  || org_id ==10567">{{
+              <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447  || org_id ==10567 || org_id ==10206">{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
                   : ""
@@ -93,7 +93,7 @@
           <div class="inline_block" v-if="org_id!=10460&&org_id!=10624">
             床号：
             <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 || org_id ==10515 || org_id == 10567">{{
+              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id ==10515 || org_id == 10567 || org_id ==10206">{{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
                 dialysisOrder.DeviceNumber.number.length > 0
@@ -1541,7 +1541,7 @@
                         <td width="50">脉搏<br />(次/分)</td>
                         <td width="50" v-if="org_id!=10489">呼吸<br />(次/分)</td>
                         <td width="50">血流量<br />(ml/min)</td>
-                        <td width="50" v-if="org_id==10478 || org_id == 10598">
+                        <td width="50" v-if="org_id==10478 || org_id == 10598 || org_id ==10510">
                           动脉压<br />({{
                             monitors[0] &&
                             monitors[0]["venous_pressure_type"] == 2
@@ -1600,7 +1600,7 @@
                         <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
                         <td v-if="org_id!=10489">{{monitor.breathing_rate ? monitor.breathing_rate : ""}}</td>
                         <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
-                        <td v-if="org_id ==10478 || org_id == 10598">
+                        <td v-if="org_id ==10478 || org_id == 10598 || org_id ==10510">
                           {{
                             monitor.arterial_pressure
                               ? monitor.arterial_pressure
@@ -2374,7 +2374,7 @@
             <div class="inline_block" v-if="org_id!=10510 && org_id!=10624">
               病区：
               <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 || org_id == 0 || org_id ==10460">{{
+              <span v-if="org_id == 10121||org_id == 10138 || org_id == 9675 || org_id == 10447 || org_id == 0 || org_id ==10460 || org_id ==10206">{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
                   : ""
@@ -2385,7 +2385,7 @@
             <div class="inline_block" v-if="org_id!=10510 && org_id!=10460 && org_id!=10624" >
               床号：
               <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121 || org_id == 9675 || org_id == 10447 || org_id == 0 ||org_id == 10460">{{
+              <span v-if="org_id == 10121 || org_id == 9675 || org_id == 10447 || org_id == 0 ||org_id == 10460 || org_id ==10206">{{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
                 dialysisOrder.DeviceNumber.number.length > 0

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3757,6 +3757,19 @@ export default {
               }
               if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
                 obj.prescribing_number = 1
+              }
+               // 针对灵山圣康
+               if(this.org_id == 0 || this.org_id ==10375){
+                if(this.prescriptions[i]!=null){
+                  console.log("禅古this.prescriptions[i].advices.length",this.prescriptions[i].advices.length)
+                  if(this.prescriptions[i].advices.length >=5){
+
+                    this.$message.error("添加条数已经大于5条,添加失败!")
+                    return false
+                  }
+                  
+                  
+                }
               }
               this.prescriptions[i].advices.push(obj)
             }
@@ -3806,12 +3819,28 @@ export default {
               if (obj.type == 3) {
                 obj.single_dose = 1
               }
+              // 针对灵山圣康
+              if(this.org_id == 0 || this.org_id ==10375){
+                if(this.prescriptions[i]!=null){
+                  if(this.prescriptions[i].project.length >=5){
+                    this.$message.error("添加条数已经大于5条,添加失败!")
+                    return false
+                  }
+                  
+                  
+                }
+              }
               this.prescriptions[i].project.push(obj)
             }
             this.curStatus = 2
           }
 
           this.curPrescriptions = this.prescriptions[i]
+       
+          
+          
+         
+         
           this.$refs.multipleTable.clearSelection()
           this.$refs.tables.clearSelection()
           this.clearSelection()

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -689,9 +689,9 @@
           { name: '透析1h一次', count: 1 },
           { name: '透析2h一次', count: 1 },
           { name: '透析3h一次', count: 1 },
-          { name: '每日一次', count: 1 },
-          { name: '每日两次', count: 2 },
-          { name: '每日三次', count: 3 },
+          { name: '每日一次', count: 12 },
+          { name: '每日两次', count: 6 },
+          { name: '每日三次', count: 4 },
           { name: '每晚一次', count: 1 },
           { name: '每晚', count: 1 },
           { name: '上机前', count: 1 },

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -623,7 +623,7 @@
 
             this.prescriptions[i].project[b].day_count = parseInt(this.prescriptions[i].project[b].day_count)
             this.prescriptions[i].project[b].frequency_type = parseInt(this.prescriptions[i].project[b].frequency_type)
-            this.prescriptions[i].project[b].week_day = this.prescriptions[i].project[b].number_days.toString()
+            this.prescriptions[i].project[b].day = this.prescriptions[i].project[b].number_days.toString()
 
           }
         }
@@ -1860,7 +1860,7 @@
                         frequency_type: prescription.project[b].frequency_type,
                         day_count: prescription.project[b].day_count,
                         week_day: prescription.project[b].week_day,
-                        number_days:prescription.project[b].week_day
+                        number_days:prescription.project[b].day
 
                       }
 
@@ -1901,7 +1901,7 @@
                           frequency_type: prescription.project[b].frequency_type,
                           day_count: prescription.project[b].day_count,
                           week_day: prescription.project[b].week_day,
-                          number_days:prescription.project[b].week_day
+                          number_days:prescription.project[b].day
 
                         }
 
@@ -1939,7 +1939,7 @@
                         frequency_type: prescription.project[b].frequency_type,
                         day_count: prescription.project[b].day_count,
                         week_day: prescription.project[b].week_day,
-                        number_days:prescription.project[b].week_day
+                        number_days:prescription.project[b].day
 
 
                       }
@@ -1981,7 +1981,7 @@
                           frequency_type: prescription.project[b].frequency_type,
                           day_count: prescription.project[b].day_count,
                           week_day: prescription.project[b].week_day,
-                          number_days:prescription.project[b].week_day
+                          number_days:prescription.project[b].day
 
                         }
 

src/xt_pages/user/dialysisRecord.vue

@@ -278,6 +278,18 @@
               <!--}}</span></template-->
             <!--&gt;-->
           <!--</el-table-column>-->
+          <el-table-column
+            prop="nurse"
+            width="120"
+            align="center"
+            label="透析器凝血"
+          >
+            <template slot-scope="scope"
+              ><span>{{
+              scope.row.assessment_after_dislysis.cruor
+              }}</span></template
+            >
+          </el-table-column>
           <el-table-column
             prop="nurse"
             width="90"
@@ -355,6 +367,7 @@
               <th>目标超滤量（L）</th>
               <!-- <th>血管通路</th> -->
               <th>抗凝剂种类 首剂/维持/总量</th>
+              <th>透析器凝血</th>
               <th>透析器型号</th>
               <th>治疗护士</th>
               <th>治疗医生</th>
@@ -391,6 +404,7 @@
                 </td>
                 <!-- <td>{{ setVascularAccess(item.prescription) }}</td> -->
                 <td>{{ setAnticoagulantsConfit(item.prescription) }}</td>
+                <td>{{ item.assessment_after_dislysis.cruor }}</td>
                 <td>{{ item.prescription.dialyzer_perfusion_apparatus }}</td>
                 <td>{{ getNurseName(item.start_nurse) }}</td>
                 <td>{{ getDoctorName(item.prescription.creater) }}</td>

src/xt_pages/user/dialysisSolution.vue

@@ -154,6 +154,7 @@
 
         <el-row :gutter="20">
           <el-col :span="6"  v-if="isShows('首剂')"><div class="grid-content bg-purple">首剂
+            <span v-if="current_solution.anticoagulant == 17">(mg):</span>
             <span v-if="current_solution.anticoagulant == 6">(iu):</span>
             <span v-if="current_solution.anticoagulant == 7">(iu):</span>
             <span v-if="current_solution.anticoagulant == 5">(mg):</span>
@@ -163,6 +164,7 @@
             <span v-if="current_solution.anticoagulant == 1">(mg):</span>
             {{current_solution.anticoagulant_shouji}}</div></el-col>
           <el-col :span="6"  v-if="isShows('维持')"><div class="grid-content bg-purple">维持
+            <span v-if="current_solution.anticoagulant == 17">(mg/h):</span>
             <span v-if="current_solution.anticoagulant == 7">(iu/h):</span>
             <span v-if="current_solution.anticoagulant == 6">(iu/h):</span>
             <span v-if="current_solution.anticoagulant == 5">(ml/h):</span>
@@ -172,6 +174,7 @@
             <span v-if="current_solution.anticoagulant == 1">(mg/h):</span>
             {{current_solution.anticoagulant_weichi}}</div></el-col>
           <el-col :span="6" v-if="isShows('总量')"><div class="grid-content bg-purple">总量
+            <span v-if="current_solution.anticoagulant == 17">(mg):</span>
             <span v-if="current_solution.anticoagulant == 5">(mg):</span>
             <span v-if="current_solution.anticoagulant == 6">(iu):</span>
             <span v-if="current_solution.anticoagulant == 7">(iu):</span>
@@ -1275,46 +1278,114 @@
         }
       
       },
-      'addPlan.anticoagulant_shouji': function() {
+      // 'addPlan.anticoagulant_shouji': function() {
       
-         if(this.addPlan.id == 0){
-            this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(1,
-            this.addPlan.anticoagulant_shouji,
-            this.addPlan.dialysis_duration,
-            this.addPlan.anticoagulant_weichi
-          )
-         }
+      //    if(this.addPlan.id == 0){
+      //       this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(1,
+      //       this.addPlan.anticoagulant_shouji,
+      //       this.addPlan.dialysis_duration,
+      //       this.addPlan.anticoagulant_weichi
+      //     )
+      //    }
      
        
-        if(this.addPlan.id == 0){
-          if(this.$store.getters.xt_user.template_info.template_id == 41 && this.addPlan.anticoagulant == 2 ){
-            this.addPlan.anticoagulant_zongliang = ""
-            this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(this.addPlan.anticoagulant_weichi)
-         }
-        }
+      //   if(this.addPlan.id == 0){
+      //     if(this.$store.getters.xt_user.template_info.template_id == 41 && this.addPlan.anticoagulant == 2 ){
+      //       this.addPlan.anticoagulant_zongliang = ""
+      //       this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(this.addPlan.anticoagulant_weichi)
+      //    }
+      //   }
+      
+
+      // },
+      // 'addPlan.anticoagulant_weichi': function() {
+
+      //   if(this.addPlan.id == 0){
+      //       this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(
+      //       1,
+      //       this.addPlan.anticoagulant_shouji,
+      //       this.addPlan.dialysis_duration,
+      //       this.addPlan.anticoagulant_weichi
+      //    )
+      //   }
       
+        
+      //   if(this.addPlan.id == 0){
+      //     if(this.$store.getters.xt_user.template_info.template_id == 41 && this.addPlan.anticoagulant == 2 ){
+      //       this.addPlan.anticoagulant_zongliang = ""
+      //       this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(this.addPlan.anticoagulant_weichi)
+      //    }
+      //   }
+      
+      // },
+
+      'addPlan.anticoagulant_shouji': function() {
+        let dialysis_duration_minute = 0
+        let dialysis_duration_hour = 0
+        let duration = 0
+        if (this.addPlan.dialysis_duration_minute == '') {
+          dialysis_duration_minute = 0
+        } else {
+          dialysis_duration_minute = this.addPlan.dialysis_duration_minute
+        }
+        if (this.addPlan.dialysis_duration_hour == '') {
+          dialysis_duration_hour = 0
+        } else {
+          dialysis_duration_hour = this.addPlan.dialysis_duration_hour
+        }
+        duration = parseFloat(dialysis_duration_hour) + parseFloat(dialysis_duration_minute) / 60
+
+        this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(
+          1,
+          this.addPlan.anticoagulant_shouji,
+          duration,
+          this.addPlan.anticoagulant_weichi,
+          this.addPlan.add_amount,
+          this.addPlan.reduce_amount
+        )
+        this.zongliang =  this.addPlan.anticoagulant_zongliang
+        if (isNaN(this.addPlan.anticoagulant_zongliang)) {
+          this.addPlan.anticoagulant_zongliang = ''
+        }
+
+      if(this.$store.getters.xt_user.template_info.template_id == 41 && this.addPlan.anticoagulant == 2){
+          this.addPlan.anticoagulant_zongliang = ""
+          this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) +  parseInt(this.addPlan.anticoagulant_weichi)
+       }
 
       },
       'addPlan.anticoagulant_weichi': function() {
+        let dialysis_duration_minute = 0
+        let dialysis_duration_hour = 0
+        let duration = 0
 
-        if(this.addPlan.id == 0){
-            this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(
-            1,
-            this.addPlan.anticoagulant_shouji,
-            this.addPlan.dialysis_duration,
-            this.addPlan.anticoagulant_weichi
-         )
+        if (this.addPlan.dialysis_duration_minute == '') {
+          dialysis_duration_minute = 0
+        } else {
+          dialysis_duration_minute = this.addPlan.dialysis_duration_minute
         }
-      
-        
-        if(this.addPlan.id == 0){
-          if(this.$store.getters.xt_user.template_info.template_id == 41 && this.addPlan.anticoagulant == 2 ){
-            this.addPlan.anticoagulant_zongliang = ""
-            this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(this.addPlan.anticoagulant_weichi)
-         }
+
+        if (this.addPlan.dialysis_duration_hour == '') {
+          dialysis_duration_hour = 0
+        } else {
+          dialysis_duration_hour = this.addPlan
+            .dialysis_duration_hour
         }
-      
-      }
+        duration = parseFloat(dialysis_duration_hour) + parseFloat(dialysis_duration_minute) / 60
+
+        this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(1, this.addPlan.anticoagulant_shouji, duration, this.addPlan.anticoagulant_weichi,this.addPlan.add_amount,this.addPlan.reduce_amount)
+        if (isNaN(this.addPlan.anticoagulant_zongliang)) {
+          this.addPlan.anticoagulant_zongliang = ''
+        }
+         this.zongliang =  this.addPlan.anticoagulant_zongliang
+        if(this.$store.getters.xt_user.template_info.template_id == 41 && this.addPlan.anticoagulant == 2){
+         this.addPlan.anticoagulant_zongliang = ""
+         this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) +  parseInt(this.addPlan.anticoagulant_weichi)
+       }
+        this.zongliang =  this.addPlan.anticoagulant_zongliang
+
+      },
+
     },