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

src/api/dialysis.js

@@ -157,7 +157,7 @@ export function postPrescription(params) {
 }
 
 export function postSoulution(params) {
-  console.log("params",params)
+  console.log('params', params)
   return request({
     url: '/api/dialysis/soulution',
     method: 'Post',
@@ -242,7 +242,6 @@ export function postDelMonitorInfo(params) {
 }
 
 export function CreateGroupAdvice(id, groupno, advices) {
- 
   return request({
     url: '/api/advice_remind/create?id=' + id + '&groupno=' + groupno,
     method: 'post',

src/xt_pages/dialysis/PatientBox.vue

@@ -53,8 +53,11 @@
         </div>
       </div>
       <div class="dislysisInfo">
-        <p>体重(前/后kg):{{ schedule.assessment_before_dislysis ? schedule.assessment_before_dislysis.weight_before : '' }}/{{ schedule.assessment_after_dislysis ? schedule.assessment_after_dislysis.weight_after : '' }}</p>
-        <p>目标超滤量:{{ schedule.prescription ? schedule.prescription.target_ultrafiltration : '' }}
+        <p>体重(前/后kg):
+          {{ schedule.assessment_before_dislysis ? schedule.assessment_before_dislysis.weight_before : '' }}
+          <span v-if="schedule.assessment_after_dislysis>0">/{{ schedule.assessment_after_dislysis ? schedule.assessment_after_dislysis.weight_after : '' }}</span> </p>
+        <p>目标超滤量:
+          <span v-if="schedule.prescription>0">{{ schedule.prescription ? schedule.prescription.target_ultrafiltration : '' }}</span>
        
         </p>
         <p :title="schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : ''">

src/xt_pages/dialysis/batch_print/batch_print_order_fortyThree.vue

@@ -318,19 +318,19 @@
                     <tbody>
                     <tr>
                         <td width="60">时间</td>
-                        <td width="80" style="height:20px;line-height:20px">血压</td>
-                        <td width="60" style="height:20px;line-height:20px">脉搏</td>
+                        <td width="80" style="height:20px;line-height:20px">血压<br />mmHg</td>
+                        <td width="60" style="height:20px;line-height:20px">脉搏<br />(次/分)</td>
                         <td width="60" style="height:20px;line-height:20px">KTV</td>
-                        <td width="60" style="height:20px;line-height:20px">血流量</td>
-                        <td width="60" style="height:20px;line-height:20px">静脉压</td>
-                        <td width="60" style="height:20px;line-height:20px">动脉压</td>
-                        <td width="60" style="height:20px;line-height:20px">跨膜压</td>
-                        <td width="60" style="height:20px;line-height:20px">温度</td>
-                        <td width="60" style="height:20px;line-height:20px">超滤率</td>
-                        <td width="60" style="height:20px;line-height:20px">超滤量</td>
-                        <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换率</td>
-                        <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换量</td>
-                        <td width="60" style="height:20px;line-height:20px">血容量</td>
+                        <td width="60" style="height:20px;line-height:20px">血流量<br />(ml/min)</td>
+                        <td width="60" style="height:20px;line-height:20px">静脉压<br />mmHg</td>
+                        <td width="60" style="height:20px;line-height:20px">动脉压<br />mmHg</td>
+                        <td width="60" style="height:20px;line-height:20px">跨膜压<br />mmHg</td>
+                        <td width="60" style="height:20px;line-height:20px">温度<br />°C</td>
+                        <td width="60" style="height:20px;line-height:20px">超滤率<br />ml/h</td>
+                        <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
+                        <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换率<br /><br />ml/h</td>
+                        <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换量<br /><br />ml</td>
+                        <td width="60" style="height:20px;line-height:20px">血容量<br />ml</td>
                         <td width="">病情变化及处理</td>
                     </tr>
 

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -7,7 +7,7 @@
       <ul>
         <li v-if="isShow('透析模式')">
           <label>透析模式 : </label>
-          <span class="content">{{ dialysis_mode }}</span>
+          <span class="content">{{ dialysis_mode }} </span>
         </li>
 
         <li v-if="isShow('置换量') && (dialysis_mode == 'HDF' || dialysis_mode == 'HF' || dialysis_mode =='HDF+HP')">
@@ -444,6 +444,7 @@ export default {
     },
     dialysis_mode: function() {
       var mode = this.getValueStr('mode_id', 'mode_id')
+
       if (mode.length == 0) {
         return ''
       }
@@ -714,7 +715,7 @@ export default {
 
   },
   created() {
-
+    console.log("中国出口233232323233223",this.prescription)
     var perfusion_apparatus = this.$store.getters.perfusion_apparatus
     var map = {}
     for (let index = 0; index < perfusion_apparatus.length; index++) {
@@ -741,10 +742,8 @@ export default {
       ) {
         return ''
       } else if (this.prescription != null && this.prescription.id != '') {
-        if (
-          this.prescription[pkey] == null ||
-          this.prescription[pkey] == undefined
-        ) {
+     
+        if (this.prescription[pkey] == null || this.prescription[pkey] == undefined) {
           return ''
         }
         return this.prescription[pkey] + ''

src/xt_pages/dialysis/details/NavIgation.vue

@@ -268,6 +268,9 @@ export default {
         return { id: 0 };
       }
     },
+    dialysis_prescription:{
+      type: Object,
+    },
     solution: {
       // 透析方案
       type: Object,
@@ -620,6 +623,7 @@ export default {
       this.$refs.finish_dialog.show(this.dialysis_order);
     },
     showPrescription: function() {
+      console.log("粗32323232",this.prescription)
       this.$refs.prescription.show(this.prescription,this.schedual,this.last_dialysis_prescribe,this.his_is_open);
     },
     showAccepts: function() {
@@ -631,6 +635,7 @@ export default {
       this.$refs.assessmentBefore.show(this.predialysis_evaluation,this.last_dryWeight_dislysis,this.last_predialysis_evaluation,this.lastAssessment);
     },
     showDoubleCheck: function() {
+       
       this.$refs.doubleCheck.show();
     },
     showrTeatmentSummary: function() {

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

@@ -297,6 +297,8 @@
           </template>
         </el-table-column>
       </el-table>
+
+
       <el-table
         v-else
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
@@ -1161,11 +1163,16 @@
         this.groupSelectRow = row
       }
       ,
-      openDeleteGroupAdvice() {
+      openDeleteGroupAdvice(val) {
+        console.log("val2323233232",this.groupSelectRow)
         if (this.groupSelectRow === null) {
           this.$message.error('未选择要删除的医嘱内容')
           return
         }
+        if(this.groupSelectRow.execution_state == 1){
+           this.$message.error("已执行的医嘱无法删除!")
+           return
+        }
         this.DeleteGroupAdvice(this.groupSelectRow.groupno)
 
         // this.$confirm('确认删除些条医嘱内容?', '删除医嘱内容', {
@@ -1549,6 +1556,7 @@
       ,
 
       openEditGroupAdvice() {
+        console.log("医嘱泪奔23332233223",this.groupSelectRow)
         if (this.groupSelectRow === null) {
           this.$message.error('未选择要修改的医嘱内容')
           return
@@ -2134,7 +2142,7 @@
       cellMouseEnter: function(row, column, event) {
         console.log("数据是",row)
         this.currentRow = row
-        // this.groupSelectRow = row
+        this.groupSelectRow = row
         // this.sameRowArr.forEach((arr, i) => {
         //   if (arr.indexOf(row.index) != -1) {
         //     this.hoverOrderArr = arr

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

@@ -882,7 +882,8 @@
           }
 
         } else {
-         
+          console.log("为首务2322323",this.assessmentBeforeDislysis.period)
+          this.assessmentBeforeDislysis.period = this.assessmentBeforeDislysis.period.toString()
      
           this.assessmentBeforeDislysis.dry_weight = this.predialysis_evaluation['dry_weight']
           this.weight_adjust.weight = this.predialysis_evaluation['dry_weight']

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

@@ -1328,7 +1328,8 @@
           max_ultrafiltration_rate:'',
           hemodialysisPipelinesOptions: [],
           punctureNeedleOptions: [],
-          epoOptions: []
+          epoOptions: [],
+          impulse:0,
         },
 
         anticoagulant: {
@@ -1879,7 +1880,7 @@
               mode = 2
             }
             ParamsQuery['mode'] = mode
-            //  console.log("paramsquery",ParamsQuery)
+           console.log("paramsquery",ParamsQuery)
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -2299,7 +2300,7 @@
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
-              console.log('第二')
+               console.log('第二')
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
@@ -2695,6 +2696,7 @@
         this.hide()
       },
       handleSolution: function() {
+
         if (this.dialysisPrescription.anticoagulant == 1) {
           this.dialysisPrescription.anticoagulant_weichi = '0'
           this.dialysisPrescription.anticoagulant_shouji = '0'
@@ -2723,8 +2725,10 @@
               this.loading = false
               return
             }
+             console.log("预充了2",this.dialysisPrescription.pre_impulse)
+             this.dialysisPrescription.impulse = this.dialysisPrescription.pre_impulse
             var arr = this.dialysisPrescription
-            // console.log('arr', arr)
+             console.log('arr2', arr)
 
             const ParamsQuery = arr
             // console.log('长期处方1', ParamsQuery)
@@ -2770,8 +2774,10 @@
                 this.loading = false
                 return
               }
+              console.log("预充了3",this.dialysisPrescription.pre_impulse)
+               this.dialysisPrescription.impulse = this.dialysisPrescription.pre_impulse
               var arr = this.dialysisPrescription
-              // console.log('arr', arr)
+              console.log('arr3', arr)
 
               const ParamsQuery = arr
               // console.log('长期处方2', ParamsQuery)
@@ -2824,9 +2830,10 @@
                 this.loading = false
                 return
               }
-
+              console.log("预充了4",this.dialysisPrescription.pre_impulse)
+             this.dialysisPrescription.impulse = this.dialysisPrescription.pre_impulse
               var arr = this.dialysisPrescription
-              // console.log('arr', arr)
+              console.log('arr4', arr)
 
               const ParamsQuery = arr
               // console.log('长期处方3', ParamsQuery)
@@ -2893,8 +2900,10 @@
                 this.loading = false
                 return
               }
+              console.log("预充了5",this.dialysisPrescription.pre_impulse)
+               this.dialysisPrescription.impulse = this.dialysisPrescription.pre_impulse
               var arr = this.dialysisPrescription
-              // console.log('arr', arr)
+             console.log('arr5', arr)
 
               const ParamsQuery = arr
               // console.log('长期处方5', ParamsQuery)
@@ -2940,8 +2949,10 @@
                 this.loading = false
                 return
               }
+              console.log("预充了6",this.dialysisPrescription.pre_impulse)
+              this.dialysisPrescription.impulse = this.dialysisPrescription.pre_impulse
               var arr = this.dialysisPrescription
-              // console.log('arr', arr)
+              console.log('arr', arr)
 
               const ParamsQuery = arr
               // console.log('长期处方6', ParamsQuery)
@@ -2987,11 +2998,13 @@
                   this.loading = false
                   return
                 }
+                console.log("预充了7",this.dialysisPrescription.pre_impulse)
+               this.dialysisPrescription.impulse = this.dialysisPrescription.pre_impulse
                 var arr = this.dialysisPrescription
                 // console.log('arr', arr)
 
                 const ParamsQuery = arr
-                // console.log('长期处方7', ParamsQuery)
+                console.log('长期处方7', ParamsQuery)
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
@@ -3040,8 +3053,10 @@
                   this.loading = false
                   return
                 }
+                console.log("预充了w233323223",this.dialysisPrescription.pre_impulse)
+               this.dialysisPrescription.impulse = this.dialysisPrescription.pre_impulse
                 var arr = this.dialysisPrescription
-                // console.log('arr', arr)
+                console.log('arr', arr)
 
                 const ParamsQuery = arr
                 // console.log('长期处方8', ParamsQuery)
@@ -3114,8 +3129,11 @@
                   this.loading = false
                   return
                 }
+
+                console.log("预充了99999",this.dialysisPrescription.pre_impulse)
+               this.dialysisPrescription.impulse = this.dialysisPrescription.pre_impulse
                 var arr = this.dialysisPrescription
-                // console.log('arr', arr)
+                console.log('arr', arr)
 
                 const ParamsQuery = arr
                 // console.log('长期处方9', ParamsQuery)
@@ -3158,16 +3176,18 @@
               this.loading = false
               return
             }
+            console.log("预充了1",this.dialysisPrescription.pre_impulse)
+           this.dialysisPrescription.impulse = this.dialysisPrescription.pre_impulse
             var arr = this.dialysisPrescription
-            // console.log('arr', arr)
+            console.log('arr12333223', arr)
 
             const ParamsQuery = arr
-            // console.log('长期处方10', ParamsQuery)
+
 
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
             ParamsQuery['mode'] = '1'
-
+            console.log('长期处方10', ParamsQuery)
             postSoulution(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)

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

@@ -314,10 +314,8 @@
             })
 
             this.doubleReview.creater = response.data.data.doubleCheck.creater
-            this.doubleReview.check_time =
-              response.data.data.doubleCheck.check_time
-            this.doubleReview.first_check_time =
-              response.data.data.doubleCheck.first_check_time
+            this.doubleReview.check_time = response.data.data.doubleCheck.check_time
+            this.doubleReview.first_check_time = response.data.data.doubleCheck.first_check_time
             this.doubleReview.modifier = response.data.data.doubleCheck.modifier
 
             this.first_check_time = uParseTime(
@@ -325,18 +323,12 @@
               '{y}-{m}-{d}  {h}:{i}'
             ).split(' ')[1]
 
-            // if(this.$store.getters.xt_user.user.id != this.double_check.creater && this.double_check.modifier == 0){
-            //   this.check_time = uParseTime(
-            //     this.doubleReview.check_time,
-            //     '{y}-{m}-{d}  {h}:{i}'
-            //   ).split(' ')[1]
-            // }
+           
 
             let doublecheck_resp = response.data.data.doubleCheck
-         
+            console.log("双核2332322323",doublecheck_resp)
             var doubleCheck = this.double_check
-            for (var index in doublecheck_resp) {
-              // doubleCheck[index] = doublecheck_resp[index];
+            for (var index in doublecheck_resp) {        
               this.$set(doubleCheck, index, doublecheck_resp[index])
             }
             this.hide()

src/xt_pages/dialysis/template/DialysisPrintOrderEleven.vue

@@ -301,9 +301,11 @@
                     <div class="inline_block" style="margin-left:10px;flex:1;">
                       置换量：
                       <div class="under_line" style="width: 70px;text-align: center">
-                        {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "/" }}
+                        <span v-if="org_id != 9956">{{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "/" }}</span>
+                        <span v-else>{{ prescription.replacement_total ? prescription.replacement_total : "/" }}</span>
                       </div>
-                      L
+                      <span v-if="org_id != 9956">L</span>
+                      <span v-else>ml</span>
                     </div>
                     <div class="inline_block" style="margin-left:10px;flex:1;">
                       血流量：
@@ -324,12 +326,16 @@
                     <div class="inline_block" style="flex:1;">
                       透析(滤)器：
                       <div class="under_line" style="width: 100px;text-align: center">
-                        {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "/" }}
+                        <span v-if="org_id != 9956">{{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "/" }}</span>
+                        <span v-else>{{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : "/" }}</span>
                       </div>
                     </div>
                     <div class="inline_block" style="flex:1;">
                       灌流器：
-                      <div class="under_line" style="width: 70px;text-align: center">/</div>
+                      <div class="under_line" style="width: 70px;text-align: center">
+                        <span v-if="org_id != 9956">/</span>
+                        <span>{{ prescription.dialysis_irrigation ? prescription.dialysis_irrigation : "/" }}</span>
+                      </div>
                     </div>
                     <div class="inline_block" style="flex:1;">
                       干体重：
@@ -344,7 +350,10 @@
                     <div class="inline_block" style="flex:1;">
                       上次透后体重：
                       <div class="under_line" style="width: 100px;text-align: center">
-                        {{ predialysis.weight_after_last_transparency ? parseFloat(predialysis.weight_after_last_transparency - predialysis.additional_weight).toFixed(1) : "未称重" }}
+                        <span v-if="org_id != 9956">
+                          {{ predialysis.weight_after_last_transparency ? parseFloat(predialysis.weight_after_last_transparency - predialysis.additional_weight).toFixed(1) : "未称重" }}
+                        </span>
+                        <span v-else>{{ assessmentafter.weight_after ? assessmentafter.weight_after : "/" }}</span>
                       </div>
                       kg
                     </div>
@@ -413,10 +422,13 @@
                       <div class="under_line" style="width: 50px;text-align: center;">
                         {{ prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : "/" }}
                       </div>
+                      <span v-if="prescription.anticoagulant == 5">mg</span>
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
-                      <span v-if="prescription.anticoagulant == 2">iu</span>
+                      <span v-if="prescription.anticoagulant == 2">mg</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
+                      <span v-if="prescription.anticoagulant == 6">iu</span>
+                      <span v-if="prescription.anticoagulant == 7">iu</span>
                     </div>
                     <div class="inline_block" style="margin-left:20px;">
                       维持：
@@ -429,8 +441,10 @@
                       <span v-if="prescription.anticoagulant == 5">ml/h</span>
                       <span v-if="prescription.anticoagulant == 4">mg/h</span>
                       <span v-if="prescription.anticoagulant == 3">iu/h</span>
-                      <span v-if="prescription.anticoagulant == 2">iu/h</span>
+                      <span v-if="prescription.anticoagulant == 2">mg/h</span>
                       <span v-if="prescription.anticoagulant == 1">mg/h</span>
+                      <span v-if="prescription.anticoagulant == 6">iu/h</span>
+                      <span v-if="prescription.anticoagulant == 7">iu/h</span>
                     </div>
                     <div class="inline_block" style="margin-left:20px;" v-if="prescription.anticoagulant == 5">
                       钙名称：
@@ -450,10 +464,13 @@
                       <div class="under_line" style="width: 50px;text-align: center;">
                         {{ prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : "/" }}
                       </div>
+                      <span v-if="prescription.anticoagulant == 5">mg</span>
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
-                      <span v-if="prescription.anticoagulant == 2">iu</span>
+                      <span v-if="prescription.anticoagulant == 2">mg</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
+                      <span v-if="prescription.anticoagulant == 6">iu</span>
+                      <span v-if="prescription.anticoagulant == 7">iu</span>
                     </div>
                     <div class="inline_block" style="margin-left:20px;">
                       透析机号：
@@ -1150,7 +1167,8 @@ export default {
         zongliang_unit: "mg",
         gaimingcheng_unit: "",
         gaijiliang_unit: ""
-      }
+      },
+      assessmentafter:{}
     };
   },
   methods: {
@@ -1492,6 +1510,7 @@ export default {
           this.predialysis.blood_access_part_opera_id
         );
         this.afterdialysis = response.data.data.AssessmentAfterDislysis;
+        this.assessmentafter = response.data.data.assessmentAfterDislysis;
         this.operators = response.data.data.operators;
         this.dialysisOrder =
           response.data.data.dialysisOrder === null
@@ -1920,6 +1939,7 @@ export default {
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
 
     var xtuser = this.$store.getters.xt_user;
+    this.org_id = xtuser.org.id
     this.orgname = xtuser.org.org_name;
     // this.orgname = "遂溪方济医院";
     this.modeOptions = this.$store.getters.treatment_mode;

src/xt_pages/dialysis/template/DialysisPrintOrderFortyThree.vue

@@ -294,19 +294,19 @@
               <tbody>
               <tr>
                   <td width="60">时间</td>
-                  <td width="80" style="height:20px;line-height:20px">血压</td>
-                  <td width="60" style="height:20px;line-height:20px">脉搏</td>
+                  <td width="80" style="height:20px;line-height:20px">血压<br />mmHg</td>
+                  <td width="60" style="height:20px;line-height:20px">脉搏<br />(次/分)</td>
                   <td width="60" style="height:20px;line-height:20px">KTV</td>
-                  <td width="60" style="height:20px;line-height:20px">血流量</td>
-                  <td width="60" style="height:20px;line-height:20px">静脉压</td>
-                  <td width="60" style="height:20px;line-height:20px">动脉压</td>
-                  <td width="60" style="height:20px;line-height:20px">跨膜压</td>
-                  <td width="60" style="height:20px;line-height:20px">温度</td>
-                  <td width="60" style="height:20px;line-height:20px">超滤率</td>
-                  <td width="60" style="height:20px;line-height:20px">超滤量</td>
-                  <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换率</td>
-                  <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换量</td>
-                  <td width="60" style="height:20px;line-height:20px">血容量</td>
+                  <td width="60" style="height:20px;line-height:20px">血流量<br />(ml/min)</td>
+                  <td width="60" style="height:20px;line-height:20px">静脉压<br />mmHg</td>
+                  <td width="60" style="height:20px;line-height:20px">动脉压<br />mmHg</td>
+                  <td width="60" style="height:20px;line-height:20px">跨膜压<br />mmHg</td>
+                  <td width="60" style="height:20px;line-height:20px">温度<br />°C</td>
+                  <td width="60" style="height:20px;line-height:20px">超滤率<br />ml/h</td>
+                  <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
+                  <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换率<br /><br />ml/h</td>
+                  <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换量<br /><br />ml</td>
+                  <td width="60" style="height:20px;line-height:20px">血容量<br />ml</td>
                   <td width="">病情变化及处理</td>
               </tr>
 

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyEight.vue

@@ -220,8 +220,8 @@
             <div style="width:16%;">医生：
               <span style="display: inline-block;text-align: left;">
                 &nbsp;
-                <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
-                <img style="height:20px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
+                <span v-if="setAdminUserES(prescription==null?0:(prescription.creater?prescription.creater:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.creater?prescription.creater:'')) }} </span>
+                <img style="height:20px;" :src="setAdminUserES(prescription==null?0:(prescription.creater?prescription.creater:''))" alt="" srcset="" v-else />
               </span>
             </div>
             <div style="width:16%;">透前评估护士：
@@ -397,8 +397,8 @@
             <div style="width:16%;">值班医生：
               <span style="display: inline-block;text-align: left;">
                 &nbsp;
-                <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
-                <img style="height:20px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
+                <span v-if="setAdminUserES(prescription==null?0:(prescription.creater?prescription.creater:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.creater?prescription.creater:'')) }} </span>
+                <img style="height:20px;" :src="setAdminUserES(prescription==null?0:(prescription.creater?prescription.creater:''))" alt="" srcset="" v-else />
               </span>
             </div>
             <div style="width:16%;">责任护士：
@@ -423,8 +423,8 @@
         <div style="text-align:right;line-height:30px;">签名医生：
           <span style="display: inline-block;text-align: left;">
             &nbsp;
-            <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
-            <img style="height:20px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
+            <span v-if="setAdminUserES(prescription==null?0:(prescription.creater?prescription.creater:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.creater?prescription.creater:'')) }} </span>
+            <img style="height:20px;" :src="setAdminUserES(prescription==null?0:(prescription.creater?prescription.creater:''))" alt="" srcset="" v-else />
           </span>
         </div>
       </div>
@@ -663,7 +663,7 @@ export default {
         this.$message.error('钠未填')
       }else if(this.prescription.amylaceum == ""){
         this.$message.error('葡萄糖未填')
-      }else if(this.prescription.prescription_doctor == 0){
+      }else if(this.prescription.creater == 0){
         this.$message.error('医生未填')
       }else if(this.predialysis.creater == 0){
         this.$message.error('透前评估护士未填')

src/xt_pages/dialysis/template/DialysisPrintOrderThirtySix.vue

@@ -174,18 +174,18 @@
               <table class="table-box">
                 <tbody>
                   <tr>
-                    <td width="190"></td>
+                    <!-- <td width="190"></td> -->
                     <td width='100'>穿刺针型号：</td>
-                    <td width="110">
-                      <div>
-                        <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G-动脉') > -1 ? true : predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G-静脉') > -1 ? true : false" showValue="16G"></label-box>
+                    <td>
+                      <div class="under-line" style="text-align:left;">{{ predialysis.puncture_needle ? predialysis.puncture_needle : '/' }}</div>
+                      <!-- <div>
+                        <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G') > -1 ? true : predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G-静脉') > -1 ? true : false" showValue="16G"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G-动脉') > -1 ? true : predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G-静脉') > -1 ? true : false" showValue="17G"></label-box>
+                        <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G') > -1 ? true : predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G-静脉') > -1 ? true : false" showValue="17G"></label-box>
                         &nbsp;
-                      </div>
+                      </div> -->
                     </td>
-                    <td width="30"></td>
-                    <td width='80'>钝针穿刺：</td>
+                    <!-- <td width='80'>钝针穿刺：</td>
                     <td width="140">
                       <div>
                         <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G-动脉') > -1 ? true : predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G-动脉') > -1 ? true : false" showValue="动脉"></label-box>
@@ -193,7 +193,7 @@
                         <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G-静脉') > -1 ? true : predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G-静脉') > -1 ? true : false" showValue="静脉"></label-box>
                         &nbsp;)
                       </div>
-                    </td>
+                    </td> -->
                     <td></td>
                   </tr>
                 </tbody>
@@ -274,8 +274,8 @@
                     <td width='50'>打折：</td>
                     <td width="80">
                       <div>
-                        <label-box :isChecked="predialysis.catheter.indexOf('打折-无') > -1" showValue="无"></label-box>&nbsp;
-                        <label-box :isChecked="predialysis.catheter.indexOf('打折-有') > -1" showValue="有"></label-box>
+                        <label-box :isChecked="predialysis.catheter_bend == 2" showValue="无"></label-box>&nbsp;
+                        <label-box :isChecked="predialysis.catheter_bend == 1" showValue="有"></label-box>
                       </div>
                     </td>
                     <td width='30'></td>
@@ -558,9 +558,9 @@
       <table class="print-table" style="border-left:1px solid #000;border-right:1px solid #000;">
         <tbody>
           <tr>
-            <td width="120" style="height:40px;">主管医生:</td>
+            <td width="70" style="height:40px;">主管医生:</td>
             <td width="100">
-                <div>
+                <div style="text-align: left;">
                     <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
                     <img class="es-img" style="height:38px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
                 </div>
@@ -568,15 +568,15 @@
             <td width="70">预冲护士:</td>
             <td width="100">
 
-                <div>
+                <div style="text-align: left;">
                     <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.washpipe_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)}}</span>
                     <img class="es-img" style="height:38px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)" alt="" srcset="" v-else>
                 </div>
             </td>
-            <td width="100">穿刺护士:</td>
+            <td width="100">穿刺/开管护士:</td>
             <td width="100">
 
-                <div>
+                <div style="text-align: left;">
                     <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.puncture_nurse)}}</span>
                     <img class="es-img" style="height:38px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse)" alt="" srcset="" v-else>
                 </div>
@@ -584,7 +584,7 @@
             <td width="70">核对护士:</td>
             <td width="100">
 
-                <div>
+                <div style="text-align: left;">
                   <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
                   {{ getAdminUser(check == null ? 0 : check.modifier) }}
                   </span>
@@ -618,7 +618,7 @@
             <td width="60">动脉压<br />mmHg</td>
             <td width="60">静脉压<br />mmHg</td>
             <td width="60">跨膜压<br />mmHg</td>
-            <td width="60">超滤量<br />ml</td>
+            <td width="60">超滤量<br />L</td>
             <td width="60">钠浓度<br/>mmol/L</td>
             <td width="60">电导度<br/>ms/cm</td>
             <td width="40">液温<br/>℃</td>
@@ -719,7 +719,7 @@
                         &nbsp;{{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "" }}
                       </div>
                     </td>
-                    <td width="20">ml</td>
+                    <td width="20">L</td>
                     <td width="20"></td>
                     <td width="50">血流量</td>
                     <td width='140'>

src/xt_pages/hospitalStation/components/dialysisIndex.vue

@@ -574,15 +574,7 @@ export default {
       }
     },
     getScheduleDetail: function() {
-      
       this.loading = true
-    //   var dateStr = parseTime(this.date, '{y}-{m}-{d}')
-      // if(this.$route.query.showView == true){
-      //   this.loading = false
-      //   return
-      // }
-        console.log('this.patient_id',this.patient_id)
-        console.log('this.date',this.date)
       this.doctor_advices = []
       getDialysisScheduleDetail(this.patient_id, this.date).then(rs => {
 
@@ -592,6 +584,7 @@ export default {
           var schedual = resp.data.schedual // 患者排班信息
          
           var prescription = resp.data.prescription // 透析处方
+          console.log("投产出大发大发233232323232233232",prescription)
           if (prescription != null) {
             if (prescription.body_fluid == -2) {
               prescription.body_fluid = 0

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -442,14 +442,27 @@
         this.$refs.multipleTable3.toggleAllSelection()
       },
       printThisPage() {
-        const style =
+        if(this.org_id == 10138){
+          const style =
           '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 87%;}}}'
-        printJS({
-          printable: 'printMain',
-          type: 'html',
-          style: style,
-          scanStyles: false
-        })
+          printJS({
+            printable: 'printMain',
+            type: 'html',
+            style: style,
+            scanStyles: false
+          })
+        }else{
+          const style =
+          '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}}'
+          printJS({
+            printable: 'printMain',
+            type: 'html',
+            style: style,
+            scanStyles: false
+          })
+        }
+        
+        
         this.innerVisible = false
         // this.$nextTick(() => {
         //   this.$refs.print.printThisPage()

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -18,7 +18,8 @@
               <div style="margin-bottom: 10px;">门诊号：{{hisPatient.number?hisPatient.number:""}}</div>
               <div style="margin-bottom: 10px;">科室：{{item.info?getDepart(item.info.departments):''}}</div>
               <div style="margin-bottom: 10px;">医保卡号：{{item.hisPatient.number?item.hisPatient.number:""}}</div>
-              <div style="margin-bottom: 10px;">电话：{{item.patient.phone}}</div>
+              <div style="margin-bottom: 10px;" v-if="org_id != 10188">电话：{{item.patient.phone}}</div>
+              <div style="margin-bottom: 10px;" v-else>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</div>
               <div>地址：{{item.patient.home_address}}</div>
               <div style="display:flex;width:50%;">临床诊断：{{getDiagnosis(item.info.diagnosis)}}</div>
           </div>
@@ -43,11 +44,15 @@
                <div style="text-align:center;" >(以下空白)</div>
 
           </div>
-          <div class="doctorBox">
+          <div class="doctorBox" v-if="org_id != 10188">
               <p>医师：{{item.doctor?item.doctor:""}}</p>
               <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
           </div>
-          <div class="actionBar">
+          <div class="doctorBox" v-else>
+            <p>药师：</p>
+            <p>医师：{{item.doctor?item.doctor:""}}</p>
+          </div>
+          <div class="actionBar" v-if="org_id != 10188">
                  <!-- <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
                  <p>配对：</p>
                  <p>核对：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
@@ -60,6 +65,13 @@
                  <p>发药：</p>
                  <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
           </div>
+          <div class="actionBar" v-else>
+            <p style="visibility: hidden;">审核：</p>
+            <p style="visibility: hidden;">配对：</p>
+            <p style="visibility: hidden;">核对：</p>
+            <p style="visibility: hidden;">发药：</p>
+            <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
+          </div>
           <div style="page-break-after:always"></div>
       </div>
     </div>
@@ -92,6 +104,7 @@ export default {
         projectList:[],
         orgname:"",
         diagnoses:[],
+        org_id: 0
       }
     },
    methods:{
@@ -265,7 +278,7 @@ export default {
       this.getHisPatientDetail()
       var xtuser = this.$store.getters.xt_user;
       this.orgname = xtuser.org.org_name;
-
+      this.org_id = xtuser.org.id
    },
    watch:{
      ids:function(val){

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -212,6 +212,8 @@ export default {
   name: "stockOutDetail",
 
   created() {
+    this.org_id = this.$store.getters.xt_user.org.id
+    console.log("jj233223323223",this.org_id)
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;
@@ -281,7 +283,8 @@ export default {
       tableData:[],
       tableList:[],
       drugList:[],
-      tablePrint:[]
+      tablePrint:[],
+      org_id:0,
     };
   },
   methods: {
@@ -452,7 +455,7 @@ export default {
                  count:0,
                  price:item.price,
                  remark:item.remark,
-                 total_price:0,
+                 total_price:0.0,
                  dose:item.dose,
                  dose_unit:item.dose_unit,
                  min_number:item.min_number,
@@ -504,26 +507,35 @@ export default {
     },
 
      exportList(){
-
+        console.log("hh23233223",this.tablePrint)
         for(let i=0;i<this.tablePrint.length;i++){
           this.tablePrint[i].index = i+1
-          
         }
         for(let i=0;i<this.tablePrint.length;i++){
-           this.tablePrint[i].count = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
-           this.tablePrint[i].total_price = this.getTotalPrice(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].price)
-           this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
-            this.tablePrint[i].total = this.getTotalPriceOne(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].price) 
+           if(this.org_id == 9671 || this.org_id == 9919 ){
+             this.tablePrint[i].count = this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child)
+             this.tablePrint[i].total_price = this.getCountSenven(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)
+             this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
+             this.tablePrint[i].total = this.getCountSenvenOne(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)
+           }else{
+              this.tablePrint[i].count = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
+              this.tablePrint[i].total_price = this.getTotalPrice(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].price)
+              this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
+              this.tablePrint[i].total = this.getTotalPriceOne(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].price) 
+           }
+         
+          
         }
        console.log("列表数据333333333",this.tablePrint)
-     
+    
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
        const filterVal = ['index','drug_name', 'unit', 'min_unit','count','price','total_price','remark']
-       let obj = {'index':'合计','total_price':0}
+       let obj = {'index':'合计','total_price':0.00}
        for(let i=0;i<this.tablePrint.length;i++){
-         obj.total_price += this.tablePrint[i].total 
+         obj.total_price += this.tablePrint[i].total
        }
+       obj.total_price = obj.total_price.toFixed(2)
        this.tablePrint.push(obj)
        const data = this.formatJson(filterVal, this.tablePrint)
        console.log("data",data)
@@ -561,9 +573,9 @@ export default {
         this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
         this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
        }
-       let obj = {'index':'合计','total_price':0}
+       let obj = {'index':'合计','total_price':0.00}
        for(let i=0;i<this.tableData.length;i++){
-         obj.total_price += this.tableData[i].total 
+         obj.total_price += this.tableData[i].total
        }
        
        this.tableData.push(obj)
@@ -709,7 +721,29 @@ export default {
         }
         console.log("total23232",total)
         return total*min_price
-      }
+      },
+      getCountSix(drug_id,val){
+        console.log("val233232",val)
+        var count = 0 
+        for(let i=0;i<val.length;i++){
+          count+= val[i].count
+        }
+        return count
+      },
+      getCountSenven(drug_id,val,price){
+        var count = 0 
+        for(let i=0;i<val.length;i++){
+          count+= val[i].count
+        }
+        return (count*price).toFixed(2)
+      },
+      getCountSenvenOne(drug_id,val,price){
+        var count = 0 
+        for(let i=0;i<val.length;i++){
+          count+= val[i].count
+        }
+        return (count*price)
+      },
   }
 };
 </script>

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -37,23 +37,21 @@
                 <span>{{item.dose}}{{item.dose_unit}}*{{item.min_number}}{{item.min_unit}}/{{item.max_unit}}</span>
               </td>
               <td style="line-height: 50px">
-                <span>{{item.min_unit}}</span>
+                <span v-if="org_id == 9671 || org_id == 9919 ">{{item.max_unit}}</span>
+                <span v-else>{{item.min_unit}}</span>
               </td>
             
               <td style="line-height: 50px">
-                  <!-- {{item.count}} -->
-                  {{getCount(item.child,item.max_unit,item.min_unit,item.min_number)}}
+                <span v-if="org_id == 9671 || org_id == 9919">{{getCountSix(item.drug_id,item.child)}}</span>  
+                <span v-else>{{getCount(item.child,item.max_unit,item.min_unit,item.min_number)}}</span>
               </td>
               <td style="line-height:50px">
-                  {{item.min_price}}
-                  <!-- {{getPrice(item.drug_id)}} -->
+                  <span v-if="org_id ==9671 || org_id == 9919">{{item.price}}</span>
+                  <span v-else>{{item.min_price}}</span> 
               </td>
               <td style="line-height:50px">
-                  <!-- {{(item.count * getPrice(item.drug_id)).toFixed(2)}} -->
-                  <!-- {{item.count*item.price}} -->
-                <!-- <span>{{getTotalPrice(item.child,item.max_unit,item.min_number,item.min_price)}}</span> -->
-               
-                <span>{{(getCountOne(item.child,item.max_unit,item.min_unit,item.min_number)*item.min_price).toFixed(2)}}</span>
+                <span v-if="org_id ==9671 || org_id == 9919">{{(getCountSenven(item.drug_id,item.child,item.price))}}</span>
+                <span v-else>{{(getCountOne(item.child,item.max_unit,item.min_unit,item.min_number)*item.min_price).toFixed(2)}}</span>
               </td>
               <td style="line-height: 50px">
                  {{item.remark}}
@@ -121,8 +119,8 @@
         limit:this.$route.query.limit,
         page:this.$route.query.page,
         cancelStockDate:[],
-        drugList:[]
-       
+        drugList:[],
+        org_id:0
       }
     },
     methods: {
@@ -163,67 +161,6 @@
         }
         return name
       },
-      // getlist(){
-      //   var params = {
-      //   start_time:this.start_time,
-      //   end_time:this.end_time,
-      //   order_type:this.order_type,
-      //   manufacturer_id:this.manufacturer_id,
-      //   keyword:this.searchKey,
-      //   limit:this.limit,
-      //   page:this.page,
-      //  }
-      //  console.log("出库数据22222",params)
-      // getDrugOutDetail(params).then(response=>{
-      //   if(response.data.state == 1){
-      //     var drugInOrder = response.data.data.order
-      //     console.log("出库数据22",drugInOrder)
-      //     let objInfo = {}
-      //     drugInOrder.forEach((item,index)=>{
-      //        let { drug_id } = item
-      //        if(!objInfo[drug_id]){
-      //          objInfo[drug_id] = {
-      //            drug_id,
-      //            child:[],
-      //            drug_name:item.drug_name,
-      //            drug_spec:item.drug_spec,
-      //            min_unit:item.min_unit,
-      //            count:0,
-      //            last_price:item.XtBaseDrug.last_price,
-      //            remark:item.remark,
-      //            total_price:"",
-      //            dose:item.dose,
-      //            dose_unit:item.dose_unit,
-      //            min_number:item.min_number,
-      //            max_unit:item.max_unit,
-                
-      //          }
-      //        }
-      //     })
-      //     let list = Object.values(objInfo);
-      //     console.log("list2334444",list)
-      //     for(let i=0;i<drugInOrder.length;i++){
-      //       list.map(item=>{
-      //         if(drugInOrder[i].drug_id == item.drug_id){
-      //            item.child.push(drugInOrder[i])
-      //         }
-      //       })
-      //     }
-          
-      //     console.log("药品出库明细",list)
-      //     for(let i=0;i<list.length;i++){
-      //       for(let j=0;j<list[i].child.length;j++){
-      //         if(list[i].child[j].count!=null || list[i].child[j].count != "" || list[i].child[j].count!=0){
-      //           list[i].count += list[i].child[j].count
-      //         }
-      //       }
-      //     }
-      //     console.log("药品出库明细",list)
-      //     this.cancelStockDate = list
-        
-      //   }
-      // })  
-      // },
       getTotal(){
          var total = 0
          for(let i=0;i<this.cancelStockDate.length;i++){
@@ -312,7 +249,6 @@
         })
       },
       getCount(arr,max_unit,min_unit,min_number){
-        console.log("arr2332332233232",arr)
         var total = 0
         var str = ""
         var min_str = ""
@@ -328,7 +264,6 @@
         for(let i=0;i<arr.length;i++){
           total+= parseInt(arr[i].total_count)
         }
-       console.log("total233223232323",total,min_number)
        if(total<min_number){
            str = ""
            min_str = total + min_unit
@@ -379,9 +314,26 @@
         }
         console.log("totla",total)
         return (total*min_price).toFixed(2)
+      },
+      getCountSix(drug_id,val){
+        console.log("val233232",val)
+        var count = 0 
+        for(let i=0;i<val.length;i++){
+          count+= val[i].count
+        }
+        return count
+      },
+      getCountSenven(drug_id,val,price){
+        var count = 0 
+        for(let i=0;i<val.length;i++){
+          count+= val[i].count
+        }
+        return (count*price).toFixed(2)
       }
     },
     created() {
+      this.org_id = this.$store.getters.xt_user.org.id
+      console.log("jj233223323223",this.org_id)
       var xtuser = this.$store.getters.xt_user
       this.orgname = xtuser.org.org_name
       this.getDrugOutOrderPrint()

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -441,6 +441,7 @@ export default {
       drugList:[],
       manufacturerList:[],
       dealerList:[],
+      org_id:0,
     };
   },
   methods: {
@@ -747,7 +748,7 @@ export default {
 
             response.data.data.info[i].drug_name = response.data.data.info[i].drug.drug_name
 
-            response.data.data.info[i].last_price = response.data.data.info[i].drug.last_price
+            response.data.data.info[i].last_price = response.data.data.info[i].price
 
             response.data.data.info[i].max_unit = response.data.data.info[i].drug.max_unit
             
@@ -869,6 +870,7 @@ export default {
 
   },
   created() {
+   
     this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/user/dialysisSolution.vue

@@ -900,7 +900,7 @@ export default {
         epo:"",
         epo_count:"",
         max_ultrafiltration_rate:"",
-
+   
       },
       childPlan: {
         mode: '',
@@ -1586,6 +1586,14 @@ export default {
       this.addPlan.hemodialysis_machine = row.hemodialysis_machine + ''
       this.addPlan.perfusion_apparatus = row.perfusion_apparatus + ''
       this.addPlan.max_ultrafiltration_rate = row.max_ultrafiltration_rate
+
+      // this.addPlan.oxygen_uptake = row.oxygen_uptake
+      // this.addPlan.hemodialysis_pipelines = row.hemodialysis_pipelines
+      // this.addPlan.hemodialysis_pipelines_count = row.hemodialysis_pipelines_count
+      // this.addPlan.puncture_needle = row.puncture_needle
+      // this.addPlan.puncture_needle_count = row.puncture_needle_count
+      // this.addPlan.epo = row.epo
+      // this.addPlan.epo_count = row.epo_count
       if(row.blood_flow_volume!="" || row.blood_flow_volume!=undefined){
         this.addPlan.blood_flow_volume = row.blood_flow_volume.toString()
       }
@@ -1658,23 +1666,23 @@ export default {
     
       this.addPlan.remark = row.remark
 
-      // this.addPlan.hemodialysis_pipelines  = row.hemodialysis_pipelines
+      this.addPlan.hemodialysis_pipelines  = row.hemodialysis_pipelines
 
-      // if(row.hemodialysis_pipelines_count!="" || row.hemodialysis_pipelines_count!=undefined){
-      //   this.addPlan.hemodialysis_pipelines_count  = row.hemodialysis_pipelines_count.toString()
-      // }
+      if(row.hemodialysis_pipelines_count!="" || row.hemodialysis_pipelines_count!=undefined){
+        this.addPlan.hemodialysis_pipelines_count  = row.hemodialysis_pipelines_count.toString()
+      }
      
-      // this.addPlan.puncture_needle  = row.puncture_needle
+      this.addPlan.puncture_needle  = row.puncture_needle
 
-      // if(row.puncture_needle_count!=null || row.puncture_needle_count!=undefined){
-      //   this.addPlan.puncture_needle_count = row.puncture_needle_count.toString()
-      // }
+      if(row.puncture_needle_count!=null || row.puncture_needle_count!=undefined){
+        this.addPlan.puncture_needle_count = row.puncture_needle_count.toString()
+      }
      
-      // this.addPlan.epo  = row.epo
+      this.addPlan.epo  = row.epo
 
-      // if(row.epo_count!="" || row.epo_count!=undefined){
-      //   this.addPlan.epo_count  = row.epo_count.toString()
-      // }
+      if(row.epo_count!="" || row.epo_count!=undefined){
+        this.addPlan.epo_count  = row.epo_count.toString()
+      }
     
       if(row.dialyzer_perfusion_apparatus!="" ||  row.dialyzer_perfusion_apparatus!=undefined){
          this.addPlan.dialyzer_perfusion_apparatus = row.dialyzer_perfusion_apparatus.toString()
@@ -1693,6 +1701,8 @@ export default {
       this.dialysis_dialyszers = row.dialysis_dialyszers
       this.addPlan.oxygen_uptake = row.oxygen_uptake
       this.addPlan.max_ultrafiltration_rate = row.max_ultrafiltration_rate
+      this.addPlan.oxygen_flow = row.oxygen_flow
+      this.addPlan.oxygen_time = row.oxygen_time
       if(row.oxygen_uptake == 1){
         this.oxygenShow = true
       }