新分支

src/api/inspection.js

@@ -96,6 +96,14 @@ export function setRemindDialog(id,is_open) {
 
 
 
+export function getNewInspectionList(params){
+ 
+  return request({
+    url:"/api/getnewinspectionList",
+    method:"get",
+    params:params,
+  })
+}
 
 
 

src/store/modules/globalConfig.js

@@ -819,6 +819,21 @@ const global_config = {
         calcium: 1,
         bicarbonate: 1
       },
+      41: {
+        id: 41,
+        name: 'HDF17H',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
     },
     anticoagulants_confit: { // 抗凝剂
       1: {

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -69,24 +69,49 @@
               </div>
               岁
             </div>
-            <div class="inline_block" v-if="record.receive_assessment.condition!=1">
-              门诊：
-              <div class="under_line" style="width: 30px; text-align: center">
-                <check-box :checked="record.patient.source == 1"></check-box>
+            <span v-if="org_id!=0&&org_id!=10677">
+                <div class="inline_block" v-if="record.receive_assessment.condition!=1">
+                门诊：
+                <div class="under_line" style="width: 30px; text-align: center">
+                  <check-box :checked="record.patient.source == 1"></check-box>
+                </div>
               </div>
-            </div>
-            <div class="inline_block" v-if="record.receive_assessment.condition!=1">
-              门特：
-              <div class="under_line" style="width: 30px; text-align: center">
-                <check-box :checked="record.patient.source == 3"></check-box>
+              <div class="inline_block" v-if="record.receive_assessment.condition!=1">
+                门特：
+                <div class="under_line" style="width: 30px; text-align: center">
+                  <check-box :checked="record.patient.source == 3"></check-box>
+                </div>
               </div>
-            </div>
-            <div class="inline_block" v-if="record.receive_assessment.condition==1">
-              住院：
-              <div class="under_line" style="width: 30px; text-align: center">
-                <check-box :checked="record.patient.source == 2"></check-box>
+              <div class="inline_block" v-if="record.receive_assessment.condition==1">
+                住院：
+                <div class="under_line" style="width: 30px; text-align: center">
+                  <check-box :checked="record.patient.source == 2"></check-box>
+                </div>
+              </div> 
+            </span>
+
+            <span v-if="org_id ==0 || org_id==10677">
+                <div class="inline_block">
+                门诊：
+                <div class="under_line" style="width: 30px; text-align: center">
+                  <check-box :checked="true"></check-box>
+                </div>
               </div>
-            </div>
+              <div class="inline_block">
+                门特：
+                <div class="under_line" style="width: 30px; text-align: center">
+                  <check-box :checked="false"></check-box>
+                </div>
+              </div>
+              <div class="inline_block">
+                住院：
+                <div class="under_line" style="width: 30px; text-align: center">
+                  <check-box :checked="false"></check-box>
+                </div>
+              </div> 
+            </span>
+           
+
             <div class="inline_block" v-if="org_id!=10510">
               病区：
               <div class="under_line" style="width: 50px; text-align: center">
@@ -3199,8 +3224,10 @@ export default {
         var resp = rs.data;
         if (resp.state == 1) {
           this.records = this.records.concat(resp.data.schedules);
+         
           var tempmonitorflag = true;
           for(let i=0;i<this.records.length;i++){
+           
             for(let j=0;j<this.records[i].monitor_records.length;j++){
               this.records[i].monitor_records[j].end = ""
               if (this.records[i].dialysis_order &&this.records[i].monitor_records[j].operate_time ==  this.records[i].dialysis_order.end_time) {
@@ -3215,6 +3242,7 @@ export default {
              }
             }
           }
+          console.log("hhhhhhhhhhhhhhhhhhhhhhhhh",this.records)
           for (const recordIndex in this.records) {
             var dlegh = 0;
             if (

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -3866,7 +3866,11 @@ export default {
       }
     },
     "patientInfo.source": function () {
-      if (this.patientInfo.source == 1) {
+      if(this.org_id ==10677 || this.org_id == 0){
+        this.patientInfo_source_1 = true;
+        this.patientInfo_source_2 = false;
+      }else{
+        if (this.patientInfo.source == 1) {
         this.patientInfo_source_1 = true;
         this.patientInfo_source_2 = false;
       } else if (this.patientInfo.source == 2) {
@@ -3876,6 +3880,8 @@ export default {
         this.patientInfo_source_2 = false;
         this.patientInfo_source_1 = false;
       }
+      }
+     
     },
 
 

src/xt_pages/user/components/PatientSidebar.vue

@@ -190,10 +190,10 @@ export default {
               name: '1-3',
               label: '肾科检验'
             },
-            // {
-            //   name: '4-12',
-            //   label: '新版肾科检验'
-            // },
+            {
+              name: '4-12',
+              label: '新版肾科检验'
+            },
             {
               name: '4-1',
               label: '肾科检查'

src/xt_pages/user/lapsoInspection.vue

@@ -118,7 +118,7 @@
                 color: '#606266'
               }"
                 :row-style="{ color: '#303133' }"
-                :data="items"
+                :data="tabileList"
                 border=""
                 style="width: 100%"
                 id="user-inspection-order"
@@ -131,7 +131,7 @@
                   min-width="180"
                 >
                   <template slot-scope="scope">
-                  
+                     {{getTime(scope.row.inspect_date)}}
                   </template>
                 </el-table-column>
   
@@ -143,7 +143,7 @@
                   :label="item.item_name"
                   >
                   <template slot-scope="scope">
-                  
+                     {{getInspecValue(scope.row.inspect_date,item.item_id) }}
                   </template>
 
                 </el-table-column>
@@ -462,7 +462,8 @@
     fetchInspectionReference,
     fetchPatientInspections,
     setRemind,
-    setRemindDialog
+    setRemindDialog,
+    getNewInspectionList
   } from '@/api/inspection'
   import { getFileExtension, uParseTime } from '@/utils/tools'
   
@@ -521,9 +522,18 @@
         },
         org_id:0,
         rowList:[],
+        tabileList:[],
+        inspectionList:[]
       }
     },
     methods: {
+      getTime(val) {
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
       imgClicks(val){
         console.log('asdasgg',val);
         this.imgs = []
@@ -1226,8 +1236,10 @@
           this.queryParams.project_id = this.project.project_id
           this.queryParams.page = 1
           this.total = 0
-          console.log("wowowowowow")
-          this.fetchPatientInspections(this.queryParams)
+         
+          // this.fetchPatientInspections(this.queryParams)
+
+          this.getNewInspectionList(this.queryParams)
         }
       },
   
@@ -1239,12 +1251,11 @@
       fetchPatientInspections(params) {
         this.items = []
         this.isPic = false
+        console.log("params------------------",params)
         fetchPatientInspections(params)
           .then(response => {
             if (response.data.state == 1) {
               var inspections = response.data.data.inspections
-             
-              this.rowList = inspections
               this.total = response.data.data.total
               this.itemDate = response.data.data.date
               let remind = response.data.data.remind
@@ -1285,7 +1296,7 @@
               }
               console.log("inspectionsMap",this.inspectionsMap)
               var items = this.project.inspection_reference
-              console.log("时间",items)
+              console.log("列表---------------------------------",items)
               for (var index in items) {
                console.log("obj",items[index])
                 // console.log("inspectionsMap",inspectionsMap[items[index].item_id])
@@ -1360,6 +1371,33 @@
         setTimeout(() => {
           this.itemLoading = false
         }, 1000)
+      },
+
+      getNewInspectionList(params){
+         console.log("params-----",params)
+         getNewInspectionList(params).then(response=>{
+           if(response.data.state == 1){
+             var list =  response.data.data.list
+             console.log("list=====================",list)
+             this.isPic = false
+             this.tabileList = list
+
+             var inspectionGroup = response.data.data.inspectionGroup
+
+             this.rowList = inspectionGroup
+              console.log("inspectionGroup",inspectionGroup)
+             var inspection = response.data.data.inspection
+
+             this.inspectionList = inspection
+             console.log("inspection-------------",inspection)
+             this.pageLoading = false
+             this.itemLoading = false
+             this.formLoading = false
+           }
+        })
+      },
+      getInspecValue(inspect_date,item_id){
+        
       }
     },
     created() {