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

src/api/inspection.js

   })
 }
 
-
 export function CreatePatientPICInspection(id, data) {
   return request({
     url: '/api/patient/pic_inspection/create?patient=' + id,
   })
 }
 
-
 export function setRemind(params) {
   return request({
     url: '/api/patient/inspection_remind/set',
   })
 }
 
-
-
 export function getNewInspectionList(params){
- 
+
   return request({
     url:"/api/getnewinspectionList",
     method:"get",
   })
 }
 
-
 export function EditPatientNewInspection(data){
- 
+
   return request({
     url:"/api/editpatientnewinspection",
     method:"post",
   })
 }
 
+// 新的检验检查接口
+export function getinspecitonbypatientgroup(params){
+  return request({//?patient_id=
+    url:'/api/getinspecitonbypatientgroup',
+    method:"Get",
+    params:params,
+  })
+}
 
+// 新的检验检查接口
+export function getinspectionchildlist(params){
+  return request({
+    url:'/api/getinspectionchildlist',
+    method:"Get",
+    params:params,
+  })
+}
 
 
 

src/xt_pages/user/components/PatientSidebar.vue

         console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhhh")
        this.$router.push({path:'/patient/patient/'+this.id+'/deathSummary'})
       }
-
     },
     changePatient(value) {
       console.log(value)

src/xt_pages/user/inspection_new.vue

             >新增
             </el-button
             >
-            <el-button
+            <!-- <el-button
               size="small"
               class="filter-item"
               type="primary"
               :disabled="itemDate ? false : true"
             >删除
             </el-button
-            >
+            > -->
           </div>
           <div class="filter-container">
             <el-button class="filter-item" type="text" style="color:#000"
               ></el-button
             >
           </div>
-          <div v-if="!isPic">
+          <div>
             <el-table
               stripe
               :header-cell-style="{
               style="width: 100%"
               id="user-inspection-order"
               ref="inspect_table"
-            > 
+            >
               <el-table-column
                 fixed
                 prop="inspect_date"
                   {{ getTime(scope.row.inspect_date) }}
                 </template>
               </el-table-column>
-              
+
               <el-table-column v-for="(item,index) in list" :key="index"
                 :prop="item.item_id"
                 :label="item.item_name" align="center"
                 min-width="130"
-              > 
+              >
                 <template slot-scope="scope">
                   <span v-if="item.range_type == 3">
-                    {{ getItemValueOne(scope.row.inspect_date,item.item_name) }}
+                    {{ getItemValue(scope.row.inspect_date,item.item_name) }}
                   </span>
 
                   <span v-if="item.range_type == 2">
                     <span v-if="parseFloat(getItemValue(scope.row.inspect_date,item.item_name)) < parseFloat(getrange(item.range_min)) ">
                       {{ getItemValue(scope.row.inspect_date,item.item_name) }} <span style="color: blue;" v-if="getItemValue(scope.row.inspect_date,item.item_name)>0">↓</span>
                     </span>
-                    <span v-if="parseFloat(getrange(item.range_min))<= parseFloat( getItemValue(scope.row.inspect_date,item.item_name)) && 
+                    <span v-if="parseFloat(getrange(item.range_min))<= parseFloat( getItemValue(scope.row.inspect_date,item.item_name)) &&
                           parseFloat(getItemValue(scope.row.inspect_date,item.item_name))<= parseFloat(getrange(item.range_max)) ">
                       {{ getItemValue(scope.row.inspect_date,item.item_name) }}
                     </span>
                   </span>
                 </template>
               </el-table-column>
+              <el-table-column
+                fixed="right"
+                prop="inspect_date"
+                label="操作"
+                align="center" width="150" >
+                <template slot-scope="scope">
+                  <el-button size="small" type="primary" @click="openEdit(scope.row)">修改</el-button>
+                  <el-button size="small" type="danger" @click="deleteInspection(scope.row)">删除</el-button>
+                </template>
+              </el-table-column>
             </el-table>
           </div>
- 
+
           <!-- <el-pagination
             align="right"
             @current-change="handleCurrentChangePage"
       </div>
     </el-dialog>
 
+    <!-- 新增修改 -->
     <el-dialog
       :title="formTitle"
       :visible.sync="dialogFormVisible"
 <script>
 import PatientSidebar from './components/PatientSidebar'
 import { getToken } from '@/api/qiniu'
-
+import moment from "moment"
 import {
   CreatePatientInspection,
   CreatePatientPICInspection,
           return false
         }
         console.log('response.data.data11',response.data.data);
-        
+
       })
     },
     getchildlist(project){
           // inspection.forEach(item => {
           //   referenceList.forEach(ite => {
           //     item.Child.forEach(it =>{
-                
           //       if(ite.item_id == it.item_id){
-          //         it.range_type = ite.range_type
-          //         it.range_max = ite.range_max
-          //         it.range_min = ite.range_min
+          //         ite.inspect_value = it.inspect_value
           //       }
 
           //       // if()
           this.list = referenceList
           this.$nextTick(() => {
             this.$refs.inspect_table.doLayout();
-
             // table加ref="multipleTable"
           });
         }
         console.log('response.data.data22',response.data.data);
       })
     },
-    
+
     changeInput(item) {
 
       if (item.item_name == '血清铁' || item.item_name == '总铁结合力') {
         })
       }
     },
-    deleteInspection() {
+    deleteInspection(row) {
+      this.project =row
+      this.itemDate = this.getTime(row.inspect_date)
+      console.log('itemDate',this.itemDate);
+
       if (this.project == null || this.itemDate == '') {
         this.$message.error('请先选择删除删除的记录')
         return false
             date: this.itemDate,
             project_id: this.project.project_id
           }
+          console.log('params');
+
           DeletePatientInspection(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
                 duration: 2000
               })
 
-              for (var index in this.projects) {
-                if (this.projects[index].project_id == params.project_id) {
-                  this.projects[index].count--
-                  break
-                }
-              }
-              this.total -= 1
+              // for (var index in this.projects) {
+              //   if (this.projects[index].project_id == params.project_id) {
+              //     this.projects[index].count--
+              //     break
+              //   }
+              // }
+              // this.total -= 1
               this.itemDate = ''
               this.items = []
               if (this.total > 0) {
                 this.queryParams.page = 1
-                this.fetchPatientInspections(this.queryParams)
+                this.getchildlist(this.project.project_id)
               }
             }
           })
           this.dialogRemindFormVisible = false
         }
       })
-    }, 
-    openEdit() {
-
-      if (this.project == null) {
-        this.$message.error('请先选择项目')
-        return false
-      }
+    },
+    openEdit(row) {
+      console.log('row111',uParseTime(row.inspect_date, '{y}-{m}-{d} {h}:{i}'));
+      this.itemDate =''
+      this.itemDate = this.getTime(row.inspect_date)
+      this.project =row
       if(this.isPic){
         this.form.pic_method = 'edit'
         this.formTitle = '修改' + this.project.project_name
         this.form.project_id = this.project.project_id
-        this.form.inspect_date = this.itemDate
-        this.form.old_inspect_date = this.itemDate
+        this.form.inspect_date = this.project.inspect_date
+        this.form.old_inspect_date = this.project.inspect_date
         this.form.imgs = []
         this.form.delete_imgs = []
         for(var index in this.inspections){
         console.log(this.form.imgs)
         this.dialogPicFormVisible = true
       }else{
-        console.log("22222")
+        console.log("22222",this.itemDate)
         this.form.method = 'edit'
         this.formTitle = '修改' + this.project.project_name
         this.form.project_id = this.project.project_id
         this.form.inspect_date = this.itemDate
         this.form.old_inspect_date = this.itemDate
+        // this.form.inspect_date = this.project.inspect_date
+        // this.form.old_inspect_date = this.project.inspect_date
         if(this.form.project_id == 14) {
           this.form.remind_cycle = this.patient_info.remind_cycle
         }else{
         }
         console.log(this.form.remind_cycle)
 
-
         this.form.formItem = []
-        console.log("hhhhhhhhhhhhh",this.project.inspection_reference)
-        console.log("inspectionsMap",this.inspectionsMap)
-        for (var index in this.project.inspection_reference) {
+        console.log("hhhhhhhhhhhhh",this.list)
+        console.log("inspectionsMap",row)
+        for (var index in this.list) {
           if(this.org_id ==10138){
             this.form.formItem.push({
-              id: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].id : 0,
-              project_id: this.project.inspection_reference[index].project_id,
-              project_name: this.project.inspection_reference[index].project_name,
-              item_id: this.project.inspection_reference[index].id,
-              item: this.project.inspection_reference[index].item,
-              item_name: this.project.inspection_reference[index].item_name,
-              range_type: this.project.inspection_reference[index].range_type,
-              value: this.project.inspection_reference[index].item_id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].item_id].inspect_value : '',
-              select_options: this.project.inspection_reference[index].range_options.split(','),
-              unit: this.project.inspection_reference[index].unit,
-              item_id:parseInt(this.project.inspection_reference[index].item_id) ,
+              id: this.list[index].id,
+              project_id: this.list[index].project_id,
+              project_name: this.list[index].project_name,
+              item_id: this.list[index].item_id,
+              item: this.list[index].item,
+              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),
+              select_options: this.list[index].range_options.split(','),
+              unit: this.list[index].unit,
+              item_id:parseInt(this.list[index].item_id) ,
             })
           }else{
             this.form.formItem.push({
-            id: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].id : 0,
-            project_id: this.project.inspection_reference[index].project_id,
-            project_name: this.project.inspection_reference[index].project_name,
-            item_id: this.project.inspection_reference[index].id,
-            item: this.project.inspection_reference[index].item,
-            item_name: this.project.inspection_reference[index].item_name,
-            range_type: this.project.inspection_reference[index].range_type,
-            value: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].inspect_value : '',
-            select_options: this.project.inspection_reference[index].range_options.split(','),
-            unit: this.project.inspection_reference[index].unit
-          })
+              id: this.list[index].id,
+              project_id: this.list[index].project_id,
+              project_name: this.list[index].project_name,
+              item_id: this.list[index].item_id,
+              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) ,
+              select_options: this.list[index].range_options.split(','),
+              unit: this.list[index].unit
+            })
           }
 
         }
-        console.log(this.form.formItem)
+        console.log('11111',this.form.formItem)
         this.dialogFormVisible = true
       }
 
     setRemind(){
       this.dialogRemindFormVisible = true
     },
- 
+
     openNew() {
+      console.log('this.project',this.project);
       if (this.project == null) {
         this.$message.error('请先选择项目')
         return false
       }
+
       this.form.method = 'add'
       this.formTitle = '新增' + this.project.project_name
       this.form.project_id = this.project.project_id
       }
       // this.form.remind_cycle = this.patient_info.remind_cycle
       var today = new Date()
-      this.form.inspect_date = uParseTime(today, '{y}-{m}-{d} {h}:{i}')
+      this.form.inspect_date = this.getTime(today)
       this.form.formItem = []
 
-      console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhh",this.project.inspection_reference)
-      for (var index in this.project.inspection_reference) {
+      console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhh",this.list)
+      for (var index in this.list) {
         var item_id =0
-        if(this.project.inspection_reference[index].item_id == 0){
-            item_id =  parseInt(this.project.inspection_reference[index].id) 
+        if(this.list[index].item_id == 0){
+            item_id =  parseInt(this.list[index].id)
         }
-        if(this.project.inspection_reference[index].item_id > 0){
-          item_id = parseInt(this.project.inspection_reference[index].item_id) 
+        if(this.list[index].item_id > 0){
+          item_id = parseInt(this.list[index].item_id)
         }
         this.form.formItem.push({
           id: 0,
-          project_id: this.project.inspection_reference[index].project_id,
-          project_name: this.project.inspection_reference[index].project_name,
+          project_id: this.list[index].project_id,
+          project_name: this.list[index].project_name,
           item_id:item_id,
-          item: this.project.inspection_reference[index].item,
-          item_name: this.project.inspection_reference[index].item_name,
-          range_type: this.project.inspection_reference[index].range_type,
+          item: this.list[index].item,
+          item_name: this.list[index].item_name,
+          range_type: this.list[index].range_type,
           value: '',
-          select_options: this.project.inspection_reference[
+          select_options: this.list[
             index
             ].range_options.split(','),
-          unit: this.project.inspection_reference[index].unit
+          unit: this.list[index].unit
         })
       }
       console.log('form.formItem', this.form.formItem)
 
           console.log("this.form",this.form)
 
-         
+
           CreatePatientInspection(
             this.patientID,
             this.form,
         }
       })
     },
- 
+
     deletePic(item,index){
       if(item.id == 0){
         this.form.imgs.splice(index,1)
             this.patient_info = patient_info
             this.pageLoading = false
             console.log('11111',response.data.data);
-            
+
             // this.form.remind_cycle = this.patient_info.remind_cycle
           } else {
             this.$message.error(response.data.msg)
     //               }else{
     //                 console.log('执行3',inspectionsMap,item);
     //                 if(this.org_id == 10702 || this.org_id == 0){
-    //                   if(item.project_name == '血常规'|| item.project_name == '透后肾功能' || 
+    //                   if(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 = ''
     //                   }
     //               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 == "乙肝定性（五项)"){
     //   }, 1000)
     // },
     getTime(val) {
-        if(val < 0){
-          return ""
-        }
-        if(val == ""){
+      if(val < 0){
         return ""
-        }else {
-        return uParseTime(val, '{y}-{m}-{d}')
-        }
+      }
+      if(val == ""){
+      return ""
+      }else {
+        return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
+      }
     },
     getItemValue(inspect_date,item_name){
       var inspect_value = ""
       }else{
         return ''
       }
-      
+
+    },
+    getvalue(val,time){
+      console.log();
+      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].inspect_value
+            }
+
+          }
+        }
+
+      }
     }
   },
   created() {
     // this.fetchInspectionReference()
   },
   mounted(){
-    
+
   }
 }
 </script>