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

src/api/dialysis.js

@@ -538,3 +538,13 @@ export function getDialysisGatherList(params){
     params:params,
   })
 }
+
+
+export function getPatientRecordList(patient_id,params){
+ 
+  return request({
+    url:"/api/patient/getpatientrecordlist?patient_id="+patient_id,
+    method:"Get",
+    params:params,
+  })
+}

src/api/drug/drug.js

@@ -661,4 +661,13 @@ export function getPurchaseStockQueryList(params){
     method:"Get",
     params:params,
   })
+}
+
+export function getCheckGoodBatchList(id,params){
+  
+  return request({
+    url:"/api/good/getcheckgoodbatchlist?id="+id,
+    method:"get",
+    params:params,
+  })
 }

src/api/drug/drug_stock.js

@@ -652,4 +652,22 @@ export function getDrugFlowDetailByDrugId(params){
     method:"Get",
     params:params
   })
+}
+
+
+export function getCheckDrugBatchList(drug_id,params){
+ return request({
+  url:"/api/drug/getcheckdrugbatchlist?drug_id="+drug_id,
+  method:"get",
+  params:params,
+ })
+}
+
+export function getDrugPatientName(params){
+  
+  return request({
+    url:"/api/drug/getdrugpatientname",
+    method:"Get",
+    params:params,
+  })
 }

src/api/stock.js

@@ -1096,4 +1096,31 @@ export function getStockFlowOrderList(params){
     method:"Get",
     params:params,
   })
+}
+
+export function getGoodPatientName(params){
+  return request({
+    url:"/api/stock/getgoodpatientname",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function updateBaseDrugLibByUserOrgId(params){
+  
+  return request({
+    url:"/api/drug/updatebasedruglisbyuserorgid",
+    method:"Get",
+    params:params
+  })
+}
+
+
+export function updateGoodInfoByUserOrgId(params){
+
+  return request({
+    url:"/api/good/updategoodinfobyuserorgid",
+    method:"Get",
+    params:params
+  })
 }

src/xt_pages/data/components/consumables.vue

@@ -54,7 +54,7 @@
      <div style="display:flex; align-items:center;margin-bottom:10px;">
         <!--<el-button type="primary" size="mini" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 10138">批量备案</el-button>-->
         <!--<el-button type="primary" size="mini">批量备案</el-button>-->
-        <el-link target="_blank" href="https://kuyi.shengws.com/stockTemplate.xlsx" :underline="false"
+        <el-link target="_blank" href="https://kuyi.shengws.com/stockTemplateTwo.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
             class="filter-item"
@@ -80,6 +80,15 @@
           size="small"
         >点击导出
         </el-button>
+
+        <!-- <el-button
+          style="margin-left:10px;"
+          @click="jiaoBen()"
+          class="filter-item"
+          type="primary"
+          size="small"
+        >脚本
+        </el-button> -->
       </div>
 
     <el-table
@@ -111,7 +120,7 @@
           {{ getGoodTypeByID(scope.row.good_type_id) }}
         </template>
       </el-table-column>
-      <el-table-column label="注册编码" width="140" align="center">
+      <el-table-column label="注册证号" width="140" align="center">
         <template slot-scope="scope">
           {{ scope.row.register_number }}
         </template>
@@ -132,6 +141,11 @@
           {{ scope.row.social_security_directory_code }}
         </template>
       </el-table-column>
+      <el-table-column label="生产厂家" width="140" align="center">
+        <template slot-scope="scope">
+          {{ getManufactur(scope.row.manufacturer) }}
+        </template>
+      </el-table-column>
       <el-table-column label="状态" width="60" align="center">
         <template slot-scope="scope">
         <!--{{ scope.row.good_status}}-->
@@ -238,7 +252,8 @@
     getGoodInfoList,
     modifyGoodInfo,
     postGoodInformation,
-    getInitializtion
+    getInitializtion,
+    updateGoodInfoByUserOrgId
   } from '@/api/stock'
   import UploadExcel from '@/xt_pages/components/UploadExcel'
   import GoodExcel from '@/xt_pages/components/GoodExcel'
@@ -369,6 +384,13 @@
       }
     },
     methods: {
+    jiaoBen(){
+      updateGoodInfoByUserOrgId().then(response=>{
+        if(response.data.state ==1){
+
+        }
+      })
+      },
       putOnUnRecord(id){
         var that = this;
         let params = {
@@ -1187,7 +1209,7 @@
 
           var isHasMedicalInsuranceLevel = header.includes('*医保等级');
 
-          var isHasGoodUnit = header.includes('*单位');
+          var isHasGoodUnit = header.includes('*包装单位');
 
           var isHasStockWarnCount = header.includes('*库存警戒');
 
@@ -1199,7 +1221,7 @@
 
           var isHasSpecificationName = header.includes('*规格型号');
 
-          var isHasBuyPrice = header.includes('*零价');
+          var isHasBuyPrice = header.includes('*零售价');
 
           if (!(isHasMedicalInsuranceLevel && isHasGoodUnit && isHasStockWarnCount && isHasManuFacturer  && isHasGoodName && isHasGoodKand && isHasSpecificationName &&  isHasBuyPrice)) {
             this.dialogVisible = true;
@@ -1212,7 +1234,7 @@
 
        var tableData = [];
        for(let i=1;i<results.length;i++){
-         let obj = {"good_kind_id":0,"good_type_id":0,"medical_insurance_id":0,"dealer_id":0,"statistic_id":0,"manufacturer_id":0,"unit_id":0};
+         let obj = {"good_kind_id":0,"good_type_id":0,"medical_insurance_id":0,"dealer_id":0,"statistic_id":0,"manufacturer_id":0,"unit_id":0,"default_count":1,"default_count_unit":"","buy_price":"","retail_price":""};
          for (var key in results[i]) {
 
            if (results[i]['*耗材名称'] === undefined) {
@@ -1263,22 +1285,45 @@
               }
            }
 
-           if (results[i]['*单位'] === undefined) {
+           if (results[i]['*包装单位'] === undefined) {
                 obj['good_unit'] = ''
               } else {
-             if (key == '*单位') {
+             if (key == '*包装单位') {
                obj['good_unit'] = results[i][key].replace(/\s/g,"")
               }
            }
+           if (results[i]['*默认单次用量'] === undefined) {
+                obj['default_count'] = ''
+              } else {
+             if (key == '*默认单次用量') {
+               obj['default_count'] = parseInt(results[i][key].replace(/\s/g,"")) 
+              }
+           }
+
+           if (results[i]['*默认单次用量单位'] === undefined) {
+                obj['default_count_unit'] = ''
+              } else {
+             if (key == '*默认单次用量单位') {
+               obj['default_count_unit'] = results[i][key].replace(/\s/g,"")
+              }
+           }
 
-          if (results[i]['*零价'] === undefined) {
+          if (results[i]['*零售价'] === undefined) {
                 obj['retail_price'] = ''
               } else {
-             if (key == '*零价') {
+             if (key == '*零售价') {
                obj['retail_price'] = results[i][key].replace(/\s/g,"")
               }
            }
 
+           if (results[i]['*进货价'] === undefined) {
+                obj['buy_price'] = ''
+              } else {
+             if (key == '*进货价') {
+               obj['buy_price'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
             if (results[i]['*库存警戒'] === undefined) {
                 obj['stock_warn_count'] = ''
               } else {
@@ -1311,13 +1356,7 @@
               }
            }
 
-           if (results[i]['最新进价'] === undefined) {
-                obj['buy_price'] = ''
-              } else {
-             if (key == '最新进价') {
-               obj['buy_price'] = results[i][key].replace(/\s/g,"")
-              }
-           }
+         
 
            if (results[i]['医保编码'] === undefined) {
                 obj['medical_insurance_number'] = ''
@@ -1392,6 +1431,22 @@
               }
            }
 
+           if (results[i]['批准文号'] === undefined) {
+                obj['number'] = ''
+              } else {
+             if (key == '批准文号') {
+               obj['number'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['注册编号'] === undefined) {
+                obj['register_number'] = ''
+              } else {
+             if (key == '注册编号') {
+               obj['register_number'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
            if (results[i]['备注'] === undefined) {
                 obj['remark'] = ''
               } else {
@@ -1465,6 +1520,7 @@
           'goods':tableData
         };
         console.log("param2332323223",params)
+    
         postGoodInformation(params).then(response=>{
            if(response.data.state == 1){
              var msg =  response.data.data.msg;
@@ -1576,8 +1632,8 @@
          }
          console.log("hhhadhh233323232",this.goodInfo.goodInfoData)
 
-         const tHeader = ['耗材名称','耗材种类','耗材类型','医保等级','规格型号','生产厂商','单位','零价','库存警戒','经销商','最新进价','医保编码','社保目录编码','批准文号','医保等级',"注册编码"]
-         const filterVal = ['good_name', 'good_kind_name','good_type_name','medical_insurance_level_name','specification_name','manufacturer_name','packing_unit','packing_price','stock_warn_count','dealer_name','buy_price','medical_insurance_number','social_security_directory_code','number','medical_insurance_level','register_number']
+         const tHeader = ['耗材名称','耗材种类','耗材类型','医保等级','规格型号','生产厂商','包装单位','进货价','零售价','库存警戒','经销商','默认单次用量','默认单次用量单位','拼音','五笔','医保编码','是否特病目录','是否备案','统计分类','状态','社保目录编码','生产地类别','特殊医用标志',"批准文号","注册编号","备注"]
+         const filterVal = ['good_name', 'good_kind_name','good_type_name','medical_insurance_level_name','specification_name','manufacturer_name','packing_unit','buy_price','packing_price','stock_warn_count','dealer_name','default_count','default_count_unit','','','medical_insurance_number','是','','','','social_security_directory_code','','','number','register_number','']
 
          const data = this.formatJson(filterVal,this.goodInfo.goodInfoData)
 
@@ -1593,6 +1649,16 @@
        formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]))
        },
+       getManufactur(manufacturer){
+        var manufacturer_name =""
+         for(let i=0;i<this.manufacturers.length;i++){
+           if(manufacturer == this.manufacturers[i].id){
+              manufacturer_name = this.manufacturers[i].manufacturer_name
+           }
+         }
+         return manufacturer_name
+       }
+      
     },
     created() {
       this.goodInfo.goodInfoDialog.formValue.is_user = "2"

src/xt_pages/data/components/drugs.vue

@@ -47,7 +47,7 @@
     <div style="display:flex; align-items:center;margin-bottom:10px;">
         <!--<el-button type="primary" size="small" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 ||  this.$store.getters.xt_user.org_id == 10138 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>-->
         <el-button type="primary" size="small"  @click="GDYBBatchPutOnRecord()">批量备案</el-button>
-        <el-link target="_blank" href="https://kuyi.shengws.com/drugsTemplate.xlsx" :underline="false"
+        <el-link target="_blank" href="https://kuyi.shengws.com/drugsTemplateOne.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
             class="filter-item"
@@ -73,6 +73,15 @@
           size="small"
         >点击导出
         </el-button>
+
+        <!-- <el-button
+          style="margin-left:10px;"
+          @click="jiaoBen()"
+          class="filter-item"
+          type="primary"
+          size="small"
+        >脚本
+        </el-button> -->
       </div>
     <el-table :data="list" border style="width: 100%" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"
@@ -239,7 +248,7 @@
   import selfPayment from './selfPayment'
   import maintain from './maintain'
   import addDrugs from './addDrugs'
-  import { GetAllManufacturer,postDrugInformation,getInitializtion } from '@/api/stock'
+  import { GetAllManufacturer,postDrugInformation,getInitializtion,updateBaseDrugLibByUserOrgId } from '@/api/stock'
   import { getDataConfig,getDictionaryDataConfig } from "@/utils/data";
   import { uParseTime } from '@/utils/tools'
   import {
@@ -1033,7 +1042,7 @@
 
        var tableData = [];
        for(let i=1;i<results.length;i++){
-         let obj = {"drug_type_id":0,"drug_dosage_form_id":0,"medical_insurance_level_id":0,"drug_classify_id":0,"manufacturer_id":0,"dealer_id":0,"statistics_category_id":0,"drug_control_id":0,"pharmacology_category_id":0,"drug_category_id":0};
+         let obj = {"drug_type_id":0,"drug_dosage_form_id":0,"medical_insurance_level_id":0,"drug_classify_id":0,"manufacturer_id":0,"dealer_id":0,"statistics_category_id":0,"drug_control_id":0,"pharmacology_category_id":0,"drug_category_id":0,"prescribing_number":"","prescribing_number_unit":"","drug_day":"","delivery_way":"","execution_frequency":""};
          for (var key in results[i]) {
 
            if (results[i]['*药品名称'] === undefined) {
@@ -1205,22 +1214,50 @@
               }
            }
 
-            if (results[i]['默认给药途径'] === undefined) {
+            if (results[i]['*默认给药途径'] === undefined) {
                 obj['delivery_way'] = ''
               } else {
-            if (key == '默认给药途径') {
+            if (key == '*默认给药途径') {
                 obj['delivery_way'] = results[i][key].replace(/\s/g,"")
               }
            }
 
-              if (results[i]['默认执行频率'] === undefined) {
+          if (results[i]['*默认执行频率'] === undefined) {
                 obj['execution_frequency'] = ''
               } else {
-            if (key == '默认执行频率') {
+            if (key == '*默认执行频率') {
                 obj['execution_frequency'] = results[i][key].replace(/\s/g,"")
               }
            }
 
+
+           if (results[i]['*默认开药数量'] === undefined) {
+                obj['prescribing_number'] = ''
+              } else {
+            if (key == '*默认开药数量') {
+                obj['prescribing_number'] = parseInt(results[i][key].replace(/\s/g,""))
+              }
+           }
+
+           if (results[i]['*默认开药数量单位'] === undefined) {
+                obj['prescribing_number_unit'] = ''
+              } else {
+            if (key == '*默认开药数量单位') {
+                obj['prescribing_number_unit'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['*默认开药天数'] === undefined) {
+                obj['drug_day'] = ''
+              } else {
+            if (key == '*默认开药天数') {
+                obj['drug_day'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+
+           
+
            if (results[i]['限制性用药'] === undefined) {
                 obj['lmt_used_flag'] = ''
               } else {
@@ -1459,8 +1496,7 @@
           'drugs':tableData
         };
         console.log("params222222222",params)
-
-
+        
         postDrugInformation(params).then(response=>{
            if(response.data.state == 1){
              var msg =  response.data.data.msg;
@@ -1586,8 +1622,8 @@
           }
          }
 
-         const tHeader = ['药品名称','药品规格','剂量','剂量单位','拆零','拆零单位','包装单位','药品类型','库存警戒','产地','药品剂型','拆零零售价','包装零售价','进货价','药物分类','默认单次用量','默认单次用量单位','生产厂商','经销商','医保编码','社保目录编码','批准文号','医保等级','是否特病目录','限制性用药']
-         const filterVal = ['drug_name', 'specification_name','dose','dose_unit','min_number','min_unit','max_unit','drug_category_name','drug_stock_limit','drug_origin_place','drug_dosage_form_name','min_price','retail_price','last_price','drug_classify_name','drug_dose','drug_dose_unit_name','manufacturer_name','dealer_name','medical_insurance_number','social_security_directory_code','number','medical_insurance_level','is_special_diseases_name','lmt_used_flag_name']
+         const tHeader = ['*药品名称','*药品规格','*剂量','*剂量单位','*拆零','*拆零单位','*包装单位','*药品类型','*库存警戒','*产地','*药品剂型','*拆零零售价','*包装零售价','进货价','*药物分类','*默认单次用量','*默认单次用量单位','*生产厂商','经销商','*默认给药途径','*默认执行频率','*默认开药数量','*默认开药数量单位','*默认开药天数','限制性用药','药品别名','药品类别','开药控制','批准文号','审批标志','医保编码','药理分类','统计分类','本位码','是否特病目录','是否备案','处方药标志','社保目录编码','备案日期','药品备注','状态','限制说明']
+         const filterVal = ['drug_name', 'specification_name','dose','dose_unit','min_number','min_unit','max_unit','drug_category_name','drug_stock_limit','drug_origin_place','drug_dosage_form_name','min_price','retail_price','last_price','drug_classify_name','drug_dose','drug_dose_unit_name','manufacturer_name','dealer_name','delivery_way','execution_frequency','prescribing_number','prescribing_number_unit','drug_day','','','','','number','','medical_insurance_number','','','','is_special_diseases_name','','','social_security_directory_code','','','','']
 
          const data = this.formatJson(filterVal,this.list)
 
@@ -1633,6 +1669,11 @@
            }
         })
       },
+      jiaoBen(){
+        updateBaseDrugLibByUserOrgId().then(response=>{
+
+        })
+      }
 
     },
     created() {

src/xt_pages/data/components/project.vue

@@ -41,7 +41,7 @@
         <div style="display:flex; align-items:center;margin-bottom:10px;">
         <!--<el-button type="primary" size="small" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>-->
         <el-button type="primary" size="small" @click="GDYBBatchPutOnRecord()">批量备案</el-button>
-        <el-link target="_blank" href="https://kuyi.shengws.com/itemTemplate.xlsx" :underline="false"
+        <el-link target="_blank" href="https://kuyi.shengws.com/itemTemplateOne.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
             class="filter-item"
@@ -923,8 +923,8 @@ export default {
            }
          }
           console.log("this.table",this.tableData)
-         const tHeader = ['项目名称','零价','单位','费用类别','执行科室','医保等级','国家编码','社保目录编码']
-         const filterVal = ['project_name', 'price','unit','cost_classify_name','executive_section_name','medical_coverage_name','medical_code','social_security_directory_code']
+         const tHeader = ['项目名称','零价','单位','费用类别','执行科室','医保等级','拼音','五笔','统计分类','是否特病目录','是否备案','国家编码','试管颜色','单次用量','用法','频率','天数','总量','状态','类别','特检项目','社保目录编码','备案日期','备注']
+         const filterVal = ['project_name', 'price','unit','cost_classify_name','executive_section_name','medical_coverage_name','','','','是','','medical_code','','','','','','','','','','social_security_directory_code','','']
 
          const data = this.formatJson(filterVal,this.tableData)
 

src/xt_pages/dialysis/batch_print/batch_print_order_fiftyOne.vue

@@ -94,14 +94,56 @@
                   {{ record.patient.dialysis_no }}
                 </div>
               </div>
+              <div
+                class="inline_block"
+                v-if="
+                  record.receive_assessment.condition &&
+                  record.receive_assessment.condition == 1
+                "
+              >
+                住院科室：
+                <div
+                  class="under_line"
+                  style="width: 50px; text-align: center"
+                >
+                  <span>{{
+                    record.receive_assessment.condition &&
+                    record.receive_assessment.condition == 1 &&
+                    record.receive_assessment.his_department
+                      ?record.receive_assessment.his_department
+                      : "/"
+                  }}</span>
+                </div>
+              </div>
+              <div
+                class="inline_block"
+                v-if="
+                 record.receive_assessment.condition &&
+                 record.receive_assessment.condition == 1
+                "
+              >
+                住院床位：
+                <div
+                  class="under_line"
+                  style="width: 50px; text-align: center"
+                >
+                  <span>{{
+                    record.receive_assessment.condition &&
+                    record.receive_assessment.condition == 1 &&
+                    record.receive_assessment.his_bed
+                      ? record.receive_assessment.his_bed
+                      : "/"
+                  }}</span>
+                </div>
+              </div>
               <div class="inline_block" style="margin-left: 5px">
-                住院号/门诊号：
+                 住院号
                 <div
                   class="under_line"
                   style="width: 70px; text-align: left"
                   v-if="record.receive_assessment.admission_number"
                 >
-                  {{ record.receive_assessment.admission_number }}
+                   {{ record.receive_assessment.admission_number?record.receive_assessment.admission_number:"/" }}
                 </div>
                 <div
                   class="under_line"

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -836,7 +836,16 @@
                               : "/"
                            }}
                           </span>
-                          <span v-if="org_id!=10206">
+
+                          <span v-if="org_id==10510">
+                              {{
+                            record.assessment_after_dislysis.displace_liqui_value
+                              ? record.assessment_after_dislysis.displace_liqui_value
+                              : "/"
+                           }}
+                          </span>
+                          
+                          <span v-if="org_id!=10206&&org_id!=10510">
                             {{
                             record.prescription &&
                             record.prescription.displace_liqui_value
@@ -1004,7 +1013,7 @@
                       class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
-                      <div class="inline_block" style="flex: 1"
+                      <!-- <div class="inline_block" style="flex: 1"
                         v-if="org_id!=10440 && org_id!=0  && org_id!=10469 && org_id!=10490 && org_id!=10478 && org_id!=10495 && org_id!=10510 && org_id!=10460 && org_id!=10585 && org_id!=10567 && org_id!=10624 && org_id!=10290">
                         上次透后体重：
                         <div
@@ -1028,10 +1037,9 @@
                           }}</span>
                         </div>
                         kg
-                      </div>
+                      </div> -->
 
-                      <div class="inline_block" style="flex: 1"
-                        v-if="(org_id==10440 ||  org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495 || org_id == 10460 || org_id ==10624 || org_id==10624 || org_id == 10290)&& org_id!=10510">
+                      <div class="inline_block" style="flex: 1">
                         上次透后体重：
                         <div
                           class="under_line"
@@ -1621,7 +1629,8 @@
                               org_id == 9675 ||
                               org_id == 9671 ||
                               org_id ==10600 ||
-                              org_id ==10629
+                              org_id ==10629 ||
+                              org_id == 10510
                             "
                           >
                             KT/V
@@ -1853,7 +1862,8 @@
                               org_id == 9675 ||
                               org_id == 9671 ||
                               org_id == 10600 ||
-                              org_id ==10629
+                              org_id ==10629 ||
+                              org_id ==10510
                             "
                           >
                             {{ monitor_record.ktv }}
@@ -3735,6 +3745,41 @@ export default {
         var resp = rs.data;
         if (resp.state == 1) {
           this.records = this.records.concat(resp.data.schedules);
+
+          //华池
+          if(this.org_id == 0 || this.org_id ==10440){
+          
+          var parint_id =0
+        
+          if(this.records!=null&&this.records.length>0){
+            
+            for(let i=0;i<this.records.length;i++){
+             this.records[i].new_arr = []
+             for(let j=0;j<this.records[i].advices.length;j++){
+             
+               if(this.records[i].advices[j].advice_name.indexOf("低分子")!=-1){
+                 
+                  parint_id = this.records[i].advices[j].id
+               }
+             }
+            }
+            for(let i=0;i<this.records.length;i++){
+             for(let j=0;j<this.records[i].advices.length;j++){
+               if(parint_id != this.records[i].advices[j].id && parint_id!=this.records[i].advices[j].parent_id){
+                   this.records[i].new_arr.push(this.records[i].advices[j])
+               }
+             }
+            }
+
+           
+
+            for(let i=0;i<this.records.length;i++){
+               this.records[i].advices= []
+               this.records[i].advices = this.records[i].new_arr
+            }
+          }
+
+         }
           var tempmonitorflag = true;
           for(let i=0;i<this.records.length;i++){
             for(let j=0;j<this.records[i].monitor_records.length;j++){
@@ -3783,7 +3828,7 @@ export default {
             }
 
 
-            if(this.org_id == 0|| this.org_id ==10571){
+            if(this.org_id ==10571){
              
                if(this.records!=null&& this.records.length>0){
                 for(let i=0;i<this.records.length;i++){
@@ -3919,6 +3964,8 @@ export default {
             }
           }
           console.log("数据我哦我我", this.records);
+
+
            
           if(this.records!=null && this.records.length>0){
             console.log("进啦地方大丰")
@@ -3980,6 +4027,8 @@ export default {
             }
           }
 
+        
+
           console.log("时间我哦我",this.records)
         
           // this.records.forEach(o => {

src/xt_pages/dialysis/batch_print/batch_print_order_thirtyNine.vue

@@ -274,7 +274,10 @@
                                     接管时间：
                                     <span style="width:160px;display:inline-block;">{{ record.dialysis_order ? getTime(record.dialysis_order.start_time, "{y}-{m}-{d} {h}:{i}") : "" }}</span>
                                     透析次数
-                                    <div class="inline_block under_line" style="width:50px;text-align:center">&nbsp;{{ record.patient.total_dialysis + record.patient.user_sys_before_count }}</div>次
+                                    <div class="inline_block under_line" style="width:50px;text-align:center">&nbsp;
+                                      <!-- {{ record.patient.total_dialysis + record.patient.user_sys_before_count }} -->
+                                      {{ record.Count + record.patient.user_sys_before_count }}
+                                    </div>次
                                 </td>
                             </tr>
                         </tbody>

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -154,8 +154,8 @@
           <label>目标超滤量 : </label>
           <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
           
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10395  && this.$store.getters.xt_user.template_info.template_id!=60  && this.$store.getters.xt_user.template_info.org_id != 10340  && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10441 && this.$store.getters.xt_user.template_info.org_id != 10445 && this.$store.getters.xt_user.template_info.org_id != 9829 &&  this.$store.getters.xt_user.template_info.org_id != 10440  &&  this.$store.getters.xt_user.template_info.org_id != 10469  &&  this.$store.getters.xt_user.template_info.org_id != 10471 &&  this.$store.getters.xt_user.template_info.org_id != 10460"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10395 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id==10441 || this.$store.getters.xt_user.template_info.org_id==10445 || this.$store.getters.xt_user.template_info.org_id == 9829 ||  this.$store.getters.xt_user.template_info.org_id == 10440 || this.$store.getters.xt_user.template_info.org_id == 10469|| this.$store.getters.xt_user.template_info.org_id == 10471 ||  this.$store.getters.xt_user.template_info.org_id == 10460" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10395  && this.$store.getters.xt_user.template_info.template_id!=60  && this.$store.getters.xt_user.template_info.org_id != 10340  && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10441 && this.$store.getters.xt_user.template_info.org_id != 10445 && this.$store.getters.xt_user.template_info.org_id != 9829 &&  this.$store.getters.xt_user.template_info.org_id != 10440  &&  this.$store.getters.xt_user.template_info.org_id != 10469  &&  this.$store.getters.xt_user.template_info.org_id != 10471 &&  this.$store.getters.xt_user.template_info.org_id != 10460 &&  this.$store.getters.xt_user.template_info.org_id != 10644"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10395 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id==10441 || this.$store.getters.xt_user.template_info.org_id==10445 || this.$store.getters.xt_user.template_info.org_id == 9829 ||  this.$store.getters.xt_user.template_info.org_id == 10440 || this.$store.getters.xt_user.template_info.org_id == 10469|| this.$store.getters.xt_user.template_info.org_id == 10471 ||  this.$store.getters.xt_user.template_info.org_id == 10460 ||  this.$store.getters.xt_user.template_info.org_id == 10644" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
 
          <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id == 10290">

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -343,6 +343,11 @@
           <label>上次透后体重: </label>
           <span class="content" >{{ this.record.last_after_weight}}</span>
         </li>
+
+        <li v-if="isShow('置换液总量')">
+          <label>置换液总量: </label>
+          <span class="content" >{{ this.record.displace_liqui_value}}</span>
+        </li>
       </ul>
     </div>
     <!-- <div class="note">

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

@@ -461,6 +461,12 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="8" v-if="isShow('置换液总量') &&(prescription!=null && (prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12))">
+            <el-form-item label="置换液总量(L): " :prop="isName('置换液总量')" :rules="isCheckmust('置换液总量')">
+              <el-input v-model="form.displace_liqui_value"></el-input>
+            </el-form-item>
+          </el-col>
+
 
         <el-col :span="8" v-if="isShow('失衡综合症')">
           <el-form-item label="失衡综合症: " :prop="isName('失衡综合症')" :rules="isCheckmust('失衡综合症')" >
@@ -635,7 +641,7 @@
             </el-form-item>
        </el-col>
        <el-col :span="8" v-if="isShow('累计血容量')">
-            <el-form-item label="累计血容量(L)："  label-width="150px" :prop="isName('累计血容量')" :rules="isCheckmust('累计血容量')">
+            <el-form-item label="透析血容量(L)："  label-width="150px" :prop="isName('累计血容量')" :rules="isCheckmust('累计血容量')">
               <el-input v-model="form.accumulated_blood_volume"></el-input>
             </el-form-item>
         </el-col>
@@ -646,7 +652,7 @@
             </el-form-item>
           </el-col>
         <el-col :span="24" v-if="isShow('KT/V')">
-            <el-form-item label="KT/V：" :prop="isName('KT/V')" :rules="isCheckmust('KT/V')">
+            <el-form-item label="Kt/V：" :prop="isName('KT/V')" :rules="isCheckmust('KT/V')">
               <el-input type="textarea" :rows="4" v-model="form.ktv"></el-input>
             </el-form-item>
         </el-col>
@@ -886,7 +892,8 @@ export default {
         accumulated_blood_volume:"",
         transfusion_volume:"",
         condenser:"",
-        last_after_weight:""
+        last_after_weight:"",
+        displace_liqui_value:"",
       },
       lapseList:[],
       leaveOfficeMethod:[],
@@ -1011,7 +1018,7 @@ export default {
     'form.weight_after': function() {
       console.log('体重减少',  this.form.weight_after)
       this.form.weight_loss = ((this.predialysis_evaluation.weight_before - this.predialysis_evaluation.additional_weight) - (this.form.weight_after - this.form.additional_weight)).toFixed(1)
-    
+
       if (this.form.weight_loss < 0) {
         this.form.weight_loss = ''
       }
@@ -1020,14 +1027,14 @@ export default {
       }
 
       if(this.predialysis_evaluation!=null){
-         
+
          this.form.additional_weight = this.predialysis_evaluation.additional_weight
        }
-      
+
     },
     'form.additional_weight':function(){
       if(this.predialysis_evaluation!=null){
-         
+
          this.form.additional_weight = this.predialysis_evaluation.additional_weight
        }
     }
@@ -1128,8 +1135,8 @@ export default {
       this.$refs[formName].validate((valid)=>{
         if(valid){
           var dateOne = this.schedual.schedule_date
-          var schedule_date = uParseTime(dateOne, '{y}-{m}-{d}')      
-          var date = this.$route.query && this.$route.query.date 
+          var schedule_date = uParseTime(dateOne, '{y}-{m}-{d}')
+          var date = this.$route.query && this.$route.query.date
           this.record_date = date ? uParseTime(date, '{y}-{m}-{d}') :schedule_date
           console.log("日期我哦我",this.record_date)
           this.loading = true
@@ -1234,12 +1241,13 @@ export default {
           data["accumulated_blood_volume"] = this.form.accumulated_blood_volume
           data["transfusion_volume"] = this.form.transfusion_volume
           data["condenser"] = this.form.condenser
+          data['displace_liqui_value'] = this.form.displace_liqui_value
           if(this.form.last_after_weight >0){
             data["last_after_weight"] = this.form.last_after_weight.toString()
           }else{
             data["last_after_weight"] = ""
           }
-         
+
           console.log("Paramsquery",data)
 
           postAssessmentAfterDislysis(ParamsQuery, data)
@@ -1405,7 +1413,7 @@ export default {
           break
         default:
           break
-        
+
       }
       // console.log(val);
     },
@@ -1600,9 +1608,9 @@ export default {
     this.template_id = this.$store.getters.xt_user.template_info.template_id
     this.channels = this.$store.getters.channels
 
-   
+
     // this.record_date = date ? uParseTime(date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
-   
+
     if(this.$store.getters.xt_user.template_info.org_id == 0 ||  this.$store.getters.xt_user.template_info.org_id==9829 ||  this.$store.getters.xt_user.template_info.org_id==10469){
       this.form.pulse_frequency = 80
     }

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1600,7 +1600,7 @@ export default {
         }
       }
 
-      if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 || this.$store.getters.xt_user.org.id == 10517){
+      if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 || this.$store.getters.xt_user.org.id == 10517 || this.$store.getters.xt_user.org.id == 10383){
          var date = new Date()
           var year = date.getFullYear()
           var month = date.getMonth() + 1

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

@@ -3,31 +3,36 @@
         <el-dialog
                 title="透析处方"
                 :visible.sync="isVisibility"
-                width="1010px"
+                width="68%"
                 :modal = 'false'
                 :modal-append-to-body="false"
                 :close-on-click-modal="false"
                 class="newDialog"
         >
-            <el-button style="position: absolute;left: 12%;top: 2%" @click="handlePatientInfo">{{ patient.name }}</el-button>
-            <span style="position: absolute;left: 22%;top: 3%">
+            <el-button style="position: absolute;left: 12%;top: 2%" @click="handlePatientInfo(patient.id)">{{ patient.name }}</el-button>
+           
+            <span style="position: absolute;left: 20%;top: 3%">
               透前体重：{{predialysis&&predialysis.weight_before?predialysis.weight_before:"" }} kg
+            
             </span>
-            <span style="position: absolute;left: 35%;top: 3%">
+            <span style="position: absolute;left: 30%;top: 3%">
               干体重：{{predialysis&&predialysis.dry_weight?predialysis.dry_weight:""}}kg
             </span>
             <!-- <span style="position: absolute;left: 48%;top: 3%"  :modal = 'false'>
               衣物重：{{predialysis&&predialysis.additional_weight?predialysis.additional_weight:""}}kg
             </span> -->
-            <span style="position: absolute;left: 48%;top: 3%">
+            <span style="position: absolute;left:38%;top: 3%">
               上次透后体重：{{last_record&&last_record.weight_after?last_record.weight_after:""}}kg
             </span>
 
-            <span style="position: absolute;left: 65%;top: 3%">
+            <span style="position: absolute;left:50%;top: 3%">
               4小时超滤量上限（5%）：
               <span v-if="predialysis!=null && ((predialysis.dry_weight)*0.05) >0 "></span> {{(predialysis.dry_weight*0.05).toFixed(2)}}
               kg
             </span>
+            <span style="position: absolute;left: 70%;top: 3%">
+              透前血压:  {{predialysis&&predialysis.systolic_blood_pressure?predialysis.systolic_blood_pressure:""  }} / {{ predialysis&&predialysis.diastolic_blood_pressure?predialysis.diastolic_blood_pressure:"" }} mmHg
+            </span>
             <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
             <el-form
                     ref="dialysisPrescription"
@@ -113,7 +118,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 ||  this.$store.getters.xt_user.template_info.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249 || this.$store.getters.xt_user.template_info.org_id == 10395 ||this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 9829|| this.$store.getters.xt_user.template_info.org_id == 10440 || this.$store.getters.xt_user.template_info.org_id == 10469|| this.$store.getters.xt_user.template_info.org_id == 10471 || this.$store.getters.xt_user.template_info.org_id == 10460)">
+                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 ||  this.$store.getters.xt_user.template_info.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249 || this.$store.getters.xt_user.template_info.org_id == 10395 ||this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 9829|| this.$store.getters.xt_user.template_info.org_id == 10440 || this.$store.getters.xt_user.template_info.org_id == 10469|| this.$store.getters.xt_user.template_info.org_id == 10471 || this.$store.getters.xt_user.template_info.org_id == 10460 || this.$store.getters.xt_user.template_info.org_id == 10644)">
                         <el-form-item label="目标超滤量(ml)："
                         prop="target_ultrafiltration" :rules="isCheckmust('目标超滤量')">
                             <el-input
@@ -127,7 +132,7 @@
 
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395 &&  this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id!=10441 && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469&& this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10460">
+                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395 &&  this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id!=10441 && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469&& this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10460 && this.$store.getters.xt_user.template_info.org_id != 10644">
                         <el-form-item
                         label="目标超滤量(L)：" prop="target_ultrafiltration" :rules="isCheckmust('目标超滤量')">
                             <el-input
@@ -1308,7 +1313,7 @@
                 :close-on-click-modal="false"
                 :close-on-press-escape="false"
                 :show-close="false"
-                width="30%"
+                width="40%"
         >
             <div class="newLine">
                 <span>本次透析日期</span>
@@ -1342,6 +1347,40 @@
                 <span>上次透后称重(kg)</span>
                 <span>{{ getLastAfterWeight(last_record) }}</span>
             </div>
+          
+          <div  class="newLine"><span>近五次数据展示:</span></div>
+           <div>
+            <el-table
+              :data="tableData"
+              border
+              style="width: 100%">
+              <el-table-column prop="date" label="透析日期" width="100">
+                 <template slot-scope="scope">
+                    {{getTimeOne(scope.row.assessment_date) }}
+                 </template>
+              </el-table-column>
+              <!-- <el-table-column prop="name" label="透前血压(mmHg)" width="140">
+                <template slot-scope="scope">
+                  {{scope.row.systolic_blood_pressure}}/{{scope.row.diastolic_blood_pressure}}
+                </template>
+              </el-table-column> -->
+              <el-table-column prop="name" label="透中血压(mmHg)" width="140">
+                <template slot-scope="scope">
+                  {{ GetMonitorList(scope.row.assessment_date) }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="address" label="透后体重(kg)" width="160">
+                <template slot-scope="scope">
+                   {{GetLast(scope.row.assessment_date)}}
+                </template>
+              </el-table-column>
+              <el-table-column  width="180" prop="address" label="透析器评级">
+                <template slot-scope="scope">
+                  {{GetLastCruor(scope.row.assessment_date)}}
+                </template>
+              </el-table-column>
+             </el-table>
+           </div>
 
             <span slot="footer" class="dialog-footer">
         <el-button @click="cancleMsg()">取 消</el-button>
@@ -1395,7 +1434,7 @@
 </template>
 
 <script>
-  import { CreateGroupAdvice, GetSolution, postPrescription, postSoulution,saveInformation } from '@/api/dialysis'
+  import { CreateGroupAdvice, GetSolution, postPrescription, postSoulution,saveInformation,getPatientRecordList } from '@/api/dialysis'
   import { getDataConfig } from '@/utils/data'
   import { calculateAnticoagulantZL, uParseTime,replacementFlow } from '@/utils/tools'
   import store from '@/store'
@@ -1846,6 +1885,9 @@
         selected_date:"",
         remark:"",
         blood_access_part: [],
+        tableData:[],
+        afterList:[],
+        monitorList:[],
       }
 
     },
@@ -2187,10 +2229,18 @@ mu
             }
           }
         } else {
-          if (schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12) {
+          if (schedual.mode_id == 2  || schedual.mode_id == 5 || schedual.mode_id == 12) {
             this.zhiShow = true
             this.huShow = true
             this.totalShow = true
+           if(schedual.mode_id == 2 || schedual.mode_id == 3 || schedual.mode_id == 4 || schedual.mode_id == 12){
+              if(this.$store.getters.xt_user.template_info.org_id == 9970){
+                this.dialysisPrescription.dialysis_remark = "患者毒素多，出现皮肤瘙痒，定期HDF或HP能改善患者不适症状，有利透析的充分性,因血液透析滤过有更稳定的血流动力学状态，且能有效清除中分子物质；血液灌流能更有效的清除大分子毒素。两者定期治疗能减少透析相关并发症，有得透析充分性，改善患者生活质量。"
+              }
+           }else{
+               this.dialysisPrescription.dialysis_remark=""
+           }
+          
           } else {
             this.zhiShow = false
             this.huShow = false
@@ -2522,6 +2572,9 @@ mu
       getTime(val) {
         return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
       },
+      getTimeOne(val) {
+        return uParseTime(val, '{y}-{m}-{d}')
+      },
       showOne(prescription,admins){
        console.log("prescription",prescription)
        if(prescription!=null && prescription.id == 0){
@@ -2702,6 +2755,14 @@ mu
             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
             }
+           }else if(this.$store.getters.xt_user.org.id == 10383){
+              if (schedual.schedule_type == 1) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
+            } else if (schedual.schedule_type == 2) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
+            } else if (schedual.schedule_type == 3) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
+            }
            }else if(this.$store.getters.xt_user.org.id == 10234){
               if (schedual.schedule_type == 1) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '7:30'
@@ -4349,6 +4410,16 @@ mu
         this.dialysisPrescription.displace_speed = ""
       }
 
+      if(id == 2 || id ==3 || id ==4 || id ==12){
+        if(this.$store.getters.xt_user.template_info.org_id == 9970){
+          this.dialysisPrescription.dialysis_remark = "患者毒素多，出现皮肤瘙痒，定期HDF或HP能改善患者不适症状，有利透析的充分性,因血液透析滤过有更稳定的血流动力学状态，且能有效清除中分子物质；血液灌流能更有效的清除大分子毒素。两者定期治疗能减少透析相关并发症，有得透析充分性，改善患者生活质量。"
+        }
+      }else{
+        this.dialysisPrescription.dialysis_remark = ""
+      }
+       
+      
+
       const ParamsQuery = {}
       ParamsQuery['patient_id'] = this.$route.query.patient_id
       ParamsQuery['mode_id'] = id
@@ -4502,9 +4573,64 @@ mu
       }
 
     },
-    handlePatientInfo() {
-      this.isVisibility = false
-      this.msgtip_visibility = true
+    handlePatientInfo(id) {
+      
+      getPatientRecordList(id).then(response=>{
+        if(response.data.state ==1){
+          this.isVisibility = false
+          this.msgtip_visibility = true
+
+          
+          var beforList = response.data.data.beforList
+       
+          this.tableData = beforList
+
+          var afterList =  response.data.data.afterList
+       
+          this.afterList = afterList
+
+          this.monitorList = response.data.data.monitorList
+        }
+      })
+     
+    },
+    GetLast(date){
+      var weight_after = ""
+      for(let i=0;i<this.afterList.length;i++){
+        if(date == this.afterList[i].assessment_date){
+           weight_after = this.afterList[i].weight_after
+        }
+      }
+      return weight_after
+    },
+    GetLastCruor(date){
+      var cruor = ""
+      for(let i=0;i<this.afterList.length;i++){
+        if(date == this.afterList[i].assessment_date){
+          cruor = this.afterList[i].cruor
+        }
+      }
+      return cruor
+    },
+    GetMonitorList(monitor_date){
+     
+        var str = ""
+        var newArr = []
+        for(let i=0;i<this.monitorList.length;i++){
+          for(let j=0;j<this.monitorList[i].child.length;j++){
+            if(monitor_date == this.monitorList[i].monitoring_date){
+              newArr.push(this.monitorList[i].child[j]) 
+            }
+          }
+        }
+       
+        if(newArr!=null && newArr.length>0){
+        for(let i=0;i<newArr.length;i++){
+            str += newArr[i].systolic_blood_pressure +"/"+newArr[i].diastolic_blood_pressure+","
+        }
+        }
+      
+        return str
     },
     handlePatientInfoOne(){
       this.isVisibility = false
@@ -5226,7 +5352,8 @@ mu
           }
         }
         console.log(" 人员",this.adminRoles)
-      }
+      },
+     
     },
     created() {
 

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

@@ -513,7 +513,7 @@
                 org_id == 10395||
                 org_id == 10617
 
-               )&& org_id!=10598
+               )&& org_id!=10598 && org_id!=10414
             "
           >
             <template slot-scope="scope">
@@ -542,7 +542,7 @@
               org_id !=10445 &&
               org_id!=10395 &&
               org_id !=10410 &&
-              org_id!=10617)|| org_id==10598
+              org_id!=10617)|| org_id==10598 || org_id ==10414
             "
           >
             <template slot-scope="scope">
@@ -580,6 +580,7 @@
                 template_id != 47 &&
                 org_id!=10558 &&
                 org_id!=10517 && 
+                org_id!=10414 && 
                 org_id!=10598) ||
                 org_id == 9779 ||
                 template_id == 11 ||
@@ -612,7 +613,7 @@
             width="100"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517 || org_id ==10598) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517 || org_id ==10598 || org_id ==10414) &&
               template_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&
@@ -942,7 +943,7 @@
           <el-table-column
             prop="heparin"
             align="center"
-            label="KT/V"
+            label="Kt/V"
             width="140"
             v-if="
               isShow('KT/V') &&
@@ -1436,7 +1437,7 @@
                 org_id==10445 ||
                 org_id==10410 ||
                 org_id==10395 || 
-                org_id==10617) && org_id !=10558 && org_id!=10598
+                org_id==10617) && org_id !=10558 && org_id!=10598 && org_id!=10414
             "
           >
             <el-form-item label="置换率(ml/min)：" :prop="isName('置换率')"
@@ -1469,7 +1470,8 @@
               org_id!=10340 &&
               org_id!=10432 &&
               org_id!=10445 &&
-              org_id!=10395
+              org_id!=10395 &&
+              org_id!=10414
             "
           >
             <el-form-item label="置换量(L)：" :prop="isName('置换量')"
@@ -1485,7 +1487,7 @@
                 org_id != 9919 &&
                 org_id != 10191 &&
                 org_id != 10551 &&
-                template_id != 43 && org_id!=10558 && org_id!=10346 && org_id!=10598) ||
+                template_id != 43 && org_id!=10558 && org_id!=10346 && org_id!=10598 && org_id!=10414) ||
                 org_id == 9779 ||
                 template_id == 11 ||
                 template_id == 20 ||
@@ -1723,7 +1725,7 @@
 
           <el-row :gutter="20"> -->
           <el-col :span="24" v-if="isShow('KT/V')">
-            <el-form-item label="KT/V(在线)：" :prop="isName('KT/V')"
+            <el-form-item label="Kt/V(在线)：" :prop="isName('Kt/V')"
               :rules="isCheckmust('KT/V')">
               <el-input type="textarea" :rows="4" v-model="form.ktv"></el-input>
             </el-form-item>

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

@@ -599,10 +599,18 @@ export default {
         console.log("str000000000000000000222o2o2",str)
         this.treatmentSummary.dialysis_summary = ""
         this.treatmentSummary.dialysis_summary = str
+       }else if (this.org_id ==10537 ){
+        var str = " 患者今日来我科行血液透析治疗,血管通路选择:"+this.predialysis_evaluation.blood_access_part_id+ " "+this.QueryOperaById(this.predialysis_evaluation.blood_access_part_opera_id) +",透析模式:"+this.getModeId(this.prescription.mode_id)+
+       ",透前检查:"+this.predialysis_evaluation.internal_fistula +this.predialysis_evaluation.catheter + str_one +" "+ ",透析器:"+this.prescription.dialyzer_perfusion_apparatus + ",抗凝剂:"+this.GetAnticoagulant(this.prescription.anticoagulant) +
+      ",透前体重:"+this.predialysis_evaluation.weight_before+"kg"+",间期体重增长:"+total +"kg"+",目标脱水量:"+this.prescription.target_ultrafiltration +"ml" +",血流量:"+this.prescription.blood_flow_volume+"ml/min" + ",透析开始时间:"+this.getTime(this.dialysis_order.start_time) +",透析过程中血压波动,"+"最小收缩压:"+monitor_one[0].systolic_blood_pressure+"mmHg"+",最大收缩压:"+monitor_one[monitor_one.length-1].systolic_blood_pressure
+      +"mmHg" +",最小舒张压:" +monitor_two[0].diastolic_blood_pressure+"mmHg" + ",最大舒张压:" + monitor_two[monitor_two.length-1].diastolic_blood_pressure +"mmHg" + ",最大脉搏:"+monitor_three[0].pulse_frequency+"次/分"+",最小脉搏:"+monitor_three[monitor_three.length-1].pulse_frequency+"次/分"+",透析结束时间:"+this.getTime(this.dialysis_order.end_time) +
+      ",实际治疗时长:"+ this.assessment_after_dislysis.actual_treatment_hour +"时"+this.assessment_after_dislysis.actual_treatment_minute+"分" +",实际超滤量:"+this.assessment_after_dislysis.actual_ultrafiltration+"L"+",透后体重:"+this.assessment_after_dislysis.weight_after+"kg"+",透析过程顺利，安全下机" + " "
+       +",患者下机后测血压,"+"收缩压:"+this.assessment_after_dislysis.systolic_blood_pressure+"mmHg"+",舒张压:"+this.assessment_after_dislysis.diastolic_blood_pressure+"mmHg"+",脉搏:"+this.assessment_after_dislysis.pulse_frequency +"次/分"
+
        }else{
         var str = " 患者今日来我科行血液透析治疗,血管通路选择:"+this.predialysis_evaluation.blood_access_part_id+ " "+this.QueryOperaById(this.predialysis_evaluation.blood_access_part_opera_id) +",透析模式:"+this.getModeId(this.prescription.mode_id)+
        ",透前检查:"+this.predialysis_evaluation.internal_fistula +this.predialysis_evaluation.catheter + str_one +" "+ ",透析器:"+this.prescription.dialyzer_perfusion_apparatus + ",抗凝剂:"+this.GetAnticoagulant(this.prescription.anticoagulant) +
-      ",透前体重:"+this.predialysis_evaluation.weight_before+"kg"+",间期体重增长:"+total +"kg"+",目标脱水量:"+this.prescription.target_ultrafiltration +"L" +",血流量:"+this.prescription.blood_flow_volume+"ml/min" + ",透析开始时间:"+this.getTime(this.dialysis_order.start_time) +",透析过程中血压波动,"+"最大收缩压:"+monitor_one[0].systolic_blood_pressure+"mmHg"+",最小收缩压:"+monitor_one[monitor_one.length-1].systolic_blood_pressure
+      ",透前体重:"+this.predialysis_evaluation.weight_before+"kg"+",间期体重增长:"+total +"kg"+",目标脱水量:"+this.prescription.target_ultrafiltration +"L" +",血流量:"+this.prescription.blood_flow_volume+"ml/min" + ",透析开始时间:"+this.getTime(this.dialysis_order.start_time) +",透析过程中血压波动,"+"最小收缩压:"+monitor_one[0].systolic_blood_pressure+"mmHg"+",最大收缩压:"+monitor_one[monitor_one.length-1].systolic_blood_pressure
       +"mmHg" +",最小舒张压:" +monitor_two[0].diastolic_blood_pressure+"mmHg" + ",最大舒张压:" + monitor_two[monitor_two.length-1].diastolic_blood_pressure +"mmHg" + ",最大脉搏:"+monitor_three[0].pulse_frequency+"次/分"+",最小脉搏:"+monitor_three[monitor_three.length-1].pulse_frequency+"次/分"+",透析结束时间:"+this.getTime(this.dialysis_order.end_time) +
       ",实际治疗时长:"+ this.assessment_after_dislysis.actual_treatment_hour +"时"+this.assessment_after_dislysis.actual_treatment_minute+"分" +",实际超滤量:"+this.assessment_after_dislysis.actual_ultrafiltration+"L"+",透后体重:"+this.assessment_after_dislysis.weight_after+"kg"+",透析过程顺利，安全下机" + " "
        +",患者下机后测血压,"+"收缩压:"+this.assessment_after_dislysis.systolic_blood_pressure+"mmHg"+",舒张压:"+this.assessment_after_dislysis.diastolic_blood_pressure+"mmHg"+",脉搏:"+this.assessment_after_dislysis.pulse_frequency +"次/分"

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -21,11 +21,11 @@
           <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
-          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410 || org_id ==10617) && org_id!=10558 && org_id!=10598" width="92px" > 置换率(ml/min) </th>
-          <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410 && org_id!=10617) || org_id == 10558 || org_id ==10598" width="92px" > 置换率(L/h)  </th>
+          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410 || org_id ==10617) && org_id!=10558 && org_id!=10598 && org_id!=10414" width="92px" > 置换率(ml/min) </th>
+          <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410 && org_id!=10617) || org_id == 10558 || org_id ==10598 || org_id ==10414" width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 ) && org_id!=10558 && org_id!=10598" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445) || org_id == 10558 || org_id ==10598" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 ) && org_id!=10558 && org_id!=10598  && org_id!=10414" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445) || org_id == 10558 || org_id ==10598 || org_id ==10414" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量') && template_id != 27 && template_id != 60" width="92px">置换液流量(ml/h)</th>
@@ -46,7 +46,7 @@
           <th v-if="isShow('脱水')" width="92px">脱水(L)</th>
           <th v-if="isShow('滤前压')" width="92px">滤前压(mmHg)</th>
         
-          <th v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800 || org_id ==  9598)" width="92px">KT/V</th>
+          <th v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800 || org_id ==  9598)" width="92px">Kt/V</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
 
           <th v-if="isShow('处理')" width="92px">处理</th>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventythree.vue

@@ -1086,8 +1086,8 @@
                                 "
                                 >【开始透析】引血{{ dialysisOrder.blood_drawing }} ml/min
                                 </template>
-
-                              {{ monitor.dispose }} {{ monitor.end }}  &nbsp;
+                              
+                                {{ monitor.dispose }} {{ monitor.end }}  &nbsp;
                               &nbsp;
                             </span>
                           </div>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -897,13 +897,20 @@
                         class="under_line"
                         style="width: 70px; text-align: center"
                       >
-                      <span v-if="org_id ==10206"> {{
+                      <span v-if="org_id ==10206 "> {{
                           prescription.replacement_total
                             ? prescription.replacement_total
                             : "/"
                         }}
                         </span>
-                        <span v-if="org_id!=10206"> {{
+
+                        <span v-if="org_id ==10510 "> {{
+                          afterdialysis.displace_liqui_value
+                            ? afterdialysis.displace_liqui_value
+                            : "/"
+                        }}
+                        </span>
+                        <span v-if="org_id!=10206&& org_id!=10510"> {{
                           prescription.displace_liqui_value
                             ? prescription.displace_liqui_value
                             : "/"
@@ -929,7 +936,15 @@
                             : "/"
                         }}
                         </span>
-                        <span v-if="org_id!=10206"> {{
+
+                        <span v-if="org_id ==10510"> {{
+                          afterdialysis.displace_liqui_value
+                            ? afterdialysis.displace_liqui_value
+                            : "/"
+                        }}
+                        </span>
+                        
+                        <span v-if="org_id!=10206 && org_id!=10510"> {{
                           prescription.displace_liqui_value
                             ? prescription.displace_liqui_value
                             : "/"
@@ -1128,14 +1143,16 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10440 || org_id == 0 || org_id == 10469 || org_id == 10478 || org_id == 10490 || org_id ==10495 || org_id == 10460 || org_id==10585 || org_id ==10567 || org_id ==10598 || org_id ==10624">{{
+                        <!-- <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10440 || org_id == 0 || org_id == 10469 || org_id == 10478 || org_id == 10490 || org_id ==10495 || org_id == 10460 || org_id==10585 || org_id ==10567 || org_id ==10598 || org_id ==10624">{{
                           lastafterdialysis.weight_after
                         }}</span>
                         <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id != 10440 && org_id!=0 && org_id!=10469 && org_id!=10478 && org_id!=10490 && org_id!=10495 && org_id!=10460 && org_id!=10585 && org_id!=10567 && org_id!=10598&&org_id!=10624">{{
                           predialysis.weight_after_last_transparency
                             ? predialysis.weight_after_last_transparency
                             : "未称重"
-                        }}</span>
+                        }}</span> -->
+
+                        {{lastafterdialysis.weight_after?lastafterdialysis.weight_after:"未称重"}}
                        
                       </div>
                       kg
@@ -1688,7 +1705,7 @@
                           <span v-if="org_id==10598">(L)</span> 
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">滤前压(mmHg)</td>
-                        <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10629">KT/V</td>
+                        <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10629 || org_id ==10510">KT/V</td>
                         <td width="50" v-if="org_id == 9919">在线尿素监测</td>
                         <td width="50" v-if="org_id == 9671">在线尿素监测</td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id== 9671">血容量<br />(L)</td>
@@ -1794,7 +1811,7 @@
                         <td v-if="org_id == 10375 || org_id == 0"><br />
                           {{ monitor.replacement_rate? monitor.replacement_rate: ""}}
                         </td>
-                        <td v-if="org_id!=10600">
+                        <td v-if="org_id!=10600 && org_id!=10644">
                           <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10617"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
                           <span v-if="org_id==9671 || org_id==10440 || org_id ==10617">
                               <span v-if="org_id ==10617 && monindex == 0">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "/"}}</span>
@@ -1803,7 +1820,7 @@
                               <span v-if="org_id !=10617">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span> 
                            </span>
                         </td>
-                        <td width="50" v-if="org_id == 10600 || org_id == 10598"><br/> {{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: "0"}}</td>
+                        <td width="50" v-if="org_id == 10600 || org_id == 10598 || org_id==10644"><br/> {{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: "0"}}</td>
                         <td
                           v-if="
                             (prescription.mode_id == 2 ||
@@ -1822,7 +1839,7 @@
                           </span>
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">{{ monitor.filter_pressure?monitor.filter_pressure:""}}</td>
-                        <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id ==10600 || org_id ==10629">
+                        <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id ==10600 || org_id ==10629 || org_id ==10510">
                           {{ monitor.ktv?monitor.ktv:"" }}
                         </td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id == 9671">
@@ -1954,7 +1971,7 @@
                   </table>
                 </td>
               </tr>
-              <tr v-if="org_id!=0&& org_id!=10206">
+              <tr v-if="org_id!=10206">
                 <td style="padding: 0; position: relative" colspan="2">
                   <table class="inside_table">
                     <tbody>
@@ -2190,7 +2207,7 @@
               </tr>
 
 
-              <tr v-if="org_id==0 || org_id ==10206">
+              <tr v-if="org_id ==10206">
                 <td style="padding: 0; position: relative" colspan="2">
                   <table class="inside_table">
                     <tbody>
@@ -4715,6 +4732,29 @@ export default {
 
 
         console.log("RESWOOWOWWOOW",response.data.data.doctorAdevieInfo)
+
+        //华池
+        if(this.org_id == 0 || this.org_id == 10440){
+           var parint_id =0
+           var newArr = []
+           if(this.doctor_advices!=null&&this.doctor_advices.length>0){
+               
+             for(let i=0;i<this.doctor_advices.length;i++){
+               if(this.doctor_advices[i].advice_name.indexOf("低分子")!=-1){
+                 parint_id = this.doctor_advices[i].id
+               }
+             }
+
+             for(let i=0;i<this.doctor_advices.length;i++){
+               if(this.doctor_advices[i].id != parint_id && this.doctor_advices[i].parent_id!=parint_id){
+                  newArr.push(this.doctor_advices[i])
+               }
+             }
+             this.doctor_advices =[]
+             this.doctor_advices = newArr
+           }
+        }
+
         if(this.org_id ==10515  || this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489){
           if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
 
@@ -4787,7 +4827,7 @@ export default {
         console.log("时间我我我哦我我",this.doctor_advices)
         
         //针对内蒙古阿拉善
-        if(this.org_id == 0 || this.org_id ==10206){
+        if(this.org_id ==10206){
            
           if(this.doctor_advices!=null && this.doctor_advices.length > 0){
              

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -767,6 +767,87 @@
                   </tbody>
                 </table> -->
 
+                <table class="table-box">
+                          <tbody>
+                            <tr>
+                              <td width="40">抗凝方式:</td>
+                              <td width="120">
+                                <div class="under-line">
+                                  <span v-if="prescription.anticoagulant == ''">&nbsp;/</span>
+                                  <span v-if="prescription.anticoagulant == '无肝素'">&nbsp;无肝素</span>
+                                  <span v-if="prescription.anticoagulant == '普通肝素'">&nbsp;普通肝素</span>
+                                  <span v-if="prescription.anticoagulant == '低分子肝素'">&nbsp;低分子肝素</span>
+                                  <span v-if="prescription.anticoagulant == '阿加曲班'">&nbsp;阿加曲班</span>
+                                  <span v-if="prescription.anticoagulant == '枸橼酸钠'">&nbsp;枸橼酸钠</span>
+                                  <span v-if="prescription.anticoagulant == '低分子肝素'">&nbsp;低分子肝素</span>
+                                  <span v-if="prescription.anticoagulant == '低分子量肝素钙'">&nbsp;低分子量肝素钙</span>
+                                  <span v-if="prescription.anticoagulant == '低分子肝素钙'">&nbsp;低分子肝素钙</span>
+                                  <span v-if="prescription.anticoagulant == '低分子肝素钠'">&nbsp;低分子肝素钠</span>
+                                  <span v-if="prescription.anticoagulant == '依诺肝素'">&nbsp;依诺肝素</span>
+                                  <span v-if="prescription.anticoagulant == '达肝素'">&nbsp;达肝素</span>
+                                  <span v-if="prescription.anticoagulant == '体外抗凝'">&nbsp;体外抗凝</span>
+                                  <span v-if="prescription.anticoagulant == '那屈肝素'">&nbsp;那屈肝素</span>
+                                  <span v-if="prescription.anticoagulant == '无抗凝剂'">&nbsp;无抗凝剂</span>
+                                  <span v-if="prescription.anticoagulant == '那屈肝素钙'">&nbsp;那屈肝素钙</span>
+                                  <span v-if="prescription.anticoagulant == '肝素钙注射液'">&nbsp;肝素钙注射液</span>
+                                  <span v-if="prescription.anticoagulant == '甲磺酸萘莫司他'">&nbsp;</span>
+                                  <span v-if="prescription.anticoagulant == '肝素钠'">&nbsp;肝素钠</span>
+                                </div>
+                              </td>
+                             
+
+                              <td width="50">首剂量</td>
+                              <td width="60">
+                                {{prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : ""}}
+                                    <span v-if="prescription.anticoagulant == '枸橼酸钠'">iu</span>
+                                    <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu</span>
+                                    <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu</span>
+                                    <span v-if="prescription.anticoagulant == '依诺肝素'">iu</span>
+                                    <span v-if="prescription.anticoagulant == '阿加曲班'">mg</span>
+                                    <span v-if="prescription.anticoagulant == '低分子肝素'">iu</span>
+                                    <span v-if="prescription.anticoagulant == '普通肝素'">mg</span>
+                                    <span v-if="prescription.anticoagulant == '无肝素'">mg</span>
+                                    <span v-if="prescription.anticoagulant == '甲磺酸萘莫司他'">mg</span>
+                                    <span v-if="prescription.anticoagulant == '低分子量肝素钙'">mg</span>
+                                    <span v-if="prescription.anticoagulant == '肝素钠'">mg</span>
+                              </td>
+
+                              <td width="30">维持</td>
+                              <td width="60">
+                                {{prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : ""}}
+                                <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu</span>
+                                <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu</span>
+                                <span v-if="prescription.anticoagulant == '依诺肝素'">iu</span>
+                                <span v-if="prescription.anticoagulant == '枸橼酸钠'">ml/h</span>
+                                <span v-if="prescription.anticoagulant == '阿加曲班'">mg/h</span>
+                                <span v-if="prescription.anticoagulant == '低分子肝素'">iu/h</span>
+                                <span v-if="prescription.anticoagulant == '普通肝素'">mg/h</span>
+                                <span v-if="prescription.anticoagulant == '无肝素'">mg/h</span>
+                                <span v-if="prescription.anticoagulant == '甲磺酸萘莫司他'">mg/h</span>
+                                <span v-if="prescription.anticoagulant == '低分子量肝素钙'">mg/h</span>
+                                <span v-if="prescription.anticoagulant == '肝素钠'">mg/h</span>
+                              </td>
+
+                              <td width="30">总量</td>
+                              <td width="60">
+                                {{prescription.anticoagulant_zongliang ?prescription.anticoagulant_zongliang : ""}}
+                                <span v-if="prescription.anticoagulant == '枸橼酸钠'">iu</span>
+                                  <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu</span>
+                                  <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu</span>
+                                  <span v-if="prescription.anticoagulant == '依诺肝素'">iu</span>
+                                  <span v-if="prescription.anticoagulant == '阿加曲班'">mg</span>
+                                  <span v-if="prescription.anticoagulant == '低分子肝素'">iu</span>
+                                  <span v-if="prescription.anticoagulant == '普通肝素'">mg</span>
+                                  <span v-if="prescription.anticoagulant == '无肝素'">mg</span>
+                                  <span v-if="prescription.anticoagulant == '甲磺酸萘莫司他'">mg</span>
+                                  <span v-if="prescription.anticoagulant == '低分子量肝素钙'">mg</span>
+                                  <span v-if="prescription.anticoagulant == '肝素钠'">mg</span>
+                              </td>
+                             
+                            </tr>
+                          </tbody>
+                        </table>
+
                 <table class="table-box">
                   <tbody>
                     <tr>

src/xt_pages/kuyiShopping/index.vue

@@ -1,5 +1,5 @@
 <template>
     <div class="page_kuyishopping" style="width:100%;height:100%;">
-        <iframe style="width:100%;height:100%;" src="https://market.kuyicloud.com/app/index.php?i=2&c=entry&m=ewei_shopv2&do=mobile&r=pc" frameborder="0"></iframe>
+        <iframe style="width:100%;height:100%;" src="https://www.ltsxt.com" frameborder="0"></iframe>
     </div>
 </template>

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

@@ -78,12 +78,15 @@
         </div>
         <div class="otherInfo">
             <div class="otherName">体格检查：</div>
-            <div style="flex:1;">
+            <div style="flex:1;" v-if="org_id!=10537 && org_id!=0">
                 <span>体温：{{ history.temperature ? history.temperature + '℃' : '/' }}</span>
                 <span>脉搏：{{ history.pulse ? history.pulse + '次/分' : '/' }}</span>
                 <span>呼吸：{{ history.breathing ? history.breathing + '次/分' : '/' }}</span>
                 <span>血压：{{ history.sbp }}/{{ history.dbp }}mmHg</span>
             </div>
+            <div style="flex:1;" v-if="org_id ==10537 || org_id ==0">
+                 {{ history.physical_examination?history.physical_examination:"" }}
+            </div>
         </div>
         <div class="otherInfo">
             <div class="otherName">门诊诊断：</div>
@@ -122,7 +125,8 @@ export default {
             departmentList:[],
             orgname:'',
             history:{},
-            printDate:''
+            printDate:'',
+            org_id:0,
         }
     },
     methods:{
@@ -213,6 +217,7 @@ export default {
 
     },
     created(){
+        this.org_id = this.$store.getters.xt_user.template_info.org_id
         this.educationOptions = getDataConfig("patient", "education_types");
         this.getAllDoctorList()
         this.getPatientCaseHistory()

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -287,10 +287,10 @@
                       <p>HDF800:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
-                  <span v-if="item.mode_id == 'HDF800'">
+                  <!-- <span v-if="item.mode_id == 'HDF800'">
                       <p>HDF800:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
-                  </span>
+                  </span> -->
                   <span v-if="item.mode_id == 'HDF1000'">
                       <p>HDF1000:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>

src/xt_pages/qcd/officesControlAnalysis/time.vue

@@ -690,9 +690,13 @@ export default {
           this.isLoading = false
 
           var count = response.data.data.count
-
+          
+          console.log("cuont--------------------",count)
+          
           var countwo = response.data.data.countwo
 
+          console.log("countwo--------------------",countwo)
+
           var systolicTotal = response.data.data.systolicTotal
           
           var sysstandTotal = 0

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -231,12 +231,13 @@
              </el-form-item>
 
 
-            <el-form-item label="批准文号:" >
+            <el-form-item label="批准文号:" v-if="org_id!=10653&&org_id!=0">
               <el-input v-model="form.number" style="width:180px"></el-input>
             </el-form-item>
 
-
-
+            <el-form-item label="生产许可证号:" v-if="org_id ==10653 || org_id == 0">
+              <el-input v-model="form.number" style="width:180px"></el-input>
+            </el-form-item>
 
             <el-form-item label="备注 : " prop="name" style="width:100%;">
               <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
@@ -413,6 +414,7 @@
           is_warehouse:"1",
           bbx01:"",
           bby01:"",
+          
         },
 
         rules: {
@@ -456,6 +458,7 @@
          {id: "1",name: "是"},
          {id: "2",name: "否"}
         ],
+        org_id:0
       }
     },
     props: {
@@ -744,7 +747,7 @@
       }
     },
     created(){
-
+      this.org_id = this.$store.getters.xt_user.org.id
       this.getlist()
       //获取所有经销商
       this.GetAllConfig()

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

@@ -180,9 +180,10 @@
             <el-table-column label="总库存量" align="center">
              <template slot-scope="scope">
                 <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info) > 0">
-                   <span v-if="scope.row.total_count<=scope.row.drug_stock_limit_count" style="color:red">{{getSumCount(scope.row.drug_stock_count,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}<i class="el-icon-warning"></i></span> 
+                 
+                   <span v-if="scope.row.sum_count<= (parseInt(scope.row.drug_stock_limit)*scope.row.min_number)" style="color:red">{{getSumCount(scope.row.drug_stock_count,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}<i class="el-icon-warning"></i></span> 
                    
-                   <span v-if="scope.row.total_count >scope.row.drug_stock_limit_count">{{getSumCount(scope.row.drug_stock_count,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
+                   <span v-if="scope.row.sum_count > (parseInt(scope.row.drug_stock_limit)*scope.row.min_number)">{{getSumCount(scope.row.drug_stock_count,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
                 </div>
               </template>
             </el-table-column>
@@ -206,7 +207,15 @@
                     @click="handleBatch(scope.row)"
                     >批次
                     </el-button>
+                    <!-- <el-button
+                      size="small"
+                      type="primary"
+                      @click="handleCheckBatch(scope.row)"
+                      >自查
+                    </el-button> -->
                 </template>
+
+                 
               </el-table-column>
           </el-table>
            <el-pagination
@@ -345,13 +354,61 @@
     <el-button @click="hide()">取 消</el-button>
   </span>
   </el-dialog>
+
+
+  <el-dialog
+    title="自查数据"
+    :visible.sync="checkdialogVisible"
+    width="50%">
+    <span>
+      <span>ID:{{drug_id}}</span>
+      <el-table
+        :data="checkData"
+        border
+        style="width: 100%">
+        <el-table-column prop="date" label="开药日期" width="180" align="center">
+          <template slot-scope="scope" >
+              {{ getTime(scope.row.advice_date) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="date" label="时间搓" width="180" align="center">
+          <template slot-scope="scope" >
+              {{scope.row.advice_date}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="name" label="开药数量" width="180" align="center">
+          <template slot-scope="scope" >
+              {{ scope.row.check_count }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="address" label="出库数量" align="center">
+          <template slot-scope="scope" >
+             {{getCount(scope.row.advice_date)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="address" label="是否异常" align="center">
+          <template slot-scope="scope" >
+             <span v-if="scope.row.check_count==getCount(scope.row.advice_date)">否</span>
+             <span v-if="scope.row.check_count!=getCount(scope.row.advice_date)" style="color:red">是</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </span>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="checkdialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="checkdialogVisible = false">确 定</el-button>
+    </span>
+  </el-dialog>
+
   </div>
 </template>
 <script>
 import { getStorehouseList,getDrugNewQuery,getDrugWarehouseOutInfoById } from "@/api/drug/drug"
-import { createDrugStockAutomaticReduceConfig, getDrugStockAutomaticReduceConfig,getDrugInitDataList } from '@/api/drug/drug_stock'
+import { createDrugStockAutomaticReduceConfig, getDrugStockAutomaticReduceConfig,getDrugInitDataList,getCheckDrugBatchList } from '@/api/drug/drug_stock'
 import { uParseTime } from '@/utils/tools'
 import { max } from 'moment'
+
 const moment = require('moment')
 export default {
 
@@ -408,6 +465,10 @@ export default {
      drug_type: 0,
      storehouseId:0,
      dealerList:[],
+     checkdialogVisible:false,
+     checkData:[],
+     outData:[],
+     drug_id:0,
     }
   
   },
@@ -484,6 +545,9 @@ export default {
             var countList  = response.data.data.countList
             console.log("countList999999999999",countList)
             for (let i = 0; i < countList.length; i++) {
+               if(countList[i].drug_stock_limit == ""){
+                countList[i].drug_stock_limit = 0
+               }
                for (let j = 0; j < countList[i].drug_warehouse_info.length; j++) {
                 if (countList[i].max_unit == countList[i].drug_warehouse_info[j].max_unit) {
                     countList[i].drug_warehouse_info[j].stock_max_number =countList[i].min_number *countList[i].drug_warehouse_info[j].stock_max_number
@@ -980,6 +1044,137 @@ export default {
           over_plus,
       });
     },
+    handleCheckBatch(row){
+      this.drug_id = row.id
+      getCheckDrugBatchList(row.id).then(response=>{
+         if(response.data.state ==1){
+          var advicelist =  response.data.data.advicelist
+          var baseDrugList = response.data.data.baseDrugList
+
+          var newArr= []
+          var newArrOne = []
+          if (advicelist.length >0){
+            for(let i=0;i<advicelist.length;i++){
+              advicelist[i].is_check_count =0
+              if(advicelist[i].prescribing_number_unit == baseDrugList.max_unit && baseDrugList.max_unit!=baseDrugList.min_unit){
+                advicelist[i].is_check_count = advicelist[i].prescribing_number * baseDrugList.min_number
+              }
+
+              if(advicelist[i].prescribing_number_unit == baseDrugList.min_unit && baseDrugList.max_unit!=baseDrugList.min_unit){
+                advicelist[i].is_check_count = advicelist[i].prescribing_number 
+              }
+
+              if(advicelist[i].prescribing_number_unit == baseDrugList.max_unit && baseDrugList.max_unit==baseDrugList.min_unit){
+                advicelist[i].is_check_count = advicelist[i].prescribing_number 
+              }
+            }
+            console.log("advicelist",advicelist)
+
+            let dataInfoOne = {}
+            advicelist.forEach((item, index) => {
+            let { advice_date } = item
+              if (!dataInfoOne[advice_date]) {
+                dataInfoOne[advice_date] = {
+                  advice_date:item.advice_date,
+                  check_count:0,
+                  child:[]
+                }
+              }
+            })
+            let hisarr = Object.values(dataInfoOne)
+           
+            
+            if(hisarr!=null && hisarr.length>0){
+               for(let i=0;i<hisarr.length;i++){
+                 for(let j=0;j<advicelist.length;j++){
+                    if(hisarr[i].advice_date == advicelist[j].advice_date){
+                       hisarr[i].child.push(advicelist[j])
+                    }
+                 } 
+               }
+            }
+            for(let i=0;i<hisarr.length;i++){
+              for(let j=0;j<hisarr[i].child.length;j++){
+                 hisarr[i].check_count +=hisarr[i].child[j].is_check_count
+              }
+            }
+            console.log("00000000000000000",hisarr)
+
+            newArr=hisarr
+            this.checkData = []
+            this.checkData = hisarr
+          }
+
+          var outInfo = response.data.data.outInfo
+
+          if(outInfo.length>0){
+            for(let i=0;i<outInfo.length;i++){
+              outInfo[i].is_check_count =0
+              if(outInfo[i].count_unit == baseDrugList.max_unit && baseDrugList.max_unit!=baseDrugList.min_unit){
+                outInfo[i].is_check_count = outInfo[i].count * baseDrugList.min_number
+              }
+
+              if(outInfo[i].count_unit == baseDrugList.min_unit && baseDrugList.max_unit!=baseDrugList.min_unit){
+                outInfo[i].is_check_count = outInfo[i].count 
+              }
+
+              if(outInfo[i].count_unit == baseDrugList.max_unit && baseDrugList.max_unit==baseDrugList.min_unit){
+                outInfo[i].is_check_count = outInfo[i].count 
+              }
+            }
+
+            let dataInfoOne = {}
+            outInfo.forEach((item, index) => {
+            let { sys_record_time } = item
+              if (!dataInfoOne[sys_record_time]) {
+                dataInfoOne[sys_record_time] = {
+                  sys_record_time:item.sys_record_time,
+                  check_count:0,
+                  child:[]
+                }
+              }
+            })
+            let hisarr = Object.values(dataInfoOne)
+           
+            
+            if(hisarr!=null && hisarr.length>0){
+               for(let i=0;i<hisarr.length;i++){
+                 for(let j=0;j<outInfo.length;j++){
+                    if(hisarr[i].sys_record_time == outInfo[j].sys_record_time){
+                       hisarr[i].child.push(outInfo[j])
+                    }
+                 } 
+               }
+            }
+            for(let i=0;i<hisarr.length;i++){
+              for(let j=0;j<hisarr[i].child.length;j++){
+                 hisarr[i].check_count +=hisarr[i].child[j].is_check_count
+              }
+            }
+            console.log("00000000000000000",hisarr)
+
+            newArrOne = hisarr
+            this.outData=[]
+            this.outData = hisarr
+          }
+          
+          console.log("newArrOne",newArrOne)
+          console.log("newarr",newArr)
+          var outInfoOne = response.data.data.outInfoOne
+          var drugflow = response.data.data.drugflow
+          this.checkdialogVisible = true
+         }
+      })
+    },
+    getCount(advice_date){
+      var count = 0
+     for(let i=0;i<this.outData.length;i++){
+        if(advice_date == this.outData[i].sys_record_time){
+            count = this.outData[i].check_count
+        }
+     }
+     return count
+    },
    // 合并单元格样式
     cellStyle({ row, column, rowIndex, columnIndex }) {
       let arr = [5,6, 7, 8, 9,10,11];

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

@@ -388,8 +388,9 @@ export default {
                }
              }
 
+            if(this.org_id !=10210 && this.org_id!=0 && this.org_id !=10402 && this.org_id !=10215){
 
-            //  新版
+               //  新版
              if(list[i].new_drug_in_flow_info!=null && list[i].new_drug_in_flow_info.length>0){
                 for(let j=0;j<list[i].new_drug_in_flow_info.length;j++){
                    if(list[i].max_unit == list[i].new_drug_in_flow_info[j].max_unit){
@@ -430,6 +431,9 @@ export default {
                 }
              }
 
+
+            }
+           
             }
 
             console.log("list23323223322332232323322323wode",list)

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -690,12 +690,23 @@
             if(this.tableList[i].consumable_type!=2 && this.tableList[i].consumable_type!=3 && this.tableList[i].consumable_type!=5 &&  this.tableList[i].consumable_type != 7){
               this.tableList[i].coutn_unit = (this.tableList[i].count.toString()) +this.tableList[i].max_unit
             }
+
+           
+            if(this.tableList[i].consumable_type == 2 ||this.tableList[i].consumable_type == 3 || this.tableList[i].consumable_type == 5 ||  this.tableList[i].consumable_type ==7  && (parseInt(this.tableList[i].count%this.tableList[i].BaseDrugLib.min_number) >0)){
+            
+              this.tableList[i].coutn_unit = (parseInt(this.tableList[i].count%this.tableList[i].BaseDrugLib.min_number)).toString() +  this.tableList[i].BaseDrugLib.min_unit
+              
+            }
+
             if(this.tableList[i].consumable_type == 2 ||this.tableList[i].consumable_type == 3 || this.tableList[i].consumable_type == 5 ||  this.tableList[i].consumable_type ==7  && (parseInt(this.tableList[i].count/this.tableList[i].BaseDrugLib.min_number) >0)){
+             
               this.tableList[i].coutn_unit = (parseInt(this.tableList[i].count/this.tableList[i].BaseDrugLib.min_number)).toString() +  this.tableList[i].BaseDrugLib.max_unit
+             
             }
-            if(this.tableList[i].consumable_type == 2 ||this.tableList[i].consumable_type == 3 || this.tableList[i].consumable_type == 5 ||  this.tableList[i].consumable_type ==7  && (this.tableList[i].count%this.tableList[i].BaseDrugLib.min_number >0)){
-              this.tableList[i].coutn_unit = (parseInt(this.tableList[i].count%this.tableList[i].BaseDrugLib.min_number)).toString() +  this.tableList[i].BaseDrugLib.min_unit
-            }
+
+            
+
+
 
             if(this.tableList[i].price>0){
               this.tableList[i].total_price = this.tableList[i].price
@@ -721,7 +732,7 @@
         const data = this.formatJson(filterVal, this.tableList) 
         console.log("datawoowow",data)
          
-      
+        
          excel.export_json_to_excel({
            header: multiHeader,
            data,

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -344,7 +344,7 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    <span v-if="org_id!=0 && org_id!=10480 && org_id!=10210&&org_id!=10188 && org_id!=10217">
+                    <span v-if="org_id!=10480 && org_id!=10210&&org_id!=10188 && org_id!=10217">
                       <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> 
                       <span v-if="is_sys == 0">
                         <span v-if="scope.row.child.length == 1">
@@ -356,7 +356,7 @@
                       
                       </span>
                     </span>
-                    <span v-if="org_id==0 || org_id ==10480 || org_id==10210 || org_id ==10188 || org_id ==10217">
+                    <span v-if="org_id ==10480 || org_id==10210 || org_id ==10188 || org_id ==10217">
                         {{ scope.row.min_price }}
                     </span>
                     
@@ -369,21 +369,19 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    <span v-if="org_id!=0 && org_id!=10480 && org_id!=10210&&org_id!=10188 && org_id!=10217">
+                    <span v-if="org_id!=10480 && org_id!=10210&&org_id!=10188 && org_id!=10217">
                       <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}} </span>
                     <span v-if="is_sys == 0">
-                      <span v-if="scope.row.child.length == 1">{{item.retail_price}}</span> 
-                      <span v-if="scope.row.child.length > 1">{{item.count * item.price}}</span> 
+                      <span v-if="scope.row.child.length == 1">{{item.count * item.retail_price}} </span> 
+                      <span v-if="scope.row.child.length > 1">{{item.count * item.price}} </span> 
                     </span>
                     </span>
 
-                    <span v-if="org_id==0 || org_id ==10480 || org_id==10210 || org_id ==10188 || org_id ==10217">
+                    <span v-if="org_id ==10480 || org_id==10210 || org_id ==10188 || org_id ==10217">
                       <!-- {{(item.count * item.price).toFixed(2)}} -->
                      <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{(getOutCountNightTen(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)*scope.row.min_price).toFixed(2)}}</span>  
                      <span v-if="is_sys==0"> {{(getOutCountNightTenOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)*item.price).toFixed(2)}}</span>
                     </span>
-                  
-
                   </td>
                </tr>
             </template>
@@ -454,7 +452,18 @@
                 >使用明细</span
               >
             </template>
+
+           
           </el-table-column>
+          <!-- <el-table-column label="自查自检" align="center">
+            <template slot-scope="scope">
+              <span style="color: #589ff8" @click="getDrugPatientName(scope.row)"
+                >自查</span
+              >
+            </template>
+
+           
+          </el-table-column> -->
         </el-table>
       </div>
     </div>
@@ -568,6 +577,44 @@
         >
       </span>
     </el-dialog>
+
+
+    <el-dialog
+      title="详细"
+      :visible.sync="AdviceDialogVisible"
+      width="40%">
+      <span>
+        <el-table
+          :data="adviceList"
+          border
+          style="width: 100%">
+          <el-table-column prop="date" label="序号" width="100" align="center">
+              <template slot-scope="scope"> 
+                {{scope.$index + 1}}
+              </template>
+          </el-table-column>
+          <el-table-column prop="date" label="患者姓名" width="100" align="center">
+              <template slot-scope="scope"> 
+                  {{getPatientNameOne(scope.row.patient_id)}}
+              </template>
+          </el-table-column>
+          <el-table-column prop="name" label="医嘱数量" width="180" align="center">
+            <template slot-scope="scope"> 
+                {{scope.row.prescribing_number}}{{scope.row.prescribing_number_unit}}
+             </template>
+          </el-table-column>
+          <el-table-column prop="address" label="出库数量" align="center">
+            <template slot-scope="scope"> 
+               {{getDrugOutCount(scope.row.patient_id)}}
+            </template>
+          </el-table-column>
+        </el-table>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="AdviceDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="AdviceDialogVisible = false">确 定</el-button>
+      </span>
+   </el-dialog>
   </div>
 </template>
 
@@ -585,6 +632,7 @@ import {
   getAutoDrugDetail,
   getDrugCountList,
   getExportOutOrderDrugList,
+  getDrugPatientName
 } from "@/api/drug/drug_stock";
 import BreadCrumb from "../../components/bread-crumb";
 import { getInitializtion } from "@/api/stock";
@@ -706,6 +754,11 @@ export default {
       exportLoding:false,
       outInfoList:[],
       patients:[],
+      AdviceDialogVisible:false,
+      adviceList:[],
+      outList:[],
+      patientList:[],
+
     };
   },
   methods: {
@@ -1271,8 +1324,6 @@ export default {
           this.outList = drugoutlist
           this.drugOutInfo = drugoutlist
           if (is_sys == 1) {
-             console.log("数据1",drugFlowList)
-             console.log("数据2",drugListOne)
             if (drugFlowList.length > 0) {
               for (let i = 0; i < drugFlowList.length; i++) {
                  drugFlowList[i].childOne = []
@@ -1345,7 +1396,7 @@ export default {
           }
 
         
-        console.log("中故宫人我奶奶万年万年",list)
+       
         if(is_sys == 1 || is_sys == 5){
           for(let i=0;i<list.length;i++){
             for(let j=0;j<list[i].childOne.length;j++){
@@ -1353,7 +1404,7 @@ export default {
             }
           }
          
-          console.log("中部listowowowoowowow",list)
+         
 
          for(let i=0;i<list.length;i++){
             for(let j=0;j<list[i].childOne.length;j++){
@@ -1362,7 +1413,7 @@ export default {
                } 
             }
           }
-          console.log("list表格---------",list)
+         
           this.tableList = list;
         }
         if(is_sys == 12){
@@ -1403,7 +1454,8 @@ export default {
           }
           this.tableList = list;
         }
-        
+         
+         console.log("tableLIST==================",this.tableList)
 
         }
       });
@@ -2371,6 +2423,42 @@ export default {
          }
       }
       return name
+    },
+    getDrugPatientName(row){
+       console.log("row",row)
+       var params = {
+        drug_id:row.drug_id,
+        sys_record_time:row.sys_record_time
+       }
+      getDrugPatientName(params).then(response=>{
+         if(response.data.state ==1){
+          var advicelist = response.data.data.advicelist
+          this.adviceList= advicelist
+          var outInfor = response.data.data.outInfor
+          this.outList = outInfor
+          var patients = response.data.data.patients
+          this.patientList= patients
+          this.AdviceDialogVisible= true
+         }
+      })
+    },
+    getPatientNameOne(patient_id){
+      var name =""
+      for(let i=0;i<this.patientList.length;i++){
+        if(patient_id == this.patientList[i].id){
+           name = this.patientList[i].name
+        }
+      }
+      return name
+    },
+    getDrugOutCount(patient_id){
+      var str = ""
+      for(let i=0;i<this.outList.length;i++){
+         if(patient_id == this.outList[i].patient_id){
+            str = this.outList[i].count + this.outList[i].count_unit
+         }
+      }
+      return str
     }
   },
 };

src/xt_pages/stock/drugs/newDrugInventory.vue

@@ -31,6 +31,14 @@
                 {{scope.row.warehousing_order}}
             </template>
             </el-table-column>
+
+            <el-table-column  prop="name" label="入库数量" width="100"  align="center">
+              <template slot-scope="scope">
+                  {{scope.row.warehousing_count}} {{ scope.row.max_unit }}
+              </template>
+            </el-table-column>
+
+            
             <el-table-column  prop="name" label="有效期" width="100"  align="center">
             <template slot-scope="scope">
                 {{getTime(scope.row.expiry_date)}}

src/xt_pages/stock/newInventory.vue

@@ -16,7 +16,7 @@
     <div style="float:right;margin-bottom:10px"><el-button type="primary" @click="saveInentoryList">保存</el-button></div>
      
         <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" style="width:100%">
-              <el-table-column prop="date" label="耗材名称" width="150" align="center">
+              <el-table-column prop="date" label="耗材名称" width="100" align="center">
                 <template slot-scope="scope">
                   {{scope.row.good_name}}
                 </template>
@@ -31,6 +31,11 @@
                   {{scope.row.warehousing_order}}
                 </template>
               </el-table-column>
+              <el-table-column  prop="name" label="入库数量" width="50"  align="center">
+                <template slot-scope="scope">
+                  {{scope.row.warehousing_count}}
+                </template>
+              </el-table-column>
               <el-table-column  prop="name" label="有效期" width="100"  align="center">
                 <template slot-scope="scope">
                   {{getTime(scope.row.expiry_date)}}
@@ -70,7 +75,7 @@
                  </template> 
               </el-table-column>
 
-              <el-table-column prop="name" label="盘点原因" width="180"  align="center">
+              <el-table-column prop="name" label="盘点原因" width="100"  align="center">
                 <template slot-scope="scope">
                    <el-select v-model="scope.row.type" placeholder="请选择">
                       <el-option

src/xt_pages/stock/query/goodNewQuery.vue

@@ -192,6 +192,13 @@
                   @click="toClickOne(scope.row)"
                 >批次
                 </el-button>
+
+                <!-- <el-button
+                  size="small"
+                  type="primary"
+                  @click="handleCheckBatch(scope.row)"
+                >自查
+                </el-button> -->
                </template>
             </el-table-column>
           </el-table>
@@ -313,10 +320,56 @@
       </span>
     </el-dialog>
 
+
+   <el-dialog
+    title="自查数据"
+    :visible.sync="checkdialogVisible"
+    width="50%">
+    <span>
+      <span>ID: {{good_id}}</span>
+      <el-table
+        :data="checkData"
+        border
+        style="width: 100%">
+        <el-table-column prop="date" label="开药日期" width="180" align="center">
+          <template slot-scope="scope" >
+              {{ getTime(scope.row.record_date) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="date" label="时间搓" width="180" align="center">
+          <template slot-scope="scope" >
+              {{scope.row.record_date}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="name" label="开药数量" width="180" align="center">
+          <template slot-scope="scope" >
+              {{ scope.row.check_count }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="address" label="出库数量" align="center">
+          <template slot-scope="scope" >
+             {{getGoodCount(scope.row.record_date)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="address" label="是否异常" align="center">
+          <template slot-scope="scope" >
+             <span v-if="scope.row.check_count==getGoodCount(scope.row.record_date)">否</span>
+             <span v-if="scope.row.check_count!=getGoodCount(scope.row.record_date)" style="color:red">是</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </span>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="checkdialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="checkdialogVisible = false">确 定</el-button>
+    </span>
+  </el-dialog>
+
   </div>
 </template>
 <script>
-import { getStorehouseList,getGoodNewQuery,getGoodWarehouseOutInfoById,toSendGoodInfomation } from "@/api/drug/drug"
+import { getStorehouseList,getGoodNewQuery,getGoodWarehouseOutInfoById,toSendGoodInfomation,getCheckGoodBatchList } from "@/api/drug/drug"
 import {
   getStockDrugCount
 } from "@/api/stock";
@@ -369,7 +422,10 @@ export default {
      flushList:[],
      type_name:0,
      storehouseId:0,
-     dealerList:[]
+     dealerList:[],
+     checkdialogVisible:false,
+     checkData:[],
+     outData:[],
     }
   
   },
@@ -1148,6 +1204,90 @@ export default {
       }else{
         return 0
       }
+    },
+    handleCheckBatch(val){
+       this.good_id = val.id 
+      getCheckGoodBatchList(val.id).then(response=>{
+         if(response.data.state ==1){
+           var projectList = response.data.data.projectList
+           if (projectList.length> 0)  {
+              for(let i=0;i<projectList.length;i++){
+                let dataInfoOne = {}
+                projectList.forEach((item, index) => {
+                let { record_date } = item
+                  if (!dataInfoOne[record_date]) {
+                    dataInfoOne[record_date] = {
+                      record_date:item.record_date,
+                      check_count:0,
+                      child:[]
+                    }
+                  }
+                })
+                let hisarr = Object.values(dataInfoOne)
+                for(let i=0;i<hisarr.length;i++){
+                  for(let j=0;j<projectList.length;j++){
+                     if(hisarr[i].record_date == projectList[j].record_date){
+                         hisarr[i].child.push(projectList[j])
+                     }
+                  }
+                }
+
+                for(let i=0;i<hisarr.length;i++){
+                  for(let j=0;j<hisarr[i].child.length;j++){
+                       hisarr[i].check_count += hisarr[i].child[j].count
+                  }
+                }
+
+                this.checkData = []
+                console.log("hia_arr",hisarr)
+                this.checkData = hisarr
+              }
+           }
+           var warehouseList = response.data.data.warehouseList
+
+           if (warehouseList.length> 0)  {
+              for(let i=0;i<warehouseList.length;i++){
+                let dataInfoOne = {}
+                warehouseList.forEach((item, index) => {
+                let { sys_record_time } = item
+                  if (!dataInfoOne[sys_record_time]) {
+                    dataInfoOne[sys_record_time] = {
+                      sys_record_time:item.sys_record_time,
+                      check_count:0,
+                      child:[]
+                    }
+                  }
+                })
+                let hisarr = Object.values(dataInfoOne)
+                for(let i=0;i<hisarr.length;i++){
+                  for(let j=0;j<warehouseList.length;j++){
+                     if(hisarr[i].sys_record_time == warehouseList[j].sys_record_time){
+                         hisarr[i].child.push(warehouseList[j])
+                     }
+                  }
+                }
+
+                for(let i=0;i<hisarr.length;i++){
+                  for(let j=0;j<hisarr[i].child.length;j++){
+                       hisarr[i].check_count += hisarr[i].child[j].count
+                  }
+                }
+                this.outData=[]
+                this.outData = hisarr
+              }
+              this.checkdialogVisible = true
+           }
+         }
+      })
+    },
+    getGoodCount(sys_record_time){
+      var count = 0
+      for(let i=0;i<this.outData.length;i++){
+        if(this.outData[i].sys_record_time == sys_record_time){
+            count = this.outData[i].check_count
+        }
+      }
+      return count
     }
 
   },

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -265,7 +265,7 @@ export default {
             this.loading = false
             for(let i=0;i<list.length;i++){
                
-              if(this.org_id ==10210){
+              if(this.org_id ==10210 || this.org_id ==10215){
                 list[i].stockIn = list[i].GoodStartFlowInfo.over_count
               }else{
                
@@ -837,9 +837,9 @@ export default {
         count_two +=val3[i].count
       }
      }
-     console.log("countwowowoowow3333",count)
-     console.log("count_one222222",count_one)
-     console.log("count_two222222",count_two)
+     console.log("本期减少",count)
+     console.log("盘亏",count_one)
+     console.log("退库",count_two)
      all_count = count +count_one - count_two
      console.log("数据我哦我我",all_count)
      if(all_count >0){

src/xt_pages/stock/stockInOrder.vue

@@ -341,7 +341,13 @@
             </span>  
           </template>
         </el-table-column>
-       <el-table-column label="批准文号" align="center">
+        <el-table-column label="批准文号" align="center" v-if="org_id!=10653&&org_id!=0">
+          <template slot-scope="scope">
+           <span v-if="scope.row.is_total ==0"> {{ scope.row.license_number}}</span>
+          </template>
+        </el-table-column>
+
+         <el-table-column label="生产许可证号" align="center" v-if="org_id ==10653 || org_id == 0">
           <template slot-scope="scope">
            <span v-if="scope.row.is_total ==0"> {{ scope.row.license_number}}</span>
           </template>

src/xt_pages/stock/stockInOrderAdd.vue

@@ -194,7 +194,7 @@
             </template>
           </el-table-column>
 
-         <el-table-column align="center" width="150">
+         <el-table-column align="center" width="150" v-if="org_id!=10653&&org_id!=0">
             <template slot="header" slot-scope="scope">
               <span>批准文号</span>
             </template>
@@ -204,7 +204,17 @@
               </el-form-item>
             </template>
           </el-table-column>
-         <el-table-column align="center" width="150">
+          <el-table-column align="center" width="150" v-if="org_id ==10653 || org_id == 0">
+            <template slot="header" slot-scope="scope">
+              <span>生产许可证号</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 20px">
+                <el-input placeholder="请输入生产许可证号" v-model="scope.row.license_number" ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope">
               <span>注册编码</span>
             </template>
@@ -410,6 +420,7 @@
         showCheck:false,
         showReturnCheck:false,
         warehousing_info_id:0,
+        org_id:0
       }
     },
     methods: {
@@ -960,6 +971,7 @@
     }
     ,
     created() {
+      this.org_id = this.$store.getters.xt_user.org.id
       var nowDate = new Date()
       var nowYear = nowDate.getFullYear()
       var nowMonth = nowDate.getMonth() + 1

src/xt_pages/stock/stockOutOrder.vue

@@ -441,6 +441,16 @@
               >
             </template>
           </el-table-column>
+
+          <!-- <el-table-column label="自查自检" align="center">
+            <template slot-scope="scope">
+              <span
+                style="color: #589ff8"
+                @click="GetGoodPatientName(scope.row)"
+                >自查自检</span
+              >
+            </template>
+          </el-table-column> -->
         </el-table>
       </div>
     </div>
@@ -920,6 +930,43 @@
       v-on:dialog-cancle="cancle"
     >
     </stock-in-dialog>
+
+    <el-dialog
+      title="详细"
+      :visible.sync="AdviceDialogVisible"
+      width="40%">
+      <span>
+        <el-table
+          :data="projectList"
+          border
+          style="width: 100%">
+          <el-table-column prop="date" label="序号" width="180" align="center">
+              <template slot-scope="scope"> 
+                {{scope.$index+1}}
+              </template>
+          </el-table-column>
+          <el-table-column prop="date" label="患者姓名" width="100" align="center">
+              <template slot-scope="scope"> 
+                  {{getPatientName(scope.row.patient_id)}}
+              </template>
+          </el-table-column>
+          <el-table-column prop="name" label="耗材数量" width="100" align="center">
+            <template slot-scope="scope"> 
+                {{scope.row.count}}{{scope.row.unit}}
+             </template>
+          </el-table-column>
+          <el-table-column prop="address" label="出库数量" align="center">
+            <template slot-scope="scope"> 
+               {{getGoodOutCount(scope.row.patient_id)}}
+            </template>
+          </el-table-column>
+        </el-table>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="AdviceDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="AdviceDialogVisible = false">确 定</el-button>
+      </span>
+   </el-dialog>
   </div>
 </template>
 
@@ -940,6 +987,7 @@ import {
   getOrderDetailByOrderId,
   getOrderDetailById,
   getOutExportList,
+  getGoodPatientName
 } from "@/api/stock";
 import BreadCrumb from "../components/bread-crumb";
 import StockInDialog from "./Dialog/stockInDialog";
@@ -1084,7 +1132,10 @@ export default {
       flowList:[],
       cancelInfoList:[],
       exportLoding:false,
-      patients:[]
+      patients:[],
+      projectList:[],
+      outList:[],
+      AdviceDialogVisible:false
     };
   },
   methods: {
@@ -2455,6 +2506,30 @@ export default {
          }
       }
       return name
+    },
+    GetGoodPatientName(val){
+       var params = {
+        good_id:val.good_id,
+        sys_record_time:val.sys_record_time,
+       }
+      getGoodPatientName(params).then(response=>{
+        if(response.data.state == 1){
+          var projectList = response.data.data.projectList
+          this.projectList = projectList
+          var outList = response.data.data.outList
+          this.outList = outList
+          this.AdviceDialogVisible= true
+        }
+      })
+    },
+    getGoodOutCount(patient_id){
+      var count = ""
+      for(let i=0;i<this.outList.length;i++){
+        if(patient_id == this.outList[i].patient_id){
+          count = this.outList[i].count
+        }
+      }
+      return count 
     }
   },
 };

src/xt_pages/user/Sitemap.vue

@@ -18,11 +18,13 @@
         </div>
       </div>
       <div style="margin-top:6px;display:flex;flex-wrap: wrap;position:relative;min-height:480px;">
-        <div style="width:47%;border:1px solid #ddd;padding: 5px;" id="print_mark_img" >
+        <div style="width:47%;border:1px solid #ddd;padding: 5px;" id="print_mark_img"  ref="imageContainer">
           <div id="point_mark_img_wrap1" class="print_main_content" style="width: 100%;padding: 0;border: 0;" ref="imageWrapper">
 
-            <img v-if="fileList[0].img_url==0" id="ossPointMarkImg" src="@/assets/evaluate/xgtl_default.png" alt="" srcset="">
-            <img v-if="fileList[0].img_url!=''" id="ossPointMarkImg" :src="fileList[0].img_url" alt="" srcset="">
+            <img v-if="fileList[0].img_url==0" id="ossPointMarkImg" src="@/assets/evaluate/xgtl-tool-tips.jpg" alt="" srcset="">
+          
+           <img v-if="fileList[0].img_url!=''" id="ossPointMarkImg" :src="fileList[0].img_url" alt="" srcset="">
+          
 
             <!-- A端/V端 v-if="a_num==2" -->
             <!-- <div v-for="(item,index) in A_arr" :key="index">
@@ -122,7 +124,9 @@
               </div>
             </div></div>
           </div>
+         
         </div>
+       
         <div style="width:25px;"></div>
         <div style="width:49%;">
           <div>
@@ -174,6 +178,9 @@
           <div id="ctrl-xgtlpic-mask" class="readonly" data-text="图片操作的遮罩层" v-show="append == false"></div>
         </div>
       </div>
+
+      
+      <!-- <img :src="imageSrc" alt="Rendered Image" /> -->
     </div>
 
     <!-- <div style="width:50%; margin-top:20px">
@@ -375,6 +382,8 @@ export default{
       patients:{},
       date:moment(new Date()).format("YYYY-MM-DD"),
       widthtext:null,
+      imageSrc:"",
+      imageList: []
     }
   },
   created(){
@@ -390,6 +399,21 @@ export default{
     console.log('asfdazxsdfdfdsdfsadfs',this.fileList);
   },
   methods:{
+    
+    async captureImage() {
+      try {
+        const element = document.getElementById('print_mark_img');
+        const canvas = await html2canvas(element);
+        console.log("canvas22222222222222",canvas)
+        var imgUrl = canvas.toDataURL('image/png');
+       
+      
+        this.imageSrc= imgUrl
+        return imgUrl
+      } catch (error) {
+        console.error('截图失败:', error);
+      }
+    },
     add(){
       if(this.append == false){
         console.log('1111');
@@ -901,6 +925,8 @@ export default{
         id: 0
       })
       console.log('上传 图片',this.fileList);
+      this.imageList.push(res.localPath);
+      console.log("图片路径2222222222222222222222",this.fileList)
       this.loading.close()
       this.imgDialogVisible=false
     },
@@ -1026,10 +1052,11 @@ export default{
       }
 
 
-       var img_url = ""
-       if(this.fileList!=null && this.fileList.length>0){
-          img_url = this.fileList[0].img_url
-       }
+      
+
+       console.log("hahhahah",this.captureImage())
+    
+     
        var params = {
          id:this.id,
          is_append:is_append,
@@ -1071,7 +1098,7 @@ export default{
          left_v:0,
          aarr:this.Aarr,
          varr:this.Varr,
-         img_url:img_url,
+         img_url:this.fileList[0].img_url,
        }
        console.log("paramswowwo",params)
 

src/xt_pages/user/components/PatientDetail.vue

@@ -281,6 +281,22 @@
                 </el-checkbox-group>
               </el-form-item>
              </el-col>
+            
+             <el-col :span="6" :style="isEdit ? 'width:380px' : ''">
+                <el-form-item
+                  label="打印日期:"
+                  label-width="150px"
+                >
+                  <el-date-picker
+                     disabled
+                    v-model="form.print_date"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                  ></el-date-picker>
+                </el-form-item>
+              </el-col>
+
              <el-col :span="8">
                 <el-form-item label="住院(门诊)号 : " prop="admissionNumber">
                   <el-input v-model="form.admissionNumber" disabled></el-input>
@@ -1225,9 +1241,12 @@
               <div class="proj">
                 <span class="proj_title">日期：</span>
 
-                <span v-if="org_id == 3907 || org_id == 9671|| org_id == 9675 || org_id == 10394 || org_id ==10612 || org_id == 0 || org_id ==10617">
+                <!-- <span v-if="org_id == 3907 || org_id == 9671|| org_id == 9675 || org_id == 10394 || org_id ==10612 || org_id == 0 || org_id ==10617">
                 {{getTime(patientPrint.created_time)}}</span>
-                <span v-else>{{ printDate }}</span>
+                <span v-else>{{ printDate }}</span> -->
+
+                <span v-if="patientPrint.print_date>0">{{getTime(patientPrint.print_date)}}</span> 
+                <span v-if="patientPrint.print_date<=0">{{getTime(patientPrint.created_time)}}</span> 
 
               </div>
               <div class="proj">
@@ -1375,6 +1394,7 @@ const defaultForm = {
   patient_address:"",
   infectious_remark:"",
   allergic_history:"",
+  print_date:"",
 };
 
 export default {
@@ -1723,6 +1743,11 @@ export default {
               "{y}-{m}-{d}"
             );
 
+            this.form.print_date = uParseTime(
+              patietInfo.print_date,
+              "{y}-{m}-{d}"
+            );
+
             this.form.patient_source = patietInfo.patient_source
             if (patietInfo.patient_start_time != 0) {
               this.form.patient_start_time = uParseTime(

src/xt_pages/user/components/PatientForm.vue

@@ -129,12 +129,11 @@
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="身份证号 : "
-                  class="is-required"
                   prop="idCardNo"
                 >
                   <el-input
+                    @input="checkIdCardNo"
                     v-model="form.idCardNo"
-                    @blur="checkIdCardNo"
                   ></el-input><!---->
                 </el-form-item>
               </el-col>
@@ -334,6 +333,20 @@
               </el-form-item>
             </el-col>
 
+            <el-col :span="6" :style="isEdit ? 'width:380px' : ''">
+                <el-form-item
+                  label="打印日期:"
+                  label-width="150px"
+                >
+                  <el-date-picker
+                    v-model="form.print_date"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                  ></el-date-picker>
+                </el-form-item>
+              </el-col>
+
             <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                   <el-form-item label="住院(门诊)号 : ">
                     <el-input v-model="form.admissionNumber"></el-input>
@@ -1183,6 +1196,7 @@ const defaultForm = {
   patient_address:"",
   infectious_remark:"",
   allergic_history:"",
+  print_date:"",
   formItem: [
     {
       id: 0,
@@ -2025,6 +2039,11 @@ export default {
               "{y}-{m}-{d}"
             );
 
+            this.form.print_date = uParseTime(
+              patietInfo.print_date,
+              "{y}-{m}-{d}"
+            );
+
             if (patietInfo.age == 0) {
               this.form.age = jsGetAge(this.form.birth, "-");
             } else {

src/xt_pages/user/inspection.vue

@@ -347,7 +347,7 @@
                   placeholder="请填入"
                   v-model="item.value"
                   style="width:95%"
-                  type="number"
+                
                   @input='changeInput(item)'
                 >
                   <template slot="append">{{ item.unit }}</template>
@@ -1012,8 +1012,7 @@ export default {
             this.patientID,
             this.form,
             this.form.remind_cycle
-          )
-            .then(response => {
+          ).then(response => {
               if (response.data.state == 1) {
                 this.$notify({
                   title: '成功',

src/xt_pages/user/patients.vue

@@ -1804,8 +1804,8 @@
           }
         }
 
-        const tHeader = ['姓名', '性别', '身份证号码','年龄','透析号','首次治疗时间','本人电话','患者来源','治疗状态','传染病']
-        const filterVal = ['name', 'genders', 'id_card_no','age_year','dialysis_no','first_dialysis_date','phone','sources','lapesetos','is_infectiouss']
+        const tHeader = ['姓名', '性别', '身份证号码','年龄','透析号','首次治疗时间','本人电话','患者来源','治疗状态','传染病','家庭住址','工作单位']
+        const filterVal = ['name', 'genders', 'id_card_no','age_year','dialysis_no','first_dialysis_date','phone','sources','lapesetos','is_infectiouss','home_address','work_unit']
         console.log("table",this.tableData)
 
         const data = this.formatJson(filterVal, this.tableData)

src/xt_pages/user/templateSummary.vue

@@ -680,6 +680,7 @@
                    <el-radio-group style="padding: 10px;"  v-model="radio" @change="changeRadio">
                       <el-radio :label="1">月份</el-radio>
                       <el-radio :label="2">季度</el-radio>
+                      <el-radio :label="3">自定义时间</el-radio>
                     </el-radio-group>
                  </el-form-item>
                  <el-form-item v-show="showquarty">
@@ -703,20 +704,39 @@
                       value-format="yyyy-MM">
                     </el-date-picker>
                  </el-form-item>
-                 <!-- <el-form-item  label="月份:"
-                   prop="startYear"
-                   style="width:100%;">
-                  <el-date-picker
-                    v-model="startMonth"
-                    type="month"
-                    format="MM"
-                    value-format="MM"
-                    placeholder="请选择">
-                  </el-date-picker>
-                 </el-form-item> -->
                 </div>
               </el-form-item>
             </el-row>
+            <el-row>
+              <div v-show="showStarttime">
+
+                  <el-form-item >
+                    <el-date-picker
+                        @change="changFirstYear"
+                        style="width: 200px;"
+                        v-model="fisrt_time"
+                        class="timePicker"
+                        type="month"
+                        placeholder="开始时间"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd">
+                      </el-date-picker>
+                       -
+                      <el-date-picker
+                          @change="changLastYear"
+                          style="width: 200px;"
+                          v-model="last_time"
+                          class="timePicker"
+                          type="month"
+                          placeholder="结束时间"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd">
+                        </el-date-picker>
+                  </el-form-item> 
+              
+              </div>
+              
+            </el-row>
             <el-row>
                <span>选择检验检查项目:</span>
                  <div class="record">
@@ -966,6 +986,9 @@
        radio:1,
        showtime:true,
        showquarty:false,
+       fisrt_time:"",
+       last_time:"",
+       showStarttime:false,
       }
     },
     created() {
@@ -1223,6 +1246,11 @@
             }
           }
 
+          if(this.radio == 3){
+            start_time = this.fisrt_time
+            end_time = this.last_time
+          }
+
 
           console.log("start_time",start_time)
           console.log("end_time",end_time)
@@ -1846,6 +1874,13 @@
         }
 
        
+        this.getInspectionMajor()
+      },
+      changFirstYear(){
+        console.log("hahhahahh")
+        this.getInspectionMajor()
+      },
+      changLastYear(){
         this.getInspectionMajor()
       },
       selectSummary(val){
@@ -1892,11 +1927,19 @@
        if(val == 1){
          this.showtime = true
          this.showquarty = false
+         this.showStarttime = false
          this.getInspectionMajor()
        }
        if(val == 2){
          this.showquarty = true
          this.showtime = false
+         this.showStarttime = false
+         this.getInspectionMajor()
+       }
+       if(val == 3){
+         this.showStarttime = true
+         this.showtime =false
+         this.showquarty = false
          this.getInspectionMajor()
        }
      }

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -97,7 +97,13 @@
         color: '#606266'
       }"
       style="width: 100%"
+      @selection-change="handleSelectionChange"
     >
+     <el-table-column
+        align="center"
+        type="selection"
+        width="55">
+      </el-table-column>
       <el-table-column label="透析处方" min-width="100" align="center">
         <template slot-scope="scope">
           <span v-if="scope.row.prescription.id > 0">已确认</span>
@@ -120,9 +126,9 @@
           {{ scope.row.patient }}
         </template>
       </el-table-column>
-      <el-table-column label="分区" min-width="70" align="center">
+      <el-table-column label="分区" min-width="100" align="center">
         <template slot-scope="scope">
-          {{ scope.row.zone.name }}
+          {{ scope.row.zone.name }}（{{ getType(scope.row.partition_id)  }}）
         </template>
       </el-table-column>
       <el-table-column label="班次" min-width="70" align="center">
@@ -307,6 +313,7 @@ export default {
       zoneList:[],
       start_time:moment().week(moment().week() + 1).startOf('week').unix(),
       loading:false,
+      ids:""
     };
   },
   watch: {
@@ -372,10 +379,8 @@ export default {
 
         let next_sunday = moment().add((7 - weekOfDay) + 7, 'days').format('YYYY-MM-DD')
 
-        console.log("开始时间++++++++",(this.getTimestamp(next_monday)/1000)-28800)
-
         var now_time = parseInt(this.week_type - 1)*86400 + (this.getTimestamp(next_monday)/1000 -28800)
-        console.log("now_time------------------",now_time)
+      
 
 
 
@@ -385,7 +390,8 @@ export default {
           week_type:this.week_type,
           week_time:this.week_time,
           zone:str,
-          record_date:this.getTime(now_time)
+          record_date:this.getTime(now_time),
+          ids:this.ids,
        }
       console.log("params0000000000",params)
       getNextScheduleWeekDay(params).then(response => {
@@ -665,7 +671,7 @@ export default {
     },
     signPrint() {
         //
-        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id ==10375){
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id ==10375 || this.org_id ==10517){
          var zone = this.zone
           var newArr = []
           for(let i=0;i<this.zoneList.length;i++){
@@ -680,10 +686,10 @@ export default {
             str = zone.join(",")
           }
           this.$router.push({
-            path: '/schedule/remind/print/setting/one?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+2
+            path: '/schedule/remind/print/setting/one?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+2+"&ids="+this.ids
           })
           }
-        if(this.org_id!=9671 && this.org_id!=9675 && this.org_id!=10340 && this.org_id !=10375 && this.org_id !=10469){
+        if(this.org_id!=9671 && this.org_id!=9675 && this.org_id!=10340 && this.org_id !=10375 && this.org_id !=10469 && this.org_id !=10517){
           var zone = this.zone
         var newArr = []
         for(let i=0;i<this.zoneList.length;i++){
@@ -698,7 +704,7 @@ export default {
           str = zone.join(",")
         }
         this.$router.push({
-          path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+2
+          path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+2+"&ids="+this.ids
         })
         }
         else if(this.org_id==10469){
@@ -717,7 +723,7 @@ export default {
             str = zone.join(",")
           }
           this.$router.push({
-            path: '/schedule/remind/print/setting/two?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+2
+            path: '/schedule/remind/print/setting/two?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+2+"&ids="+this.ids
           })
         }
 
@@ -729,6 +735,43 @@ export default {
       return uParseTime(val, '{y}-{m}-{d}')
       }
     },
+    handleSelectionChange(val){
+        var arr = []
+        for(let i=0;i<val.length;i++){
+          arr.push(val[i].patient_id)
+        }
+        this.ids = arr.join(",")
+     },
+     getType(zone_id){
+        var type_name =""
+        var is_type = 0
+        for(let i=0;i<this.zoneList.length;i++){
+           if(zone_id == this.zoneList[i].id){
+               is_type =this.zoneList[i].type
+           }
+        }
+        if(is_type ==1){
+          type_name = "普通"
+        }
+        if(is_type ==2){
+          type_name = "乙肝"
+        }
+        if(is_type ==3){
+          type_name = "丙肝"
+        }
+        if(is_type ==4){
+          type_name = "艾滋病"
+        }
+        if(is_type ==5){
+          type_name = "肺结核"
+        }
+        if(is_type ==6){
+          type_name = "梅毒"
+        }
+
+        return type_name 
+
+      }
   },
   components: {
     WeekItem

src/xt_pages/workforce/components/tableWeeks.vue

@@ -77,18 +77,6 @@
         </div>
         <div class="cell clearfix">
             <div class="title"><span class="name">分区</span> :</div>
-            <!-- <div class="time">
-                <ul class>
-                    <li
-                          :class="item.id == zone ? 'active' : ''"
-                            @click="selectZoneList(item.id)"
-                            v-for="item in zoneList"
-                            :key="item.id"
-                    >
-                        {{ item.name }}
-                    </li>
-                </ul>
-            </div> -->
             <el-select v-model="zone" multiple placeholder="请选择" @change="changeZone">
               <el-option
                 v-for="item in zoneList"
@@ -99,26 +87,26 @@
             </el-select>
         </div>
         <el-table
-                v-loading="isloading"
-                :row-style="{ color: '#303133' }"
-                :data="summarySchData"
-                border
-                :header-cell-style="{
-        backgroundColor: 'rgb(245, 247, 250)',
-        color: '#606266'
-      }"
-                style="width: 100%"
+          v-loading="isloading"
+          :row-style="{ color: '#303133' }"
+          :data="summarySchData"
+          border
+          :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+         }"
+         style="width: 100%"
+        
         >
-
+         
             <el-table-column label="分区" min-width="70" align="center">
                 <template slot-scope="scope">
-                    {{ scope.row.zone.name }}
+                    {{ scope.row.zone.name }} 
                 </template>
             </el-table-column>
 
             <el-table-column label="透析模式" min-width="100" align="center">
                 <template slot-scope="scope">
-                    <!--{{getModeDesc(scope.row.list)}}-->
                     <div >{{getModeDesc(scope.row.list)}}</div>
 
                 </template>
@@ -168,11 +156,17 @@
                 :data="scheduleData"
                 border
                 :header-cell-style="{
-        backgroundColor: 'rgb(245, 247, 250)',
-        color: '#606266'
-      }"
+                backgroundColor: 'rgb(245, 247, 250)',
+                color: '#606266'
+                 }"
                 style="width: 100%"
+                @selection-change="handleSelectionChange"
         >
+          <el-table-column
+            align="center"
+            type="selection"
+            width="55">
+          </el-table-column>
             <el-table-column label="透析处方" min-width="100" align="center">
                 <template slot-scope="scope">
                     <span v-if="scope.row.prescription.id>0">已确定</span>
@@ -195,9 +189,9 @@
                     {{ scope.row.patient.name }}
                 </template>
             </el-table-column>
-            <el-table-column label="分区" min-width="70" align="center">
+            <el-table-column label="分区" min-width="100" align="center">
                 <template slot-scope="scope">
-                    {{ scope.row.zone.name }}
+                    {{ scope.row.zone.name }} （{{ getType(scope.row.partition_id)  }}）
                 </template>
             </el-table-column>
             <el-table-column label="班次" min-width="70" align="center">
@@ -221,17 +215,7 @@
             </el-table-column>
             <el-table-column label="透析器/灌流器" min-width="100" align="center">
                 <template slot-scope="scope">
-                    <!-- <span v-if="org_id!=9987&&org_id!=10131&&org_id!=10215 &&org_id!=10233 && org_id!=10290">
-                      <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus!=''">
-                        <span>{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
-                      </span>
-
-                      <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus==''&& scope.row.dialysissolution.id > 0 && scope.row.prescription.dialysis_dialyszers == ''">{{scope.row.dialysissolution.dialysis_dialyszers}}</span>
-                    </span> -->
-
-                    <!-- <span v-if="org_id==10131 || org_id == 10215 || org_id == 10233">{{scope.row.dialysissolution.dialyzer_perfusion_apparatus}}</span> -->
-
-                      <!-- {{scope.row.prescription.dialysis_dialyszers}} -->
+                   
                     <span v-if="scope.row.prescription.dialysis_dialyszers =='' ">
                        {{scope.row.dialysissolution.dialysis_dialyszers}}
                     </span>
@@ -311,6 +295,19 @@
             </el-table-column>
         </el-table>
 
+        <el-pagination
+          @size-change="handleSizeChangeOne"
+          @current-change="handleCurrentChangeOne"
+          :page-sizes="[100, 200, 300,400,500,600,700,800,900,1000]"
+          :page-size="10"
+          background
+          align="right"
+          style="margin-top:20px;"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+       >
+      </el-pagination>
+
     <el-dialog
             title="打印设置"
             :visible.sync="dialogVisible"
@@ -374,7 +371,6 @@
     getAllZoneList,
     getRemindPrintList,
     getScheduleList,
-    getSchedules,
     getScheduleWeekDay,
     saveRemindPrint
   } from '@/api/schedule'
@@ -464,6 +460,10 @@
         summarySchData: [],
         zone:0,
         zoneList:[],
+        ids:"",
+        limit:100,
+        page:1,
+        total:0,
       }
     },
     watch: {
@@ -881,12 +881,12 @@
           str = zone.join(",")
         }
         this.$router.push({
-          path: '/schedule/remind/print?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str
+          path: '/schedule/remind/print?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str+"&ids"+this.ids
         })
       },
       signPrint() {
 //
-        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340  || this.org_id == 10375){
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340  || this.org_id == 10375 || this.org_id ==10517){
          var zone = this.zone
           console.log("zone23232",zone)
           var newArr = []
@@ -902,10 +902,10 @@
             str = zone.join(",")
           }
           this.$router.push({
-            path: '/schedule/remind/print/setting/one?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1
+            path: '/schedule/remind/print/setting/one?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1+"&ids="+this.ids
           })
         }
-        if(this.org_id != 9671 && this.org_id != 9675 && this.org_id != 10340  && this.org_id!=10375 && this.org_id!=10469){
+        if(this.org_id != 9671 && this.org_id != 9675 && this.org_id != 10340  && this.org_id!=10375 && this.org_id!=10469 && this.org_id!=10517){
           var zone = this.zone
           console.log("zone23232",zone)
           var newArr = []
@@ -921,7 +921,7 @@
             str = zone.join(",")
           }
           this.$router.push({
-            path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1
+            path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1+"&ids="+this.ids
           })
         }else if(this.org_id==10469){
           var zone = this.zone
@@ -939,7 +939,7 @@
             str = zone.join(",")
           }
           this.$router.push({
-            path: '/schedule/remind/print/setting/two?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1
+            path: '/schedule/remind/print/setting/two?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1+"&ids="+this.ids
           })
         }
 
@@ -1023,6 +1023,9 @@
           week_type: this.week_type,
           week_time: this.week_time,
           zone: str,
+          ids:this.ids,
+          limit:this.limit,
+          page:this.page,
         }
         console.log("param",params)
         this.scheduleData = []
@@ -1033,6 +1036,7 @@
             console.log('22333333333', this.pre_status)
             var list = response.data.data.list
             console.log("list33333333333333333333",list)
+            this.total =response.data.data.total
             if (this.pre_status == 0) {
 
               for (let i = 0; i < list.length; i++) {
@@ -1127,7 +1131,7 @@
                 this.summarySchData.push(obj)
               }
             }
-
+            console.log("this.000000",this.summarySchData)
           }
         })
       }
@@ -1572,11 +1576,58 @@
         this.zone = val
         this.getScheduleList()
       },
-     printActionSchedule(){
+      printActionSchedule(){
         this.$router.push({
           path: '/workforce/schedulePrint=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + this.pre_status+"&type="+1
         })
-     }
+      },
+      handleSelectionChange(val){
+        console.log("val",val)
+        var arr = []
+        for(let i=0;i<val.length;i++){
+          arr.push(val[i].patient_id)
+        }
+        this.ids = arr.join(",")
+     },
+     handleSizeChangeOne(val) {
+        this.limit = val;
+        this.getScheduleList();
+      },
+      handleCurrentChangeOne(val) {
+        this.page = val;
+        this.getScheduleList();
+      },
+      getType(zone_id){
+        var type_name =""
+        var is_type = 0
+        for(let i=0;i<this.zoneList.length;i++){
+           if(zone_id == this.zoneList[i].id){
+               is_type =this.zoneList[i].type
+           }
+        }
+        if(is_type ==1){
+          type_name = "普通"
+        }
+        if(is_type ==2){
+          type_name = "乙肝"
+        }
+        if(is_type ==3){
+          type_name = "丙肝"
+        }
+        if(is_type ==4){
+          type_name = "艾滋病"
+        }
+        if(is_type ==5){
+          type_name = "肺结核"
+        }
+        if(is_type ==6){
+          type_name = "梅毒"
+        }
+
+        return type_name 
+
+      }
+      
     },
     components: {
       WeekItem

src/xt_pages/workforce/next_remind_print.vue

@@ -52,7 +52,7 @@
                   <span v-if="main_collection.schedule_week == 6">周六</span>
                 </td>
                 <td :width="td_1_width" v-if="printObj.name == 1">{{ main_collection.patient}}</td>
-                <td :width="td_1_width" v-if="printObj.zone == 1">{{ main_collection.zone.name }}</td>
+                <td :width="td_1_width" v-if="printObj.zone == 1">{{ main_collection.zone.name }} （{{ getType(main_collection.partition_id)  }}）</td>
                 <td :width="td_1_width" v-if="printObj.classes == 1">
                   {{getSchedulesType(main_collection.schedule_type)}}
                 </td>
@@ -113,7 +113,7 @@
 </template>
 
 <script>
-  import { getNextScheduleWeekDay,getPrintList } from '@/api/schedule'
+  import { getNextScheduleWeekDay,getPrintList,getAllZoneList } from '@/api/schedule'
   import { getDataConfig } from '@/utils/data'
   import { parseTime } from '@/utils'
   import { uParseTime } from '@/utils/tools'
@@ -147,13 +147,14 @@
         printObj:{},
         loading: false,
         blood_access_option:[],
+        zoneList:[]
       }
     },
     components: {
       BreadCrumb
     },
     created() {
-      
+      this.getAllZoneList()
       this.blood_access_option = getDataConfig(
           'hemodialysis',
           'vascular_access_desc'
@@ -178,6 +179,14 @@
     
     },
     methods: {
+      getAllZoneList(){
+      getAllZoneList().then(response=>{
+         if(response.data.state == 1){
+            var zonelist = response.data.data.zoneList
+            this.zoneList.push(...zonelist)
+         }
+      })
+      },
       getBloodName(id){
          var name= ""
          for(let i=0;i<this.blood_access_option.length;i++){
@@ -470,6 +479,36 @@
           } 
         }
         return nowdate
+      },
+      getType(zone_id){
+        var type_name =""
+        var is_type = 0
+        for(let i=0;i<this.zoneList.length;i++){
+           if(zone_id == this.zoneList[i].id){
+               is_type =this.zoneList[i].type
+           }
+        }
+        if(is_type ==1){
+          type_name = "普通"
+        }
+        if(is_type ==2){
+          type_name = "乙肝"
+        }
+        if(is_type ==3){
+          type_name = "丙肝"
+        }
+        if(is_type ==4){
+          type_name = "艾滋病"
+        }
+        if(is_type ==5){
+          type_name = "肺结核"
+        }
+        if(is_type ==6){
+          type_name = "梅毒"
+        }
+
+        return type_name 
+
       }
     }
   }

src/xt_pages/workforce/remind_print.vue

@@ -51,7 +51,7 @@
                   <span v-if="main_collection.schedule_week == 6">周六</span>
                 </td>
                 <td :width="td_1_width" v-if="printObj.name == 1">{{ main_collection.patient.name}}</td>
-                <td :width="td_1_width" v-if="printObj.zone == 1">{{ main_collection.zone.name }}</td>
+                <td :width="td_1_width" v-if="printObj.zone == 1">{{ main_collection.zone.name }} （{{ getType(main_collection.partition_id)  }}）</td>
                 <td :width="td_1_width" v-if="printObj.classes == 1">
                   {{getSchedulesType(main_collection.schedule_type)}}
                 </td>
@@ -112,7 +112,7 @@
 </template>
 
 <script>
-  import { getScheduleList,getPrintList } from '@/api/schedule'
+  import { getScheduleList,getPrintList,getAllZoneList } from '@/api/schedule'
   import { getDataConfig } from '@/utils/data'
   import { parseTime } from '@/utils'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
@@ -140,13 +140,15 @@
         printObj:{},
         week_time:0,
         zone:0,
-        blood_access_option:[]
+        blood_access_option:[],
+        zoneList:[]
       }
     },
     components: {
       BreadCrumb
     },
     created() {
+      this.getAllZoneList()
       this.getPrintList()
       this.org_id = this.$store.getters.xt_user.org.id
 
@@ -166,6 +168,9 @@
           week_type:this.week_type,
           week_time:this.week_time,
           zone:this.zone,
+          ids:this.$route.query.ids,
+          limit:1000,
+          page:1,
         }
        console.log("params",params)
        getScheduleList(params).then(response=>{
@@ -217,6 +222,14 @@
       
     },
     methods: {
+     getAllZoneList(){
+      getAllZoneList().then(response=>{
+         if(response.data.state == 1){
+            var zonelist = response.data.data.zoneList
+            this.zoneList.push(...zonelist)
+         }
+      })
+      },
       getAdvice:function(doctor_advice) {
         if (doctor_advice != null) {
 
@@ -423,6 +436,36 @@
            }
          }
          return name
+      },
+      getType(zone_id){
+        var type_name =""
+        var is_type = 0
+        for(let i=0;i<this.zoneList.length;i++){
+           if(zone_id == this.zoneList[i].id){
+               is_type =this.zoneList[i].type
+           }
+        }
+        if(is_type ==1){
+          type_name = "普通"
+        }
+        if(is_type ==2){
+          type_name = "乙肝"
+        }
+        if(is_type ==3){
+          type_name = "丙肝"
+        }
+        if(is_type ==4){
+          type_name = "艾滋病"
+        }
+        if(is_type ==5){
+          type_name = "肺结核"
+        }
+        if(is_type ==6){
+          type_name = "梅毒"
+        }
+
+        return type_name 
+
       }
     },
   }

src/xt_pages/workforce/remind_print_setting.vue

@@ -74,6 +74,14 @@
                   <span v-if="type ==1 && printObj.name == 1">{{main_collection.patient.name}} </span>
                   <span v-if="type ==2 && printObj.name == 1">{{main_collection.patient}} </span>
                 </div>
+                <div class="printCell">
+                  <span>
+                    床号：{{ main_collection.number.number }}
+                    <span style="width:auto;" v-if="main_collection.schedule_type == 1">上午</span>
+                    <span style="width:auto;" v-if="main_collection.schedule_type == 2">下午</span>
+                    <span style="width:auto;" v-if="main_collection.schedule_type == 3">晚上</span>
+                  </span>
+                </div>
                 <div v-if="printObj.anticoagulant == 1">抗凝剂:
                   <span v-if="org_id == 10138 || org_id == 0 || org_id == 10278">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
                   <span v-else >
@@ -177,7 +185,7 @@
                   <span>抗凝剂：{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}</span>
                 </div>
                 <div class="printCell">
-                  <span>净重值：{{ main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.additional_weight }}Kg</span>
+                  <span>净重值：{{ (main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.additional_weight).toFixed(2) }}Kg</span>
                  首剂：<span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_shouji}} mg</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">
                     {{main_collection.dialysissolution.anticoagulant_shouji}}mg
@@ -355,6 +363,9 @@
           week_type:this.week_type,
           week_time:this.week_time,
           zone:this.zone,
+          ids:this.$route.query.ids,
+          limit:1000,
+          page:1,
         }
        console.log("params",params)
        getScheduleList(params).then(response=>{
@@ -605,7 +616,8 @@
           week_type:this.week_type,
           week_time:this.week_time,
           zone:this.zone,
-          record_date:this.getTime(now_time)
+          record_date:this.getTime(now_time),
+          ids:this.$route.query.ids,
         }
         // const params = {
         //   start_time:1609603200,

src/xt_pages/workforce/remind_print_setting_one.vue

@@ -382,7 +382,7 @@
                 <div class="printCell" v-if="org_id==9671 || org_id==9675 || org_id==10340">
                     <span v-if="main_collection.lastafterweight!=undefined">上次透析时长：{{ main_collection.lastafterweight.actual_treatment_hour }}小时{{ main_collection.lastafterweight.actual_treatment_minute }}分钟</span>
                 </div>
-                <div class="printCell">身份证:
+                <div class="printCell" v-if="org_id!=10517 && org_id!=0">身份证:
                     <span v-if="type ==1">{{main_collection.patient.id_card_no}} </span>
                     <span v-if="type ==2">{{main_collection.id_card_no}} </span>
                 </div>
@@ -392,13 +392,13 @@
                 </div>
                 <div class="printCell">
                    透析器:
-                    <span v-if="org_id!=0&&org_id!=10375">
+                    <span v-if="org_id!=10375">
                       <span v-if="type ==1">{{main_collection.dialysis_order.dialysis_dialyszers}} </span>
                       <span v-if="type ==2">{{main_collection.dialysis_order.dialysis_dialyszers}} </span>
                     </span>
                    
 
-                    <span v-if="org_id == 0 || org_id ==10375">
+                    <span v-if="org_id ==10375">
                       <span v-if="type ==1">{{main_collection.dialysissolution.dialysis_dialyszers}} </span>
                       <span v-if="type ==2">{{main_collection.dialysissolution.dialysis_dialyszers}} </span>
                     </span>
@@ -406,25 +406,25 @@
                 </div>
                 <div class="printCell">
                    灌流器:
-                   <span v-if="org_id!=0&&org_id!=10375">
+                   <span v-if="org_id!=10375">
                     <span v-if="type ==1">{{main_collection.dialysis_order.dialysis_irrigation}} </span>
                     <span v-if="type ==2">{{main_collection.dialysis_order.dialysis_irrigation}} </span>
                    </span>
                  
 
-                    <span v-if="org_id == 0 || org_id == 10375"> 
+                    <span v-if="org_id == 10375"> 
                       <span v-if="type ==1">{{main_collection.dialysissolution.dialysis_irrigation}} </span>
                       <span v-if="type ==2">{{main_collection.dialysissolution.dialysis_irrigation}} </span>
                     </span>
                 </div>
                 <div class="printCell">
                   血管通路:
-                  <span v-if="org_id!=0&& org_id!=10375">
+                  <span v-if="org_id!=10375">
                     <span v-if="type ==1">{{getBloodAccess(main_collection.dialysis_order.blood_access_id)}} </span>
                     <span v-if="type ==2">{{getBloodAccess(main_collection.dialysis_order.blood_access_id)}} </span>
                   </span>
 
-                  <span v-if="org_id == 0 || org_id == 10375">
+                  <span v-if="org_id == 10375">
                    <span v-if="type ==1">{{getBloodAccess(main_collection.dialysissolution.blood_access)}} </span>
                    <span v-if="type ==2">{{getBloodAccess(main_collection.dialysissolution.blood_access)}} </span>
                   </span>
@@ -524,12 +524,15 @@
       this.week_time = this.$route.query.week_time
       this.zone = this.$route.query.zone
       this.pre_status = this.$route.query.prestatus
-
+      
       if (parseInt(this.$route.query.type) == 1) {
         const params = {
           week_type: this.week_type,
           week_time: this.week_time,
-          zone: this.zone
+          zone: this.zone,
+          ids:this.$route.query.ids,
+          limit:1000,
+          page:1,
         }
       
         this.loading = true
@@ -785,7 +788,8 @@
           week_type: this.week_type,
           week_time: this.week_time,
           zone: this.zone,
-          record_date: this.getTime(now_time)
+          record_date: this.getTime(now_time),
+          ids:this.$route.query.ids,
         }
         // const params = {
         //   start_time:1609603200,

src/xt_pages/workforce/remind_print_setting_two.vue

@@ -261,7 +261,6 @@
      this.org_id = this.$store.getters.xt_user.org.id
      console.log("机构ID",this.org_id)
      this.currentDate = this.getCurrentDate()
-     console.log("打印时间----------------------------",this.currentDate)
     this.printDate = moment().format("YYYY-MM-DD HH:mm:ss")
     this.modeOptions = this.$store.getters.treatment_mode
     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
@@ -275,6 +274,9 @@
           week_type:this.week_type,
           week_time:this.week_time,
           zone:this.zone,
+          ids:this.$route.query.ids,
+          limit:1000,
+          page:1,
         }
       console.log("params",params)
       getScheduleList(params).then(response=>{
@@ -519,7 +521,8 @@
           week_type:this.week_type,
           week_time:this.week_time,
           zone:this.zone,
-          record_date:this.getTime(now_time)
+          record_date:this.getTime(now_time),
+          ids:this.$route.query.ids,
         }
         // const params = {
         //   start_time:1609603200,