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

src/xt_pages/Dialysisanalysis/platelets/all_ktv.vue

@@ -210,6 +210,7 @@
           prop="inspect_value"
           label="结果"
         >
+          <template slot-scope="scope">{{ parseFloat(scope.row.inspect_value).toFixed(2)}}</template>
         </el-table-column>
 
       </el-table>

src/xt_pages/Dialysisanalysis/platelets/all_urr.vue

@@ -210,6 +210,8 @@
           prop="inspect_value"
           label="结果"
         >
+          <template slot-scope="scope">{{ (scope.row.inspect_value) + '%'}}</template>
+
         </el-table-column>
 
       </el-table>

src/xt_pages/Dialysisanalysis/platelets/p_ktv.vue

@@ -106,7 +106,7 @@
 
                 <el-table-column width="100" label="KTV" align="center">
                   <template slot-scope="scope">
-                    {{scope.row.value}}
+                    {{parseFloat(scope.row.value).toFixed(2)}}
                   </template>
                 </el-table-column>
               </el-table>
@@ -484,7 +484,7 @@ export default {
             for (let i = 0; i < resp.data.inspections.length; i++) {
               let obj = {
                 name:resp.data.patient.name,
-                value:resp.data.inspections[i].inspect_value,
+                value:parseFloat(resp.data.inspections[i].inspect_value).toFixed(2),
                 inspect_date:resp.data.inspections[i].inspect_date
               }
               this.tableData.push(obj)

src/xt_pages/Dialysisanalysis/platelets/p_urr.vue

@@ -104,7 +104,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column width="100" label="URR" align="center">
+                <el-table-column width="100" label="URR(%)" align="center">
                   <template slot-scope="scope">
                     {{scope.row.value}}
                   </template>

src/xt_pages/outpatientTool/labelPrint.vue

@@ -134,7 +134,7 @@
                               <div>{{getTime(current_ctime,'{m}-{d}')}}</div>
                               <div>{{getTime(current_ctime,'{h}:{i}')}}</div>
                           </div>
-                          <img  v-if=" $store.getters.xt_user.org.id != 10138"  id="barcode">
+                          <img  v-if="$store.getters.xt_user.org.id != 10138 && $store.getters.xt_user.org.id != 10217"  id="barcode">
                       </div>
                       <div style="margin-bottom:5px;">{{current_number}}</div>
                       <div style="display:flex;">
@@ -166,7 +166,7 @@
                 <div>{{getTime(item.ctime,'{m}-{d}')}}</div>
                 <div>{{getTime(item.ctime,'{h}:{i}')}}</div>
               </div>
-              <img  v-if=" $store.getters.xt_user.org.id != 10138"  id="barcode">
+              <img   v-if="$store.getters.xt_user.org.id != 10138 && $store.getters.xt_user.org.id != 10217"  id="barcode">
             </div>
                 <div style="margin-bottom:5px;">{{item.number}}</div>
                <div style="display:flex;">

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -311,6 +311,11 @@ export default {
     }
   },
   methods: {
+    handleStartTimeChange(){
+      this.getlist()
+    },  handleEndTimeChange(){
+      this.getlist()
+    },
     handleSizeChange(limit) {
       this.tableData = []
       this.listQuery.limit = limit
@@ -329,6 +334,7 @@ export default {
         this.$message.error('结束时间不能小于开始时间')
         this.listQuery.start_time = ''
       } else {
+        this.getlist()
 
       }
 
@@ -340,6 +346,7 @@ export default {
         this.$message.error('结束时间不能小于开始时间')
         this.listQuery.end_time = ''
       } else {
+        this.getlist()
 
       }
     },
@@ -516,7 +523,7 @@ export default {
           //     }
           //   }
           // }
-        
+
         } else {
           this.isLoadingTwo = false
 
@@ -529,7 +536,7 @@ export default {
         if (response.data.state == 1) {
           this.isLoadingTwo = false
           var patients = response.data.data.patients
-        
+
           this.tablePatients = patients
 
           //  let dataInfothree = {}
@@ -552,7 +559,7 @@ export default {
           var control = response.data.data.control
 
           var infectiousControl = response.data.data.infectiousControl
-         
+
           infectiousControl.map(item => {
             control.push(item)
           })
@@ -572,18 +579,22 @@ export default {
           // 分页
           for (let i = 0; i < control.length; i++) {
             for (let j = 0; j < patients.length; j++) {
-              if (control[i].inspect_date == patients[j].inspect_date) {
+              if (control[i].patient_id == patients[j].patient_id) {
                 newArr.push(control[i])
               }
             }
           }
+          console.log(newArr)
+
+          console.log("newArr")
+
+
 
           let dataInfo = {}
           newArr.forEach((item, index) => {
-            let { inspect_date } = item
-            if (!dataInfo[inspect_date]) {
-              dataInfo[inspect_date] = {
-                inspect_date,
+            let { patient_id } = item
+            if (!dataInfo[patient_id]) {
+              dataInfo[patient_id] = {
                 name: item.name,
                 child: [],
                 patient_id: item.patient_id,
@@ -593,14 +604,17 @@ export default {
           })
           let list = Object.values(dataInfo)
 
+
           list.map(item => {
             for (let i = 0; i < newArr.length; i++) {
-              if (item.inspect_date == newArr[i].inspect_date) {
+              if (item.patient_id == newArr[i].patient_id) {
                 item.child.push(newArr[i])
               }
             }
           })
 
+
+
           var newarrtwo = []
           list.map(item => {
             item.child.map(it => {
@@ -608,6 +622,11 @@ export default {
             })
           })
 
+          console.log("list")
+          console.log(list)
+          console.log(newarrtwo)
+
+
           // 配置的才显示
           var arrthree = []
           for (let i = 0; i < newarrtwo.length; i++) {
@@ -624,27 +643,28 @@ export default {
             arrthree.push(item)
           })
 
+
+
           var dd = {}
           for (const index in arrthree) {
-            if (!(arrthree[index].inspect_date in dd)) {
-              dd[arrthree[index].inspect_date] = {}
+            if (!(arrthree[index].patient_id in dd)) {
+              dd[arrthree[index].patient_id] = {}
             }
-            if (!(arrthree[index].item_name in dd[arrthree[index].inspect_date]) && arrthree[index].item_name != 0) {
-              dd[arrthree[index].inspect_date][arrthree[index].item_name] = arrthree[index]
+            if (!(arrthree[index].item_name in dd[arrthree[index].patient_id]) && arrthree[index].item_name != 0) {
+              dd[arrthree[index].patient_id][arrthree[index].item_name] = arrthree[index]
 
             }
           }
 
           let dataInfotwo = {}
           newArr.forEach((item, index) => {
-            let { inspect_date } = item
-            if (!dataInfotwo[inspect_date]) {
-              dataInfotwo[inspect_date] = {
-                inspect_date,
+            let { patient_id } = item
+            if (!dataInfotwo[patient_id]) {
+              dataInfotwo[patient_id] = {
+                patient_id,
                 name: item.name,
                 inspect_value: item.inspect_value,
                 id: item.id,
-                inspect_date: item.inspect_date
               }
             }
           })
@@ -666,13 +686,14 @@ export default {
 
           listtwo.map(item => {
             this.tableData.map(it => {
-              if (item.inspect_date == parseInt(it.name)) {
+              if (item.patient_id == parseInt(it.name)) {
                 it.name = item.name
                 it.id = item.id
                 it.inspect_date = item.inspect_date
               }
             })
           })
+
           for (let i = 0; i < this.patientsArr.length; i++) {
             for (let j = 0; j < this.tableData.length; j++) {
               if (this.patientsArr[i].name == this.tableData[j].name) {