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

src/xt_pages/user/components/PatientSidebar.vue

@@ -41,7 +41,7 @@
       >
       </el-tree>
     </div>
-    <div class="patient-app-container " :style="{width:(treeKey!='3-4'&& treeKey!='3-5')?'100vw':''}">
+    <div class="patient-app-container " :style="{width:(treeKey=='3-3')?'100vw':''}">
       <span class="patient-name"
         >姓名：{{ currentPatient.name }} &nbsp;&nbsp; 性别：{{
           tranSex(currentPatient.gender)

src/xt_pages/user/inspection.vue

@@ -148,13 +148,13 @@
                         <span v-else> {{ scope.row.value }}</span>
                       </span>
                       <span v-if="scope.row.range_type == 1">
-                        <span v-if="scope.row.value < parseFloat(scope.row.range_min) ">
+                        <span v-if="parseFloat(scope.row.value) < parseFloat(getrange(scope.row.range_min)) ">
                           {{ scope.row.value }} <span style="color: blue;" v-if="scope.row.value>0">↓</span>
                         </span>
-                        <span v-if="parseFloat(scope.row.range_min)<= parseFloat( scope.row.value) && parseFloat(scope.row.value)<= parseFloat(scope.row.range_max) ">
+                        <span v-if="parseFloat(getrange(scope.row.range_min))<= parseFloat( scope.row.value) && parseFloat(scope.row.value)<= parseFloat(getrange(scope.row.range_max)) ">
                           {{ scope.row.value }}
                         </span>
-                        <span v-if="parseFloat(scope.row.value) >parseFloat(scope.row.range_max) ">
+                        <span v-if="parseFloat(scope.row.value) >parseFloat(getrange(scope.row.range_max)) ">
                           {{ scope.row.value }} <span style="color: red;" v-if="scope.row.value>0">↑</span>
                         </span>
                         <span v-if ="scope.row.range_max ==''||scope.row.range_min ==''">
@@ -311,7 +311,7 @@
     </el-dialog>
 
 
-
+<!-- 新增 -->
     <el-dialog
       :title="formTitle"
       :visible.sync="dialogFormVisible"
@@ -693,6 +693,7 @@ export default {
             date: this.itemDate,
             project_id: this.project.project_id
           }
+          console.log('params',params);
           DeletePatientInspection(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -843,7 +844,7 @@ export default {
           }
 
         }
-        console.log(this.form.formItem)
+        console.log('11111',this.form.formItem)
         this.dialogFormVisible = true
 
       }
@@ -897,6 +898,8 @@ export default {
 
     },
     openNew() {
+      console.log('this.project',this.project);
+
       if (this.project == null) {
         this.$message.error('请先选择项目')
         return false
@@ -916,10 +919,10 @@ export default {
       for (var index in this.project.inspection_reference) {
         var item_id =0
         if(this.project.inspection_reference[index].item_id == 0){
-            item_id =  parseInt(this.project.inspection_reference[index].id) 
+            item_id =  parseInt(this.project.inspection_reference[index].id)
         }
         if(this.project.inspection_reference[index].item_id > 0){
-          item_id = parseInt(this.project.inspection_reference[index].item_id) 
+          item_id = parseInt(this.project.inspection_reference[index].item_id)
         }
         this.form.formItem.push({
           id: 0,
@@ -1031,7 +1034,7 @@ export default {
 
           console.log("this.form",this.form)
 
-         
+
           CreatePatientInspection(
             this.patientID,
             this.form,
@@ -1327,7 +1330,7 @@ export default {
             }
 
             this.inspections = response.data.data.inspections
-            console.log("this.inpections",this.inspections)
+            console.log("this.inpections",response.data.data)
             if (inspections == null) {
               this.inspections = []
               return false
@@ -1354,38 +1357,37 @@ export default {
 
               console.log("item=-----------------12",inspectionsMap[items[index].id],inspectionsMap[parseInt(items[index].item_id)])
               if (item.item_id > 0) {
-                console.log('执行0',inspectionsMap[items[index].id]);
 
                 if (typeof(inspectionsMap[parseInt(items[index].item_id)])  == "undefined") {
                   if(this.org_id == 10121 || this.org_id ==10138 || this.org_id ==10278){
                     item.value = inspectionsMap[items[index].id].inspect_value
                     item.item_name = inspectionsMap[items[index].id].item_name
                   }else{
-                    console.log('执行3',inspectionsMap,item);
+                    console.log('执行1');
+                    
                     if(this.org_id == 10702 || this.org_id == 0){
-                      if(item.project_name == '血常规'|| item.project_name == '透后肾功能' || 
-                          item.project_name == '肝功能' || item.project_name == '电解质' || item.project_name == '透前肾功能'
+                      if(item.project_name == '血常规'|| item.project_name == '透后肾功能' ||
+                          item.project_name == '肝功能' || item.project_name == '电解质' || item.project_name == '透前肾功能' ||
+                          item.project_name == '传染病检查'
                         ){
-                        console.log('11111',inspectionsMap[items[index].id].inspect_value);
+
                         item.value = inspectionsMap[items[index].id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
                         item.item_name = inspectionsMap[items[index].id].item_name
                       }else{
-                        
                         item.value = ''
                         item.item_name = ''
                       }
                     } else{
+                      console.log('执行2');
                       item.value = ''
                       item.item_name = ''
                     }
                   }
                 } else {
-                  console.log('执行1',inspectionsMap);
+                  console.log('执行3',inspectionsMap[items[index].item_id].inspect_value);
                   item.value = inspectionsMap[items[index].item_id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
                   item.item_name = inspectionsMap[items[index].item_id].item_name
                 }
-               
-
                 if(this.org_id ==10191){
                   if(item.project_name == "乙肝定性（五项)"){
                     console.log("金阿迪发到付阿打发")
@@ -1397,7 +1399,7 @@ export default {
                 if(typeof(inspectionsMap[parseInt(items[index].id)])  == "undefined"){
                   continue
                 }
-                console.log('执行2',inspectionsMap);
+                console.log('执行4',inspectionsMap);
                 item.value = inspectionsMap[items[index].id].inspect_value
                 item.item_name = inspectionsMap[items[index].id].item_name
               }
@@ -1405,6 +1407,7 @@ export default {
               // item["inspect_type"] = inspectionsMap[items[index].id].inspect_type
               item.value_direction = ''
               if (item.range_type == 1) {
+                console.log('执行5',parseFloat(item.value));
                 var value = parseFloat(item.value)
                 var range_min = parseFloat(item.range_min)
                 var range_max = parseFloat(item.range_max)
@@ -1432,7 +1435,6 @@ export default {
                 this.isPic = false
               }
 
-
               console.log("woowwoow",this.isPic)
               console.log("isPicwowowow",this.items)
             }
@@ -1443,7 +1445,15 @@ export default {
       setTimeout(() => {
         this.itemLoading = false
       }, 1000)
-    }
+    },
+    getrange(val){
+      if(val !=''){
+        return (val.replace(/[^\d.]/g, ''))*1;
+      }else{
+        return ''
+      }
+
+    },
   },
   created() {
     const id = this.$route.query && this.$route.query.id

src/xt_pages/user/inspection_new.vue

@@ -657,10 +657,11 @@ export default {
             })
           }else{
             this.form.formItem.push({
-              id: this.list[index].id,
+              // id: this.list[index].item_id,
+              id: this.getid(this.list[index].item_id,row.inspect_date),
               project_id: this.list[index].project_id,
               project_name: this.list[index].project_name,
-              item_id: this.list[index].item_id,
+              item_id: (this.list[index].item_id)*1,
               item_name: this.list[index].item_name,
               range_type: this.list[index].range_type,
               value: this.getvalue(this.list[index].item_id,row.inspect_date) ,
@@ -738,7 +739,6 @@ export default {
           for (var index in this.form.formItem) {
             this.form.formItem[index].value = '' + this.form.formItem[index].value
           }
-
           EditPatientInspection(this.patientID, this.form, this.form.remind_cycle, this.form.inspect_date, this.form.project_id).then(response => {
             if (response.data.state == 1) {
               this.$notify({
@@ -747,8 +747,8 @@ export default {
                 type: 'success',
                 duration: 2000
               })
-              this.patient_info.remind_cycle =
-                response.data.data.remind_cycle
+              // this.patient_info.remind_cycle =
+              //   response.data.data.remind_cycle
               this.itemDate = this.form.inspect_date
               this.items = []
               var inspections = response.data.data.inspections
@@ -788,20 +788,23 @@ export default {
                   this.items.push(item)
                 }
               }
-
-              this.resetForm(formName)
-              this.dialogFormVisible = false
+              this.getchildlist(this.form.project_id)
+              // this.resetForm(formName)
+              
             } else {
               this.$message.error(response.data.msg)
+              // this.dialogFormVisible = false
               return false
             }
           })
-            .catch(v => {
-              this.$message.error(v)
-              return false
-            })
+            // .catch(v => {
+            //   this.$message.error(v)
+            //   return false
+            // })
           this.formLoading = false
-          return false
+          this.dialogFormVisible = false
+          
+          // return false
         } else {
           return false
         }
@@ -817,9 +820,6 @@ export default {
           }
           for (var index in this.form.formItem) {this.form.formItem[index].value ='' + this.form.formItem[index].value}
 
-          console.log("this.form",this.form)
-
-
           CreatePatientInspection(
             this.patientID,
             this.form,
@@ -833,9 +833,9 @@ export default {
                   duration: 2000
                 })
                 // this.form.remind_reycle = response.data.data.remind_reycc
-                this.patient_info.remind_cycle =
-                  response.data.data.remind_cycle
-                console.log(this.patient_info.remind_cycle)
+                // this.patient_info.remind_cycle =
+                //   response.data.data.remind_cycle
+                // console.log('this.patient_info.remind_cycle',this.patient_info.remind_cycle)
 
                 this.itemDate = this.form.inspect_date
                 this.items = []
@@ -883,25 +883,26 @@ export default {
                   }
                 }
 
-                this.resetForm(formName)
+                // this.resetForm(formName)
                 this.dialogFormVisible = false
 
                 this.queryParams.patient = this.patientID
                 this.queryParams.project_id = this.project.project_id
                 this.queryParams.page = 1
                 this.total = 0
-                this.fetchPatientInspections(this.queryParams)
+                this.getchildlist(this.project.project_id)
               } else {
                 this.$message.error(response.data.msg)
                 return false
               }
             })
-            .catch(v => {
-              this.$message.error(v)
-              return false
-            })
-          this.formLoading = false
-          return false
+            // .catch(v => {
+            //   this.$message.error(v)
+            //   return false
+            // })
+            // this.dialogFormVisible = false
+            this.formLoading = false
+          // return false
         } else {
           return false
         }
@@ -948,6 +949,8 @@ export default {
     //   this.$refs.singleTable.setCurrentRow(row)
     // },
     resetForm(formName) {
+      console.log('44444',formName);
+      
       this.$refs[formName].resetFields()
     },
     handleCurrentChange(row) {
@@ -1159,19 +1162,35 @@ export default {
 
     },
     getvalue(val,time){
-      console.log();
+      // console.log('val',this.items,val);
       const options = this.items
       for(let i in options){
         if( options[i].inspect_date == time){
           for(let j in options[i].Child){
             if(options[i].Child[j].item_id == val){
-              console.log('options[i].inspect_value',options[i].inspect_value);
+              // console.log('options[i].inspect_value',options[i].inspect_value);
               return options[i].Child[j].inspect_value
             }
 
           }
         }
 
+      }
+    },
+    getid(val,time){
+      // console.log('val',this.items,val);
+      const options = this.items
+      for(let i in options){
+        if( options[i].inspect_date == time){
+          for(let j in options[i].Child){
+            if(options[i].Child[j].item_id == val){
+              // console.log('options[i].inspect_value',options[i].inspect_value);
+              return options[i].Child[j].id
+            }
+
+          }
+        }
+
       }
     }
   },