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

src/api/dialysis_record.js

@@ -47,7 +47,7 @@ export function editMonitor(patient_id, schedule_date, data, mode) {
   })
 }
 
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse, blood_drawing, quality_nurse, puncture_needle, puncture_way, dialysis_dialyszers, dialysis_irrigation, blood_access_id, nuclein_date, schedule_remark, order_remark,catheter_operation,blood_flow_volume) {
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse, blood_drawing, quality_nurse, puncture_needle, puncture_way, dialysis_dialyszers, dialysis_irrigation, blood_access_id, nuclein_date, schedule_remark, order_remark,catheter_operation,blood_flow_volume,dialysis_strainer) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
@@ -74,6 +74,7 @@ export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_
     order_remark: order_remark,
     catheter_operation:catheter_operation,
     blood_flow_volume:blood_flow_volume,
+    dialysis_strainer:dialysis_strainer,
   }
   console.log('params', params)
   return request({

src/api/drug/drug.js

@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+import url from 'postcss-url'
 
 export function getCurrentPatient(params) {
   return request({
@@ -670,4 +671,87 @@ export function getCheckGoodBatchList(id,params){
     method:"get",
     params:params,
   })
+}
+
+
+export function getAllSelfDrugInfoList(params){
+
+  return request({
+    url:"/api/drug/getallselfdruginfolist",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getallPatientList(params){
+
+  return request({
+    url:"/api/drug/getallpatientlist",
+    method:"Get",
+    params:params
+  })
+}
+
+export function postSearchSelfDrugList(keyword,params){
+
+  return request({
+    url:"/api/drug/postsearchselfdruglist?keyword="+keyword,
+    method:"get",
+    params:params
+  })
+}
+
+export function postSelfDrugWarehouse(data,patient_id,warehousing_time,warehousing_id){
+  
+  return request({
+    url:"/api/drug/postselfdrugwarehouse?patient_id="+patient_id+"&warehousing_time="+warehousing_time+"&warehousing_id="+warehousing_id,
+    method:"post",
+    data:data
+  })
+}
+
+export function getAllSelfDrugWarehouseInfoList(params){
+
+  return request({
+    url:"/api/drug/getallselfdrugwarehosueinfolist",
+    method:"get",
+    params:params
+  })
+}
+
+export function getSelfDrugWarehouseInfoById(id,params){
+
+  return request({
+    url:"/api/drug/getselfdrugwarehouseinfobyid?id="+id,
+    method:"Get",
+    params:params
+  })
+}
+
+export function ModifySelfDrugWarehouse(data,patient_id,warehousing_time,warehousing_id){
+ 
+  return request({
+    url:"/api/drug/modifyselfdrugwarehouse?patient_id="+patient_id+"warehousing_time="+warehousing_time+"&warehousing_id="+warehousing_id,
+    method:"post",
+    data:data,
+  })
+
+}
+
+export function deleteSelfWarehouseInfo(id,params){
+  
+  return request({
+    url:"/api/drug/deleteselfwarehouseinfo?id="+id,
+    method:"get",
+    params:params,
+  })
+}
+
+export function toCheckSelfWarehousingInfo(params){
+ 
+  return request({
+    url:"/api/drug/tocheckselfwarehouseinginfo",
+    method:"get",
+    params:params,
+  })
 }

src/api/patient.js

@@ -1102,4 +1102,22 @@ export function deleteSolution(id,params){
     method:"Get",
     params:params,
   })
+}
+
+export function saveTreamtPlan(data){
+
+  return request({
+    url:"/api/patient/savetreamentplan",
+    method:"post",
+    data:data,
+  })
+}
+
+export function getTreamentPlan(params){
+
+  return request({
+    url:"/api/patient/gettreamentplan",
+    method:"get",
+    params:params
+  })
 }

src/lang/zh.js

@@ -189,7 +189,9 @@ export default {
     selfPreparedMedicine: '自备药管理',
     wareHouseManage: '仓库管理',
     inventoryTransfer: '库存调拨',
-
+    selfPrepareWaresing:"自备药入库",
+    selfPrepareWaresingOut:"自备药出库",
+    selfPrepareWareOut:"自备药出库",
     // consumablesManagement: '耗材管理',
     warehouseReceipt: '出入库',
     warehouseReceiptOther: '出入库',

src/router/modules/dialysis.js

@@ -999,6 +999,18 @@ export default {
         noCache: true
       }
     },
+    {//74
+      path: '/dialysis/print/batch/seventyfour',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_seventyfour'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_seventyfour',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {//75
       path: '/dialysis/print/batch/seventyfive',
       component: () =>

src/router/modules/selfPreparedMedicine.js

@@ -12,6 +12,36 @@ export default {
     isChild: true
   },
   children: [
+    {
+      path: '/stock/selfwarehouse/info',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/warehouseInfo'),
+      name: 'selfPrepareWaresing',
+      meta: { title: '自备药入库', noCache: true }
+
+    },
+    {
+      path: '/stock/selfwarehouse/info/add',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/addWarehouseInfo'),
+      name: 'selfPrepareWaresingAdd',
+      meta: { title: '自备药入库', noCache: true },
+      hidden: true,
+      is_menu: false,
+    },
+    {
+      path: '/stock/selfwarehouse/info/edit',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/editWarehouseInfo'),
+      name: 'selfPrepareWaresingEdit',
+      meta: { title: '自备药编辑入库', noCache: true },
+      hidden: true,
+      is_menu: false,
+    },
+    {
+      path: '/stock/selfwarehouse/out',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/warehouseOut'),
+      name: 'selfPrepareWareOut',
+      meta: { title: '自备药出库', noCache: true }
+
+    },
     {
       path: '/stock/selfstockquery',
       component: () => import('@/xt_pages/stock/selfPreparedMedicine/stockquery'),

src/xt_pages/data/components/consumables.vue

@@ -773,11 +773,11 @@
 
             this.goodInfo.goodInfoDialog.formValue.is_warehouse = response.data.data.goodInfo.is_warehouse.toString()
 
-            //  if(response.data.data.goodInfo.is_show<=0){
-            //    this.goodInfo.goodInfoDialog.formValue.is_show = ''
-            //   }else{
-            //     this.goodInfo.goodInfoDialog.formValue.is_show =  response.data.data.goodInfo.is_show.toString()
-            //   }
+             if(response.data.data.goodInfo.is_show<=0){
+               this.goodInfo.goodInfoDialog.formValue.is_show = ''
+              }else{
+                this.goodInfo.goodInfoDialog.formValue.is_show =  response.data.data.goodInfo.is_show.toString()
+              }
 
             this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
 

src/xt_pages/data/components/drugs.vue

@@ -742,11 +742,11 @@
                 this.formValue.is_project = this.formValue.is_project.toString()
               }
 
-              // if(this.formValue.is_show<=0){
-              //     this.formValue.is_show = ''
-              // }else{
-              //   this.formValue.is_show = this.formValue.is_show.toString()
-              // }
+              if(this.formValue.is_show<=0){
+                  this.formValue.is_show = ''
+              }else{
+                this.formValue.is_show = this.formValue.is_show.toString()
+              }
 
 
               this.$refs.addDrugs.show(id, this.formValue)

src/xt_pages/data/components/editProject.vue

@@ -468,11 +468,11 @@ export default {
                 this.form.is_print = projecDetail.is_print
               }
 
-              // if(projecDetail.is_show == 0){
-              //   this.form.is_show = ""
-              // }else{
-              //   this.form.is_show = projecDetail.is_show.toString()
-              // }
+              if(projecDetail.is_show == 0){
+                this.form.is_show = ""
+              }else{
+                this.form.is_show = projecDetail.is_show.toString()
+              }
 
             }
          })

src/xt_pages/dialysis/PatientBox.vue

@@ -864,7 +864,7 @@ export default {
         @include display-flex;
         @include align-items-center;
         .iconfont {
-          margin: 0 5px 0 0;
+          margin: 0 0px 0 0;
           font-size: 18px;
         }
       }

src/xt_pages/dialysis/batch_print/batch_print_order_seventyfive.vue

@@ -33,33 +33,33 @@
               血液透析记录单
             </div>
           </div>
-          <div class="row">
-            <div class="inline_block">
+          <div class="row" style="display: flex;">
+            <div class="inline_block" style="flex: 1;">
               姓名：
               <div class="under_line" style="width: 70px; text-align: center">
                 {{ record.patient.name }}
               </div>
             </div>
-            <div class="inline_block" style="margin:0 10px">
+            <div class="inline_block" style="flex: 1;">
               性别：
               <div class="under_line" style="width: 30px; text-align: center">
                 {{ record.patient.gender == 1 ? "男" : "女" }}
               </div>
             </div>
-            <div class="inline_block" style="">
+            <div class="inline_block" style="flex: 1;">
               年龄：
               <div class="under_line" style="width: 30px; text-align: center">
                 {{ getAge(record.patient) }}
               </div>
               岁
             </div>
-            <div class="inline_block" style="margin: 0 10px;">
+            <div class="inline_block" style="flex: 1;">
               病历号：
               <div class="under_line" style="width: 70px; text-align: center">
                 {{ record.patient.dialysis_no }}
               </div>
             </div>
-            <div class="inline_block" style="">
+            <div class="inline_block" style="flex: 1;">
               日期：
               <div class="under_line"
               style="width: 100px; text-align: center"
@@ -67,7 +67,7 @@
               {{ getTime(record.schedule_date, "{y}-{m}-{d}") }}
               </div>
             </div>
-            <div class="inline_block" style="margin-left: 10px">
+            <div class="inline_block" style="flex: 1;">
               次数：
               <div
                 class="under_line"
@@ -95,10 +95,10 @@
               </div>
             </div>
           </div>
-          <div class="row" style="text-align: center;border: 1px solid black;width: 99%;">
+          <div style="text-align: center;border: 1px solid black;width: 99%;padding: 5px 0;">
             透前情况
           </div>
-          <div class="row" style="border: 1px solid black;border-top: none;width: 99%;">
+          <div  style="border: 1px solid black;border-top: none;width: 99%;">
             <div class="row" style="display: flex;">
               <div class="inline_block" style="flex: 2;" >
                 血管通路：
@@ -144,7 +144,7 @@
                 </div>
               </div>
               <div class="inline_block" style="flex: 1;" >
-                透析器：
+                透析(滤)器：
                 <div class="under_line"
                   style=" width: 50%;
                     text-align: center;
@@ -152,6 +152,8 @@
                   "
                 >
                 {{ record.dialysis_order.dialysis_dialyszers ?  record.dialysis_order.dialysis_dialyszers : "/"}}
+
+                <span v-if="record.dialysis_order.dialysis_strainer!=''"> /{{ record.dialysis_order.dialysis_strainer ?  record.dialysis_order.dialysis_strainer : ""}}</span>
                 </div>
               </div>
               <div class="inline_block" style="flex: 1;" >
@@ -424,9 +426,11 @@
                     white-space: normal;
                   "
                 >
-                {{ record.dialysis_order && record.dialysis_order.dialysis_irrigation
-                  ? record.dialysis_order.dialysis_irrigation : "/"
-                }}
+                  <span v-if="record.dialysis_order !=null && record.dialysis_order.dialysis_irrigation != '0'">
+                    {{ record.dialysis_order.dialysis_irrigation ? record.dialysis_order.dialysis_irrigation : "/"}}
+                  </span>
+                  <span v-else-if="record.dialysis_order !=null && record.dialysis_order.dialysis_irrigation == '0'">/</span>
+                  <span v-else>/</span>
                 </div>
               </div>
               <div class="inline_block" style="flex: 1;" >
@@ -490,6 +494,19 @@
                 <span v-if="record.prescription.anticoagulant ==0"> </span>
                 <span v-else>{{ getweichi(record.prescription.anticoagulant) }}</span>
               </div>
+              <div class="inline_block" style="flex: 1">
+                透前体重：
+                <div
+                  class="under_line"
+                  style="width: 70px; text-align: center"
+                >
+                  {{record.assessment_before_dislysis.weight_before
+                    ? parseFloat(record.assessment_before_dislysis.weight_before -
+                      record.assessment_before_dislysis.additional_weight).toFixed(1): "/"
+                  }}
+                </div>
+                kg
+              </div>
             </div>
             <!--  -->
             <div class="row" style="display: flex;">
@@ -545,19 +562,7 @@
                 </div>
                 kg
               </div>
-              <div class="inline_block" style="flex: 1">
-                透前体重：
-                <div
-                  class="under_line"
-                  style="width: 70px; text-align: center"
-                >
-                  {{record.assessment_before_dislysis.weight_before
-                    ? parseFloat(record.assessment_before_dislysis.weight_before -
-                      record.assessment_before_dislysis.additional_weight).toFixed(1): "/"
-                  }}
-                </div>
-                kg
-              </div>
+              
             </div>
             <!-- 医嘱脱水量 -->
             <div class="row" style="display: flex;">
@@ -775,7 +780,7 @@
             </table>
           </div>
           <!-- 透析监测 -->
-          <div class="row" style="width: 99%;">
+          <div  style="width: 99%;">
             <table class="inside_table" border="1" style="border-collapse: collapse;width: 100%;text-align: center;">
               <tbody>
                 <tr style="line-height: 30px;">
@@ -822,10 +827,43 @@
                   <td width="50">{{monitor_record.transmembrane_pressure ? monitor_record.transmembrane_pressure : "/"}}</td>
                   <td width="50">{{monitor_record.blood_flow_volume? monitor_record.blood_flow_volume: "/"}}</td>
                   <td width="50">{{monitor_record.conductivity ? monitor_record.conductivity : "/" }}</td>
-                  <td width="50">{{monitor_record.ultrafiltration_rate ? monitor_record.ultrafiltration_rate : '/' }}</td>
-                  <td width="50">{{monitor_record.ultrafiltration_volume? monitor_record.ultrafiltration_volume: "0" }}</td>
+                  <td width="50">
+                    <span v-if="j == 0">
+                      {{monitor_record.ultrafiltration_rate ? monitor_record.ultrafiltration_rate : '0' }}
+                    </span>
+                    <span v-else-if="j == (record.monitor_records.length-1)">
+                      {{monitor_record.ultrafiltration_rate ? monitor_record.ultrafiltration_rate : '/' }}
+                    </span>
+                    <span v-else>
+                      {{monitor_record.ultrafiltration_rate ? monitor_record.ultrafiltration_rate : '/' }}
+                    </span> 
+                    
+                  </td>
+                  <td width="50">
+                    <span v-if="j == 0">
+                      {{monitor_record.ultrafiltration_volume? monitor_record.ultrafiltration_volume: "0" }}
+                    </span>
+                    <span v-else-if="j == (record.monitor_records.length-1)">
+                      {{monitor_record.ultrafiltration_volume? monitor_record.ultrafiltration_volume: "/" }}
+                    </span>
+                    <span v-else>
+                      {{monitor_record.ultrafiltration_volume? monitor_record.ultrafiltration_volume: "/" }}
+                    </span> 
+                    
+                  </td>
 
-                  <td width="65">{{ monitor_record.heparin ? monitor_record.heparin :'/' }}</td>
+                  <td width="65">
+                    <span v-if="j == 0">
+                      {{ monitor_record.heparin ? monitor_record.heparin :'0' }}
+                    </span>
+                    <span v-else-if="j == (record.monitor_records.length-1)">
+                      {{ monitor_record.heparin ? monitor_record.heparin :'/' }}
+                    </span>
+                    <span v-else>
+                      {{ monitor_record.heparin ? monitor_record.heparin :'/' }}
+                    </span> 
+                    
+                  </td>
                   <td width="200">
                     <template
                       v-if="
@@ -846,7 +884,7 @@
             </table>
           </div>
 
-          <div class="row" style="border: 1px solid black;border-bottom:none;width: 99%;">
+          <div  style="border: 1px solid black;border-bottom:none;width: 99%;">
             <div class="row" style="display: flex;">
               <div class="inline_block" style="flex: 1">
                 穿刺护士：
@@ -913,11 +951,7 @@
               </div>
               <div class="inline_block" style="flex: 1">
                 核对人员：
-                <div
-                  class="under_line"
-                  style="width: 80px; text-align: center"
-                  v-if="!record.check"
-                ></div>
+               
                 <div
                   class="under_line"
                   style="width: 80px; text-align: center"
@@ -927,7 +961,7 @@
                   "
                 >
                   <span
-                    style="height: 30px; display: inline-block"
+                    style=" display: inline-block"
                     v-if="setAdminUserES(record.check, 'creater') == ''"
                   >
                     {{
@@ -955,7 +989,7 @@
                   "
                 >
                   <span
-                    style="height: 30px; display: inline-block"
+                    style=" display: inline-block"
                     v-if="setAdminUserES(record.check, 'creater') == ''"
                   >
                     {{
@@ -983,7 +1017,7 @@
                   "
                 >
                   <span
-                    style="height: 30px; display: inline-block"
+                    style=" display: inline-block"
                     v-if="
                       setAdminUserES(record.check, 'modifier') == ''
                     "
@@ -1015,7 +1049,7 @@
                   "
                 >
                   <span
-                    style="height: 30px; display: inline-block"
+                    style=" display: inline-block"
                     v-if="setAdminUserES(record.check, 'creater') == ''"
                   >
                     {{
@@ -1063,7 +1097,10 @@
                 <div class="under_line"
                   style="width: 50%; text-align: center"
                 >
-                  {{ record.assessment_after_dislysis.dialysis_during ? record.assessment_after_dislysis.dialysis_during : "/" }}
+                  <span v-if="record.assessment_after_dislysis.is_eat !=''">
+                    {{ record.assessment_after_dislysis.is_eat ==1 ? '有' : "无" }}
+                  </span>
+                  <span v-else>/</span>
                 </div>
               </div>
               <div class="inline_block" style="flex: 1">
@@ -1111,7 +1148,7 @@
               <div class="inline_block" style="flex: 1">
                 实际脱水量：
                 <div class="under_line"
-                  style="width: 90px; text-align: center"
+                  style="width: 40%; text-align: center"
                 >
                   {{record.assessment_after_dislysis.actual_ultrafiltration ? record.assessment_after_dislysis.actual_ultrafiltration : "/" }}
                 </div>ml
@@ -1127,12 +1164,21 @@
             </div>
           </div>
           <!-- 透析小结 -->
-          <div class="row" style="width: 99%;border: 1px solid black;height: 120px;white-space: normal;">
-            <div style="height: 80px;">
-              治疗小结:
-              <span style="white-space: normal;">
-                {{ record.summer&&record.summer.dialysis_summary.length>0 ? record.summer.dialysis_summary : ""}}
-              </span>
+          <div  style="width: 99%;border: 1px solid black;height: 120px;white-space: normal;padding:5px ;">
+            <div style="height: 80px;width: 100%;">
+              <div style="margin-bottom: 10px;">
+                宣教知识：
+                <span class="under_line" style="white-space: normal;width: 80%;">
+                  {{ record.summer && record.summer.mission ? record.summer.mission : ''}}
+                </span>
+              </div>
+              <div style="width: 100%;">
+                治疗小结:
+                <span class="under_line" style="white-space: normal;width: 80%;">
+                  {{ record.summer&&record.summer.dialysis_summary.length>0 ? record.summer.dialysis_summary : ""}}
+                </span>
+              </div>
+             
             </div>
             <div style="height: 20px;text-align: right;padding-right:30%;">
               医生签名:
@@ -1774,7 +1820,7 @@ export default {
 .row {
   font-size: 14px;
   line-height: 20px;
-  padding: 5px 0;
+  padding: 5px;
 }
 
 .inline_block {

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -464,6 +464,15 @@
           type="primary"
           >批量打印</el-button>
       </template>
+      <template v-if="this.template_id == 74">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button>
+      </template>
       <template v-if="this.template_id == 75">
         <el-button
           size="small"
@@ -2249,6 +2258,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/seventytwo" });
       }else if (this.template_id == 73) {
         this.$router.push({ path: "/dialysis/print/batch/seventythree" });
+      }else if (this.template_id == 74) {
+        this.$router.push({ path: '/dialysis/print/batch/seventyfour' });
       }else if (this.template_id == 75) {
         this.$router.push({ path: "/dialysis/print/batch/seventyfive" });
       }else if (this.template_id == 76) {

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

@@ -244,6 +244,18 @@
           ></el-input>
         </el-form-item>
 
+        <el-form-item  label="血滤器:"
+            v-if="isShowFiled('血滤器')"
+            :prop="isName('血滤器')"
+            :rules="isCheckmust('血滤器')">
+            <el-input
+              v-model="form.dialysis_strainer"
+              style="width: 200px"
+              @focus="showInnerDialog('12')"
+            ></el-input>
+        </el-form-item>
+
+
         <el-form-item
           label="血管通路："
           v-if="isShowFiled('血管通路')"
@@ -449,6 +461,7 @@ export default {
         catheter_operation:"",
         blood_flow_volume:"" ,
         schedual_type:0,
+        dialysis_strainer:"",
       },
       blood_access_option: [],
       schedules_type: [
@@ -471,13 +484,14 @@ export default {
       },
       dialyzers: [],
       irrigations: [],
+      dialysisStrainerList:[],
       summary:[],
       blood_access_option_name:"",
       value2:"",
       infoDialogVisible:false,
       selected_date:"",
       remark:"",
-     
+
     };
   },
   props: {
@@ -508,6 +522,7 @@ export default {
     lastOrder: {
       type: Object,
     },
+
   },
   mounted() {},
   created() {
@@ -541,6 +556,7 @@ export default {
     this.form.puncture_way = this.dialysis_order.puncture_way;
     this.form.dialysis_dialyszers = this.dialysis_order.dialysis_dialyszers;
     this.form.dialysis_irrigation = this.dialysis_order.dialysis_irrigation;
+    this.form.dialysis_strainer = this.dialysis_order.dialysis_strainer;
     this.form.blood_access_id = this.dialysis_order.blood_access_id;
     this.form.blood_drawing = this.dialysis_order.blood_drawing
     this.blood_access_option_name = this.changeBloodAccessOpion(this.dialysis_order.blood_access_id)
@@ -647,6 +663,7 @@ export default {
       console.log("stockType", this.stockType);
       var arr = [];
       var arrTwo = [];
+      var arrThree = []
       for (let i = 0; i < this.stockType.length; i++) {
         if (this.stockType[i].stock_attribute == 2) {
           arr.push(this.stockType[i]);
@@ -654,9 +671,13 @@ export default {
         if (this.stockType[i].stock_attribute == 3) {
           arrTwo.push(this.stockType[i]);
         }
+        if(this.stockType[i].stock_attribute == 4){
+            arrThree.push(this.stockType[i])
+        }
       }
       var dialyzator = [];
       var irrigation = [];
+      var dialysis_strainer = []
       for (let i = 0; i < arr.length; i++) {
         for (let j = 0; j < arr[i].GoodInfo.length; j++) {
           dialyzator.push(arr[i].GoodInfo[j]);
@@ -670,6 +691,14 @@ export default {
         }
       }
       this.irrigations = irrigation;
+
+      for(let i=0;i<arrThree.length;i++){
+          for (let j = 0; j < arrThree[i].GoodInfo.length; j++) {
+            dialysis_strainer.push(arrThree[i].GoodInfo[j])
+          }
+        }
+
+        this.dialysisStrainerList = dialysis_strainer
     },
   },
   computed: {},
@@ -900,10 +929,10 @@ export default {
           }
 
 
-         
+
           console.log("质控护士", this.form.quality_nurse_id);
           console.log("this.form.nuclein_date", this.form.nuclein_date);
-
+          console.log("dialysis_strainer------------------",this.form.dialysis_strainer)
           startDialysis(
             this.patient_id,
             this.schedule_date
@@ -929,7 +958,8 @@ export default {
             this.form.blood_access_id,
             this.form.nuclein_date,
             this.form.catheter_operation,
-            this.form.blood_flow_volume
+            this.form.blood_flow_volume,
+            this.form.dialysis_strainer,
           ).then((rs) => {
             this.loading = false;
             var resp = rs.data;
@@ -983,6 +1013,7 @@ export default {
       ParamsQuery["mode"] = "2";
       ParamsQuery['catheter_operation'] = this.form.catheter_operation
       ParamsQuery["blood_flow_volume"] = this.form.blood_flow_volume
+      ParamsQuery["dialysis_strainer"] = this.form.dialysis_strainer
       if (this.dialysis_order.creator != this.$store.getters.xt_user.user.id) {
         ParamsQuery["mode"] = "3";
       }
@@ -1084,6 +1115,16 @@ export default {
           this.InnerDialogProps.selected = this.form.puncture_needle;
           this.InnerDialogProps.isShowTextArea = false;
           break;
+        case '12':
+            for (let i = 0; i < this.dialysisStrainerList.length; i++) {
+              this.dialysisStrainerList[i].name = this.dialysisStrainerList[i].specification_name
+            }
+            this.InnerDialogProps.values = this.dialysisStrainerList
+            this.InnerDialogProps.titles = '血滤器'
+            this.InnerDialogProps.type = 'dialysis_strainer'
+            this.InnerDialogProps.selected = this.form.dialysis_strainer
+            this.InnerDialogProps.isShowTextArea = false
+        break
         case "13": // 穿刺方式
           this.InnerDialogProps.values = this.puncture_ways;
           this.InnerDialogProps.titles = "穿刺方式";
@@ -1109,6 +1150,9 @@ export default {
         case "irrigations":
           this.form.dialysis_irrigation = val.value.join(",");
           break;
+        case 'dialysis_strainer':
+          this.form.dialysis_strainer = val.value.join(",")
+        break
       }
     },
     innerDialogCancle: function () {

src/xt_pages/dialysis/details/dialysisComputer.vue

@@ -58,6 +58,10 @@
         <li v-if="isShow('灌流器')">
           <label>灌流器 : </label>
           <span class="content">{{ record.dialysis_irrigation }}</span>
+        </li>
+        <li v-if="isShow('血滤器')">
+          <label>血滤器 : </label>
+          <span class="content">{{ record.dialysis_strainer }}</span>
         </li>
          <li v-if="isShow('血管通路')">
           <label>血管通路 : </label>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -952,6 +952,18 @@
         >
         </div>
       </template>
+      <template v-if="org_template_info.template_id == 77">
+        <div>
+          <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+        </div>
+      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1460,6 +1472,9 @@
           <DialysisPrintOrderSeventysix v-bind:childResponse="childResponse"
           v-if="org_template_info.template_id == 76">
           </DialysisPrintOrderSeventysix>
+          <DialysisPrintOrderSeventyseven v-bind:childResponse="childResponse"
+          v-if="org_template_info.template_id == 77">
+          </DialysisPrintOrderSeventyseven>
         </div>
       </el-container>
     </div>
@@ -1554,6 +1569,7 @@ import DialysisPrintOrderSeventythree from './template/DialysisPrintOrderSeventy
 import DialysisPrintOrderSop from './template/DialysisPrintOrderSop'
 import DialysisPrintOrderseventyfive from './template/DialysisPrintOrderseventyfive'
 import DialysisPrintOrderSeventysix from './template/DialysisPrintOrderSeventysix'
+import DialysisPrintOrderSeventyseven from './template/DialysisPrintOrderSeventyseven'
 import DialysisPrintOrderZero from './template/DialysisPrintOrderZero'
 export default {
   name: "dialysisPrintOrder",
@@ -1634,6 +1650,7 @@ export default {
     DialysisPrintOrderSop,
     DialysisPrintOrderseventyfive,
     DialysisPrintOrderSeventysix,
+    DialysisPrintOrderSeventyseven,
     DialysisPrintOrderZero,
     LabelBox,
     BreadCrumb,
@@ -2323,6 +2340,13 @@ export default {
           style: style2,
           scanStyles: false,
         });
+      }else if (this.org_template_info.template_id == 77) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style2,
+          scanStyles: false,
+        });
       }
        else if (this.org_template_info.template_id == 199 ) {
         printJS({

src/xt_pages/dialysis/template/DialysisPrintOrderSeventy.vue

@@ -2310,8 +2310,7 @@
                         </span>
                         <img
                           :style="{'height':org_id==10597 ? '25px':'35px'}"
-                          :src="
-                            setAdminUserES(check == null ? 0 : check.modifier)
+                          :src="setAdminUserES(check == null ? 0 : check.modifier)
                           "
                           alt=""
                           srcset=""

src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue

@@ -27,33 +27,33 @@
             血液透析记录单
           </div>
         </div>
-        <div class="row">
-          <div class="inline_block">
+        <div class="row" style="display: flex;">
+          <div class="inline_block" style="flex: 1;">
             姓名：
             <div class="under_line" style="width: 50px; text-align: center">
               {{ patientInfo.name }}
             </div>
           </div>
-          <div class="inline_block" style="margin:0 10px">
+          <div class="inline_block" style="flex: 1;">
             性别：
             <div class="under_line" style="width: 30px; text-align: center">
               {{ patientInfo_gender_1 ? "男" : "女" }}
             </div>
           </div>
-          <div class="inline_block" style="">
+          <div class="inline_block" style="flex: 1;">
             年龄：
             <div class="under_line" style="width: 30px; text-align: center">
               {{ getAge(patientInfo) }}
             </div>
             岁
           </div>
-          <div class="inline_block" style="margin: 0 10px;">
+          <div class="inline_block" style="flex: 1;">
             病历号：
             <div class="under_line" style="width: 70px; text-align: center">
               {{ patientInfo.dialysis_no }}
             </div>
           </div>
-          <div class="inline_block" style="">
+          <div class="inline_block" style="flex: 1;">
             日期：
             <div class="under_line"
             style="width: 100px; text-align: center"
@@ -61,7 +61,7 @@
               {{ xtdate }}
             </div>
           </div>
-          <div class="inline_block" style="margin-left: 10px">
+          <div class="inline_block" style="flex: 1;">
             次数：
             <div
               class="under_line"
@@ -83,7 +83,7 @@
             <div class="under_line"
               style="
                 width: 640px;
-                text-align: left;
+                text-align: center;
                 word-wrap: break-word;
                 white-space: inherit;
               "
@@ -92,10 +92,10 @@
             </div>
           </div>
         </div>
-        <div class="row" style="text-align: center;border: 1px solid black;width: 99%">
+        <div style="text-align: center;border: 1px solid black;width: 99%;padding: 3px 0;font-size: 18px;">
           透前情况
         </div>
-        <div class="row" style="border: 1px solid black;border-top: none;width: 99%;">
+        <div style="border: 1px solid black;border-top: none;width: 99%;border-bottom: none;">
           <div class="row" style="display: flex;">
             <div class="inline_block" style="flex: 2;" >
               血管通路：
@@ -124,15 +124,21 @@
               }}
               </div>
             </div>
-            <div class="inline_block" style="flex: 1;" >
-              透析器：
+            <div class="inline_block" style="flex: 2;" >
+              透析（滤）器：
               <div class="under_line"
-                style=" width: 50%;
+                style=" width: 40%;
                   text-align: center;
                   white-space: normal;
                 "
               >
-                {{ dialysisOrder.dialysis_dialyszers ? dialysisOrder.dialysis_dialyszers : "/" }}
+                <span v-if="dialysisOrder !=null" >
+                  {{dialysisOrder.dialysis_dialyszers ? dialysisOrder.dialysis_dialyszers : "/" }}
+                </span>
+                <span v-if="dialysisOrder !=null && dialysisOrder.dialysis_strainer!=''" >
+                   /{{dialysisOrder.dialysis_strainer ? dialysisOrder.dialysis_strainer : "" }}
+                </span>
+
               </div>
             </div>
             <div class="inline_block" style="flex: 1;" >
@@ -182,9 +188,11 @@
                   white-space: normal;
                 "
               >
-                {{
-                  dialysisOrder.dialysis_irrigation ? dialysisOrder.dialysis_irrigation : "/"
-                }}
+                <span v-if="dialysisOrder !=null && dialysisOrder.dialysis_irrigation != '0'">
+                  {{ dialysisOrder.dialysis_irrigation ? dialysisOrder.dialysis_irrigation : "/"}}
+                </span>
+                <span v-else-if="dialysisOrder !=null && dialysisOrder.dialysis_irrigation == '0'">/</span>
+                <span v-else>/</span>
               </div>
             </div>
             <div class="inline_block" style="flex: 1;" >
@@ -256,6 +264,16 @@
               <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu/h</span>
               <!-- <span v-else>mg/h</span> -->
             </div>
+            <div class="inline_block" style="flex: 1">
+              透前体重：
+              <div
+                class="under_line"
+                style="width: 70px; text-align: center"
+              >
+                {{predialysis.weight_before ? predialysis.weight_before : ""}}
+              </div>
+              kg
+            </div>
           </div>
           <!--  -->
           <div class="row" style="display: flex;">
@@ -308,25 +326,17 @@
               </div>
               kg
             </div>
-            <div class="inline_block" style="flex: 1">
-              透前体重：
-              <div
-                class="under_line"
-                style="width: 70px; text-align: center"
-              >
-                {{predialysis.weight_before ? predialysis.weight_before : ""}}
-              </div>
-              kg
-            </div>
+
           </div>
           <!-- 医嘱脱水量 -->
-          <div class="row" style="display: flex;">
+          <div class="row" style="display: flex;vertical-align: text-bottom;">
             <div class="inline_block" style="flex: 1;" >
               医嘱脱水量:
               <div class="under_line"
                 style=" width: 100px;
-                  text-align: center; white-space: normal;
+                  text-align: center;
                 ">
+                <span style="height: 30px;display: inline-block;"></span>
                 {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "/"}}
               </div>L
             </div>
@@ -336,18 +346,18 @@
                 class="under_line"
                 style="width: 80px; text-align: center"
               >
+                <span style="height: 30px;display: inline-block;"></span>
                 {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "0"}} h
                 {{ prescription.dialysis_duration_minute ? prescription.dialysis_duration_minute : "0" }}min
               </div>
             </div>
-
             <div class="inline_block" style="flex: 1">
               医生签名：
               <div
                 class="under_line"
                 style="width: 100px; text-align: center"
               >
-                <span style="display: inline-block;" v-if="setAdminUserES(prescription.creater) == ''">
+                <span style="display: inline-block;height: 30px;" v-if="setAdminUserES(prescription.creater) == ''">
                   {{ getAdminUser(prescription.creater)}}
                 </span>
                 <span style="display: inline-block;" v-else>
@@ -358,7 +368,7 @@
             </div>
           </div>
           <!-- 特殊医嘱 -->
-          <div class="row" >
+          <div class="row" style="padding-bottom: 10px;">
             <div class="inline_block" style="width: 100%;">
               特殊医嘱：
               <div class="under_line"
@@ -383,7 +393,7 @@
         </div> -->
         <!-- 医嘱 -->
         <div style="width: 99%;">
-          <table class="inside_table" border="1" style="border-collapse: collapse;width: 100%;text-align: center;">
+          <table class="inside_table" border="1" style="border-collapse: collapse;width: 100%;text-align: center;border-bottom: none;">
             <tbody>
               <tr style="line-height: 30px;">
                 <td
@@ -392,8 +402,8 @@
                     letter-spacing: 5px;
                     text-align: center;
                     font-weight: 520;
-                    font-size: 16px;
-                    padding: 0px 8px;
+                    font-size: 18px;
+                    padding: 3px 8px;
                     line-height: 30px;
                   "
                 >
@@ -417,17 +427,13 @@
                 v-for="(advice, advice_index) in doctor_advices"
                 :key="advice_index"
               >
-                <td height="32px">
+                <td style="line-height:35px">
                   <span v-if="advice.start_time">
                     {{ getTime(advice.start_time, "{h}:{i}") }}
                   </span>
-
                 </td>
-                <td
-                  height="32px"
-                  colspan="2"
-                  class="advice-name"
-                  style="padding-left: 7px"
+                <td style="padding-left: 5px;line-height:35px"
+                  colspan="2" class="advice-name"
                 >
 
                   <span v-if="advice.parent_id > 0"></span>
@@ -437,7 +443,7 @@
                     }}{{ advice.drug_spec_unit }})</span
                   >
                   <span v-if="advice.prescribing_number"
-                    >&nbsp;&nbsp; {{ advice.prescribing_number
+                    >&nbsp; {{ advice.prescribing_number
                     }}{{ advice.prescribing_number_unit }}</span
                   >
                   <span v-if="advice.single_dose != 0">
@@ -458,7 +464,7 @@
                     >({{ advice.remark }})</span
                   >
                 </td>
-                <td height="32px">
+                <td style="line-height:35px">
                   <span
                     v-if="setAdminUserES(advice.advice_doctor) == ''"
                     >{{ getAdminUser(advice.advice_doctor) }}</span
@@ -471,12 +477,12 @@
                     v-else
                   />
                 </td>
-                <td height="32px">
+                <td style="line-height:35px">
                   <span v-if="advice.execution_time">{{
                     getTime(advice.execution_time, "{h}:{i}")
                   }}</span>
                 </td>
-                <td height="32px">
+                <td style="line-height:35px">
                   <span
                     v-if="setAdminUserES(advice.execution_staff) == ''"
                     >{{ getAdminUser(advice.execution_staff) }}</span
@@ -490,7 +496,7 @@
                   />
                 </td>
 
-                <td height="32px">
+                <td style="line-height:35px">
                   <span
                     v-if="setAdminUserES(advice.checker) == ''"
                     >{{ getAdminUser(advice.checker) }}</span
@@ -508,18 +514,18 @@
           </table>
         </div>
         <!-- 透析监测 -->
-        <div class="row" style="width: 99%;">
+        <div style="width: 99%;">
           <table class="inside_table" border="1" style="border-collapse: collapse;width: 100%;text-align: center;">
             <tbody>
-              <tr style="line-height: 30px; padding: 8px 5px">
+              <tr style="line-height: 30px;">
                 <td
                   colspan="13"
                   style="
                     letter-spacing: 5px;
                     text-align: center;
                     font-weight: 520;
-                    font-size: 16px;
-                    padding: 0px 8px;
+                    font-size: 18px;
+                    padding: 3px 8px;
                     line-height: 30px;
                   "
                 >
@@ -553,12 +559,44 @@
                 <td width="50">{{monitor.arterial_pressure ? monitor.arterial_pressure: "/"}}</td>
                 <td width="50">{{monitor.venous_pressure ? monitor.venous_pressure : "/"}}</td>
                 <td width="50">{{monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "/"}}</td>
-                <td width="50">{{monitor.blood_flow_volume? monitor.blood_flow_volume: "/"}}</td>
+                <td width="50">{{monitor.blood_flow_volume ? monitor.blood_flow_volume: "/"}}</td>
                 <td width="50">{{ monitor.conductivity ? monitor.conductivity : "/" }}</td>
-                <td width="50">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/' }}</td>
-                <td width="50">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0" }}</td>
+                <td width="50">
+                  <span v-if="monindex == 0">
+                    {{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: "0" }}
+                  </span>
+                  <span v-else-if="monindex == ( monitors.length-1)">
+                    {{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/' }}
+                  </span>
+                  <span v-else>
+                    {{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/' }}
+                  </span>
+
+                </td>
+                <td width="50">
+                  <span v-if="monindex == 0">
+                    {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0" }}
+                  </span>
+                  <span v-else-if="monindex == ( monitors.length-1)">
+                    {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume: "/" }}
+                  </span>
+                  <span v-else>
+                    {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume: "/" }}
+                  </span>
+                </td>
                 <!-- 剩余肝素 -->
-                <td width="65">{{ monitor.heparin ? monitor.heparin :'/' }}</td>
+                <td width="65">
+                  <span v-if="monindex == 0">
+                    {{ monitor.heparin ? monitor.heparin :'0' }}
+                  </span>
+                  <span v-else-if="monindex == ( monitors.length-1)">
+                    {{ monitor.heparin ? monitor.heparin: "/" }}
+                  </span>
+                  <span v-else>
+                    {{ monitor.heparin ? monitor.heparin: "/" }}
+                  </span>
+                  <!-- {{ monitor.heparin != '' ? monitor.heparin :'/' }}-->
+                </td>
                 <td width="200">
                   <template v-if=" (dialysisOrder && monitor.operate_time == dialysisOrder.start_time)">
                     【开始透析】 <span v-if="org_id ==10598">引血100ml/min</span>
@@ -571,7 +609,7 @@
           </table>
         </div>
 
-        <div class="row" style="border: 1px solid black;border-bottom:none;width: 99%;">
+        <div  style="border: 1px solid black;border-bottom:none;border-top:none;width: 99%;">
           <div class="row" style="display: flex;">
             <div class="inline_block" style="flex: 1">
               穿刺护士：
@@ -596,7 +634,7 @@
                   }}</span
                 >
                 <img
-                  style="height: 35px"
+                  style="height: 30px"
                   :src="
                     setAdminUserES(
                       dialysisOrder == null
@@ -633,7 +671,7 @@
                   }}</span
                 >
                 <img
-                  style="height: 35px"
+                  style="height: 30px"
                   :src="
                     setAdminUserES(
                       dialysisOrder == null
@@ -655,7 +693,7 @@
                 <span style="height: 30px; display: inline-block" v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
                   {{ getAdminUser(check == null ? 0 : check.modifier) ? getAdminUser(check == null ? 0 : check.modifier) : "" }}
                 </span>
-                <img :src="setAdminUserES(check == null ? 0 : check.modifier)" alt="" srcset="" style="height:35px" v-else />
+                <img :src="setAdminUserES(check == null ? 0 : check.modifier)" alt="" srcset="" style="height:30px" v-else />
               </div>
             </div>
           </div>
@@ -683,7 +721,11 @@
               <div class="under_line"
                 style="width: 50%; text-align: center"
               >
-                {{ afterdialysis.dialysis_during ? afterdialysis.dialysis_during : "/" }}
+
+                <span v-if="afterdialysis.is_eat !=''">
+                  {{ afterdialysis.is_eat ==1 ? '有' : "无" }}
+                </span>
+                <span v-else>/</span>
               </div>
             </div>
             <div class="inline_block" style="flex: 1">
@@ -696,8 +738,8 @@
               </div>
             </div>
           </div>
-        
-          <div class="row" style="display: flex;">
+
+          <div class="row" style="display: flex;padding-bottom: 10px;">
             <div class="inline_block" style="flex: 1">
               透后体重：
               <div class="under_line"
@@ -747,12 +789,20 @@
           </div>
         </div>
         <!-- 透析小结 -->
-        <div class="row" style="width: 99%;border: 1px solid black;height: 120px;white-space: normal;">
-          <div style="height: 80px;">
-            治疗小结:
-            <span style="white-space: normal;">
-              {{ summary.dialysis_summary ? summary.dialysis_summary : "/"}}
-            </span>
+        <div style="width: 99%;border: 1px solid black;height: 100px;white-space: normal;">
+          <div style="height: 60px;padding: 5px;">
+            <div style="margin-bottom: 10px;">
+              宣教知识：
+              <span class="under_line"style="white-space: normal;width: 80%;">
+                {{ summary.mission ? summary.mission : '/' }}
+              </span>
+            </div>
+            <div>
+              治疗小结:
+              <span style="white-space: normal;">
+                {{ summary.dialysis_summary ? summary.dialysis_summary : "/"}}
+              </span>
+            </div>
           </div>
           <div style="height: 20px;text-align: right;padding-right:30%;">
             医生签名:
@@ -1718,6 +1768,7 @@ export default {
         this.tableAdvice = response.data.data.advices;
         // console.log("医嘱数据2222222222", this.advices);
         this.monitors = response.data.data.monitors;
+        console.log('医嘱监测',this.monitors.length-1);
         this.summary = response.data.data.summary;
         this.org_template_info = response.data.data.org_template_info;
 
@@ -2284,7 +2335,7 @@ export default {
 .row {
   font-size: 14px;
   line-height: 20px;
-  padding: 5px 0;
+  padding: 5px;
 }
 
 .inline_block {

src/xt_pages/management/index.vue

@@ -31,14 +31,14 @@
           >搜索</el-button
         >
 
-        <!-- <el-button
+        <el-button
           class="filter-item"
           type="primary"
           icon="el-icon-search"
           size="small"
           @click="Auto()"
           >脚本</el-button
-        > -->
+        >
       </div>
 
       <div class="cell clearfix">

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -226,7 +226,6 @@
 
               chrgitm_lvs = [...advice,...good,...project]
               
-              console.log('yyyyyyyyyyyy',chrgitm_lvs);
               for(let i in this.list){
                 for(let j in chrgitm_lvs){
                   if(this.list[i].is_total ==2){
@@ -330,12 +329,14 @@
                if( details[a].project.type == 2){
                  obj['name'] = details[a].project.project.project_name
                  obj['spec'] = ''
+                  // obj['spec'] = details[a].project.project.project_name
                  obj['unit'] = details[a].project.project.unit
 
 
                }else if(details[a].project.type == 3){
                  obj['name'] = details[a].project.good_info.good_name
-                 obj['spec'] = ''
+                //  obj['spec'] = ''
+                 obj['spec'] = details[a].project.good_info.specification_name
                  obj['unit'] = details[a].project.good_info.packing_unit
 
                }

src/xt_pages/outpatientCharges/allListTemplate/printFour.vue

@@ -117,7 +117,7 @@ export default {
 
     },
     getPage() {
-     
+      console.log('bbbbbbbbb',this.list);
       if (this.list.length <= 27) {
         this.page = 1
         this.pageArr.push(this.list.length)
@@ -156,9 +156,6 @@ export default {
   },
   created(){
     this.org_id = this.$store.getters.xt_user.org_id
-    console.log('hospital',this.hospital);
-    console.log('order',this.order);
-    console.log('kkkkkk',this.list);
   },
   watch: {
     list: {

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -34,6 +34,12 @@
           }}</span></template
         >
       </el-table-column>
+      <el-table-column align="center" prop="name" width="80" label="规格/型号">
+        <template slot-scope="scope">
+          <div>{{ scope.row.spec }}</div>
+        </template>
+      </el-table-column>
+      
       <el-table-column align="center" prop="name" width="80" label="单次用量">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
@@ -80,12 +86,6 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="80" label="规格/型号">
-        <template slot-scope="scope">
-          <div>{{ scope.row.spec }}</div>
-        </template>
-      </el-table-column>
-
       <el-table-column align="center" prop="name" width="60" label="金额">
         <template slot-scope="scope">
           <div>{{ scope.row.det_item_fee_sumamt }}</div>

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -16,11 +16,11 @@
         <!-- 此下条为本地开发下页面 -->
         <!-- <printTwo v-if="org_id == 4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo> -->
         <!-- org_id != 10138 && org_id != 10278 && org_id !=4&& org_id !=0 -->
-        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4 && org_id != 10375 && org_id != 10610 &&org_id != 10598 &&org_id != 0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4 && org_id != 10375 && org_id != 10610 &&org_id != 10598 &&org_id != 10537 &&org_id != 0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
         <printThree v-if=" org_id == 10375" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printThree>
-        <printTwo v-if="org_id == 10138 || org_id == 10278 || org_id ==10610 " v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
-        <printFour v-if="org_id == 10598 || org_id == 0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFour>
-      
+        <printTwo v-if="org_id == 10138 || org_id == 10278 || org_id ==10610 || org_id == 10537 || org_id == 0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
+        <printFour v-if="org_id == 10598 " v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFour>
+
       </div>
   </div>
 </template>

src/xt_pages/outpatientDoctorStation/treatTemplate/printFour.vue

@@ -38,7 +38,7 @@
                 <div style="width:100%;">诊断：{{getDiagnosis(item.info.diagnosis)}}</div>
             </div>
 
-            <div class="prescriptionBox" style="min-height: 380px;">
+            <div class="prescriptionBox" style="min-height: 450px;">
                 <table style="width:100%;text-align:center;line-height:25px;">
                     <tr>
                         <td>序号</td>

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -1,12 +1,7 @@
 <template>
     <div id='prescriptionPrint'>
         <div id='prescription-print' class="prescription-print" v-for="(item,index) in advicePrint" :key="index">
-            <span v-if="org_id == 10537 || org_id ==0">
-              <img
-                src="	https://kuyi.shengws.com/xuwenshou.jpg"
-                style="width: 100%"
-                alt=""/>
-            </span>
+           
             <div style="display:flex;justify-content: space-between;font-weight:bold;align-items:center;" >
                 <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
                     <span>费别</span>
@@ -125,7 +120,6 @@
                     :src="setAdminUserES(item.creator,item.doctor)"
                     alt=""
                     srcset=""
-
                   />
                 </div>
                 <div style="width: 300px;">签章：</div>
@@ -159,12 +153,7 @@
                   </tr>
               </table>
             </div>
-            <span v-if="org_id == 10537 || org_id ==0">
-            <img
-              src="https://kuyi.shengws.com/xuwenwei.jpg"
-              style="width: 100%"
-              alt=""
-            /></span>
+            
         </div>
 
 

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -19,12 +19,18 @@
           style="width: 100%"
           alt=""
       /></span>
-      <span v-if="org_id == 10610 ||org_id ==0">
+      <span v-if="org_id == 10610 ">
         <img
           src="@/assets/img/penggang_top.jpg"
           style="width: 100%"
           alt=""
       /></span>
+      <span v-if="org_id == 10537 ||org_id ==0">
+        <img
+          src="	https://kuyi.shengws.com/xuwenshou.jpg"
+          style="width: 100%"
+          alt=""/>
+      </span>
       <div class="printTitle">
         治疗单
         <span
@@ -196,7 +202,7 @@
             v-else
           />
         </div>
-        <!-- <div>药品金额：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):''}}</div> -->
+        
       </div>
       <div style="display: flex">
         <div style="display: flex">核对护士：</div>
@@ -218,12 +224,18 @@
           style="width: 100%"
           alt=""
       /></span>
-      <span v-if="org_id == 10610 ||org_id ==0">
+      <span v-if="org_id == 10610 ">
         <img
           src="@/assets/img/penggang_bottom.jpg"
           style="width: 100%"
           alt=""
       /></span>
+      <span v-if="org_id == 10537 ||org_id ==0">
+      <img
+        src="@/assets/img/xuwendizhi.jpg"
+        style="width: 100%"
+        alt=""
+      /></span>
       <div style="page-break-after: always"></div>
     </div>
 

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -268,7 +268,8 @@ export default {
               if(this.org_id ==10210 || this.org_id ==10215 || this.org_id == 10265){
                 list[i].stockIn = list[i].GoodStartFlowInfo.over_count
               }else{
-               
+                console.log("HHAHHAHA",list[i].id)
+                console.log("耗材id",list[i].specification_name)
                 console.log("入库",this.getAllStockIn(list[i].StWarehousingInfoTwo))
                 console.log("盘盈",this.getAllStockInFlow(list[i].WareStartInStockFlow))
                 console.log("出库",this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) )
@@ -278,7 +279,7 @@ export default {
                   list[i].stockIn = list[i].GoodStartFlowInfo.over_count
                 }else{
                   list[i].stockIn = this.getAllStockIn(list[i].StWarehousingInfoTwo) + this.getAllStockInFlow(list[i].WareStartInStockFlow) - this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlow(list[i].WareStartOutStockFlow)
-                  console.log("剩余库存---------------",list[i].stockIn)
+                  // console.log("剩余库存---------------",list[i].stockIn)
                   if(list[i].stockIn <0){
                     list[i].stockIn =0
                   }
@@ -300,9 +301,9 @@ export default {
               if(this.org_id == 10265){
                 list[i].overStock = list[i].GoodEndFlowInfo.over_count
               }else{
-                console.log("期初",list[i].stockIn)
-                console.log("增加",list[i].stockAdd)
-                console.log("出库",list[i].outStock)
+                // console.log("期初",list[i].stockIn)
+                // console.log("增加",list[i].stockAdd)
+                // console.log("出库",list[i].outStock)
                 if((list[i].stockIn + list[i].stockAdd - list[i].outStock)>0 ){
                   list[i].overStock = list[i].stockIn + list[i].stockAdd - list[i].outStock
                 }else{

src/xt_pages/stock/selfPreparedMedicine/index.vue

@@ -2,14 +2,14 @@
     <div class="main-contain">
         <div class="position">
             <bread-crumb :crumbs="crumbs"></bread-crumb>
-            <el-button
+            <!-- <el-button
                 size="small"
                 @click="setting"
                 class="filter-item"
                 style="float:right;"
                 type="primary"
                 >设置
-            </el-button>
+            </el-button> -->
         </div>
 
         <div class="app-container">
@@ -60,14 +60,46 @@
                     <div style="display:flex;justify-content: space-between;align-items: center;">
                         <div class="tablesTitle">自备药列表</div>
                         <div>
-                            <el-button type="primary" size="mini" @click="openForm(1)">添加</el-button>
+                            <!-- <el-button type="primary" size="mini" @click="openForm(1)">添加</el-button> -->
                             <el-button type="primary" size="mini" @click="openForm(2)">入库</el-button>
                             <el-button type="primary" size="mini" @click="openForm(3)">出库</el-button>
                         </div>
                     </div>
                     <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
                         <el-table-column align="center" prop="dialysis_no" label="药品名称" width="120">
-                            <template slot-scope="scope">{{scope.row.drug_name}}</template>
+                            <template slot-scope="scope">
+                              <el-form-item style="padding-top: 20px">
+                                  <el-autocomplete
+                                    class="checkSearch"
+                                    popper-class="my-autocomplete"
+                                    v-model="scope.row.drug_name"
+                                    :fetch-suggestions="querySearchAsync"
+                                    :trigger-on-focus="true"
+                                    placeholder="请输入药品名称"
+                                    @select="handleSelect"
+                                    @input="changeDrugName(scope.$index)"
+                                    style="width: 160px"
+                                  >
+                                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                                    <template slot-scope="{ item }">
+                                      <div class="name">
+                                        {{
+                                          item.drug_name +
+                                          item.dose +
+                                          item.dose_unit +
+                                          "*" +
+                                          item.min_number +
+                                          item.min_unit +
+                                          "/" +
+                                          item.max_unit +
+                                          "  " +
+                                          item.manufacturer
+                                        }}
+                                      </div>
+                                    </template>
+                                  </el-autocomplete>
+                                </el-form-item>
+                            </template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="规格名称">
                             <template slot-scope="scope">{{ scope.row.drug_spec }}</template>

src/xt_pages/stock/stockOutOrder.vue

@@ -2526,8 +2526,7 @@ export default {
       }
      }
      if(count > 0){
-      console.log("good_id",good_id)
-      console.log("数量我哦哦我",count)
+     
       return count
      }else{
       return 0 
@@ -2536,7 +2535,6 @@ export default {
      
     },
     getRow(row){
-      console.log("row233323232",row)
       var name = ""
       if(this.stockFlowList!=null && this.stockFlowList.length > 0){
         for(let i=0;i<this.stockFlowList.length;i++){

src/xt_pages/user/Informed/Informedconsent.vue

@@ -124,7 +124,7 @@
                   <Medicalhistory :patient_id ="this.patientID" :medicalList="medicalList" ref="childThrity" @getPatientMeDicalList="getPatientMeDicalList"></Medicalhistory>
                 </div>
                 <div v-if="show14">
-                  <heal_informed :patient_id ="this.patientID" ></heal_informed>
+                  <heal_informed :patient_id ="this.patientID" ref="childSeventy" ::patientTreamentPlan="patientTreamentPlan" @getTreamentPlan="getTreamentPlan"></heal_informed>
                 </div>
                 <div v-if="show15">
                   <criticalpatient_informed :patient_id ="this.patientID" ref="childFivety" :patientCritaicalInformedPrint="patientCritaicalInformedPrint" @getPatientCriticalList="getPatientCriticalList"></criticalpatient_informed>
@@ -160,7 +160,7 @@ import Medicalhistory from './components/Medicalhistory'
 import heal_informed from './components/heal_informed'
 import criticalpatient_informed from './components/criticalpatient_informed'
 import criticalpatient_informed2 from './components/criticalpatient_informed2'
-import { getPatientDetailInformedconsent,getFallOutBedPrintList,getFilterInformed,getProfundaInformed,getArterOvernous,getHighRiskInformed,getPatientMeDicalList,getAnticoagulationInformed,getCriticalInformed,getHemoperfusionInformed,getInformedConsent,getCatheterization,getDialyzerInformed, getTherapyInformed,getPatientCriticalList,getPatientCriticalOneList } from '@/api/patient'
+import { getPatientDetailInformedconsent,getFallOutBedPrintList,getFilterInformed,getProfundaInformed,getArterOvernous,getHighRiskInformed,getPatientMeDicalList,getAnticoagulationInformed,getCriticalInformed,getHemoperfusionInformed,getInformedConsent,getCatheterization,getDialyzerInformed, getTherapyInformed,getPatientCriticalList,getPatientCriticalOneList,getTreamentPlan } from '@/api/patient'
 export default {
 
   components: {
@@ -226,7 +226,8 @@ export default {
       dialyzerInformedPrint:{},
       therapyinformePrint:{},
       patientCritaicalInformedPrint:{},
-      patientCritaicalInformedOnePrint:{}
+      patientCritaicalInformedOnePrint:{},
+      patientTreamentPlan:{}
     }
 
   },
@@ -390,6 +391,15 @@ export default {
         }
       })
     },
+    getTreamentPlan(){
+      getTreamentPlan().then(response=>{
+        if(response.data.state ==1){
+          var list = response.data.data.treamentPlan
+          this.patientTreamentPlan = list  
+          this.$refs.childSeventy.show(list)
+        }
+      })
+    },
    
     rowClick(row, column, event){
      console.log('1111',row);
@@ -660,6 +670,7 @@ export default {
           this.show14=true,
           this.show15=false,
           this.show16=false
+          this.getTreamentPlan()
         }
         if(row.value==15){
      

src/xt_pages/user/Informed/components/heal_informed.vue

@@ -81,7 +81,7 @@
         </div>
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+          <el-button type="primary" @click="saveTreamtPlan">确 定</el-button>
         </span>
       </el-dialog>
 
@@ -91,7 +91,7 @@
 <script>
 import print from "print-js";
 import Editor from '@/components/Editor'
-import { getPatientDetailInformedconsent  } from '@/api/patient'
+import { getPatientDetailInformedconsent,saveTreamtPlan  } from '@/api/patient'
 import { jsGetAge, uParseTime } from "@/utils/tools";
 const content=`<p style='padding-left: 2em;margin-top: 10px;margin-bottom: 4px'>
   <span class="abs-index"></span>患者透析过程中出现低血压95/76mmHg，诉有头晕，予以最低超滤量，并回0.9%氯化钠200m1，原来超滤量减少200ml，建议患者控制透析间期体重增加不超5%，患者本人表示不同意医生处理方案，认为超滤量不能改，而且不能回水，那样会导致积水，经解释沟通后，患者家属仍坚持低血压时不予改超滤量，不同意回水处理，并表示后果自负，今由于患者本人多次不同意医生的处理方案，多次拒绝医生一切处理方案，医生也已将透析中反复低血压可能导致的后果如:导致内痿血流不足，内痿栓塞，内痿朋塌，严重低血压导致休克死亡等后果充分告知其家属，患者家属表示知情，后果自负，签字为证
@@ -117,7 +117,10 @@ export default{
   props: {
     patient_id: {
         type: Number,
-      }
+      },
+    patientTreamentPlan:{
+       type:Object,
+    }
   },
   components:{
     Editor
@@ -174,9 +177,38 @@ export default{
       },
       bianji(){
         this.dialogVisible=true
+      },
+      show(val){    
+       if(val!=null){
+        console.log("valw233223",val)
+         if(val.content!=""){
+           this.content = ""
+           this.content = val.content
+         }
+         
+       }
+     },
+      saveTreamtPlan(){
+        var params = {
+          content:this.$refs.editor.content
+         }
+        saveTreamtPlan(params).then(response=>{
+            if(response.data.state ==1){
+              var list = response.data.data.list
+              this.$emit('fMethod',list);
+              this.dialogVisible = false
+              this.$emit("getTreamentPlan","");
+            }
+        })
       }
   },
   created(){
+    console.log("hahhahahahahahwo",this.patientTreamentPlan)
+    if(this.patientTreamentPlan!=null && this.patientTreamentPlan.id >0){
+      
+      this.content = ""
+      this.content = this.patientTreamentPlan.content
+    }
     this.getlist()
   }
 }