完善统计

1 year ago · 0bd7ef2349
parent 5904c3cba3
commit 0bd7ef2349
8 changed files with 46 additions and 34 deletions
--- a/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php
@ -209,6 +209,7 @@ class HealthCheckupController extends Controller
            ->get();
        return \Yz::Return(true,'查询成功',['list'=>$list,'dateRange'=>[$searchInfo['start'],$searchInfo['end']]]);
    }
+
    //删除体检记录
    public function DelCheckUpInfo()
    {
@ -233,4 +234,5 @@ class HealthCheckupController extends Controller
        }

    }
+
 }
--- a/Laravel/app/Services/Admin/YeWu/AppointmentService.php
+++ b/Laravel/app/Services/Admin/YeWu/AppointmentService.php
@ -34,8 +34,8 @@ class AppointmentService

        if($arr['searchInfo']['dateRange']){

-            $sql=$sql . ' and a.date>=? and a.date<=? ';
-            array_push($canshu,$arr['searchInfo']['dateRange'][0],$arr['searchInfo']['dateRange'][1]);
+            $sql=$sql . ' and a.created_at>=? and a.created_at<=? ';
+            array_push($canshu,$arr['searchInfo']['dateRange'][0].' 00:00:00',$arr['searchInfo']['dateRange'][1].' 23:59:59');
        }


@ -45,9 +45,9 @@ class AppointmentService
            array_push($canshu, $cha[0]->sn);
        }else{
            if($arr['searchInfo']['orgId']){
-
-                $sql=$sql .' and  a.org_id=?';
-                array_push($canshu, $arr['searchInfo']['orgId']);
+                $cha=DB::table('medical_institution')->where(['id'=>$arr['searchInfo']['orgId']])->get();
+                $sql=$sql .' and  a.org_code=?';
+                array_push($canshu, $cha[0]->sn);
            }

        }
--- a/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php
+++ b/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php
@ -169,8 +169,8 @@ class HealthCheckupService

        if($arr['searchInfo']['dateRange']){

-            $sql=$sql . ' and a.tijian_time>=? and a.tijian_time<=? ';
-            array_push($canshu,$arr['searchInfo']['dateRange'][0],$arr['searchInfo']['dateRange'][1]);
+            $sql=$sql . ' and a.created_at>=? and a.created_at<=? ';
+            array_push($canshu,$arr['searchInfo']['dateRange'][0].' 00:00:00',$arr['searchInfo']['dateRange'][1].' 23:59:59');
        }


--- a/el-admin/.env.production
+++ b/el-admin/.env.production
@ -1,6 +1,6 @@
 ENV = 'production'
 VITE_APP_API_6666 = 'http://192.168.50.123:33583/common/la/public/api/'
-VITE_APP_FILE_5555 = 'http://192.168.50.123:33583/common/la/public'
+VITE_APP_FILE_6666 = 'http://192.168.50.123:33583/common/la/public'

 VITE_APP_API = 'http://172.31.68.39:33583/common/la/public/api/'
 VITE_APP_FILE = 'http://172.31.68.39:33583/common/la/public'
--- a/el-admin/src/router/index.js
+++ b/el-admin/src/router/index.js
@ -95,7 +95,7 @@ const router = createRouter({
 				path: '/report/healthcard',
 				name: 'ReportHealthCard',
 				component: () => import('../views/Report/HealthCard.vue'),
-				meta: { title: '健康证统计' }
+				meta: { title: '体检统计' }
 			},{
 				path: '/systemMngr/Configs',
 				name: 'SystemConfigs',
--- a/el-admin/src/views/AppointmentMngr/AppointmentList.vue
+++ b/el-admin/src/views/AppointmentMngr/AppointmentList.vue
@ -4,7 +4,7 @@
 			<el-row>
 				<el-form-item>
 					<el-tag class="ml-2" type="success" style="margin-right: 20px;">机构名称</el-tag>
-					<el-select filterable v-model="searchInfo.orgId" placeholder="请选择体检机构">
+					<el-select filterable v-model="searchInfo.orgId" placeholder="请选择体检机构" clearable>
 						<el-option v-for="(item, index) in org_list" :key="index" :label="item.org_name" :value="item.id" />
 					</el-select>
 				</el-form-item>
--- a/el-admin/src/views/MedicalCenter/HealthCheckList.vue
+++ b/el-admin/src/views/MedicalCenter/HealthCheckList.vue
@ -4,7 +4,7 @@
 			<el-row>
 				<el-form-item>
 					<el-tag class="ml-2" type="success" style="margin-right: 20px;">机构名称</el-tag>
-					<el-select filterable v-model="searchInfo.orgId" placeholder="请选择体检机构">
+					<el-select filterable v-model="searchInfo.orgId" placeholder="请选择体检机构" clearable>
 						<el-option v-for="(item, index) in org_list" :key="index" :label="item.org_name" :value="item.id" />
 					</el-select>
 				</el-form-item>
@ -36,7 +36,7 @@
 				 <el-tag v-if="scope.row.type==2"  class="ml-2" type="warning">老年人</el-tag>
 			</template>
 			</el-table-column>
-			<el-table-column prop="tijian_time" label="体检时间" />
+			<el-table-column prop="created_at" label="创建时间" />
 			<el-table-column label="报告" width="100">
 				<template #default="scope">
 					 <span v-if="scope.row.report_file">
--- a/el-admin/src/views/Report/HealthCard.vue
+++ b/el-admin/src/views/Report/HealthCard.vue
@ -1,30 +1,37 @@
 <template>
 	<div>
 		<div class="head">
-			<el-row> 
+			<el-row>
+				<el-form-item>
+					<el-select filterable clearable v-model="searchInfo.checkType" placeholder="登记类型">
+						<el-option label="健康证" value="1" />
+						<el-option label="老年人" value="2" />
+					</el-select>
+				</el-form-item>
 				<el-form-item style="margin-left: 8px;" v-if="org_list.length>0">
 					<el-select filterable clearable v-model="searchInfo.org_id" placeholder="请选择体检机构">
-						<el-option v-for="(item, index) in org_list" :key="index" :label="item.org_name" :value="item.id" />
+						<el-option v-for="(item, index) in org_list" :key="index" :label="item.org_name"
+							:value="item.id" />
 					</el-select>
 				</el-form-item>
 				<el-form-item style="margin-left: 8px;">
-					 
-						<el-date-picker v-model="searchInfo.dateRange" value-format="YYYY-MM-DD" type="daterange"
-							range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
-					 
+
+					<el-date-picker v-model="searchInfo.dateRange" value-format="YYYY-MM-DD" type="daterange"
+						range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
+
 				</el-form-item>
-			  
-				<el-form-item> 
+
+				<el-form-item>
 					<el-button type="primary" style="margin-left: 20px;" @click="GetInfo">搜索</el-button>
 				</el-form-item>
 			</el-row>
 		</div>
-		<el-table  :data="tableData" style="width: 100%;" row-key="id" show-summary v-loading="loading">
-			<el-table-column prop="org_name" label="体检机构"   />
+		<el-table :data="tableData" style="width: 100%;" row-key="id" show-summary v-loading="loading">
+			<el-table-column prop="org_name" label="体检机构" />
 			<el-table-column prop="sn" label="Code" />
 			<el-table-column prop="count" label="数量" />
 		</el-table>
-		 
+
 	</div>
 </template>

@ -37,26 +44,29 @@
 		ElMessage
 	} from 'element-plus'
 	import {
-		CheckUpCount,GetHealthOrganizationEnableList
+		CheckUpCount,
+		GetHealthOrganizationEnableList
 	} from '@/api/api.js'
 	let loading = ref(false)
 	let searchInfo = ref({
-		checkType:"1",
+		checkType: null,
 		dateRange: [],
 		org_id: '',
 	})
 	let tableData = ref([])
-	const GetInfo=()=>{
-		loading.value=true
-		CheckUpCount({searchInfo:searchInfo.value}).then(res => {
-			loading.value=false
+	const GetInfo = () => {
+		loading.value = true
+		CheckUpCount({
+			searchInfo: searchInfo.value
+		}).then(res => {
+			loading.value = false
 			if (res.status) {
-				  tableData.value = res.data.list
-				  searchInfo.value.dateRange=res.data.dateRange
+				tableData.value = res.data.list
+				searchInfo.value.dateRange = res.data.dateRange
 			} else {
 				ElMessage.error(res.msg)
 			}
-			
+
 		})
 	}
 	let org_list = ref('') //机构列表
@ -70,12 +80,12 @@
 			} else {
 				ElMessage.error(res.msg)
 			}
-	
+
 		})
 	}
 	onMounted(() => {
 		getHealthOrganizationEnableList()
-		 GetInfo()
+		GetInfo()
 	})
 </script>