zhangyan
/
QHD_ZhongYiYuan_YiJiYuYue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. 管理员增加HIS执行诊室是否为空的筛选项

Browse Source 
2. 给执行诊室绑定检查项目时，也需要增加看到全部本身以及子诊室的相关联的检查项目
main
鹿和sa0ChunLuyu 3 weeks ago
parent 44c6aac177
commit ee0e6febef
4 changed files with 98 additions and 32 deletions
Show Stats Download Patch File Download Diff File

3
Laravel/app/Http/Controllers/API/Admin/YeWu/DevicesController.php
Unescape Escape View File

@ -20,8 +20,9 @@ public function GetList()
//获取启用的设备列表
public function GetEnableList()
{
$hisExecDepts = request('hisExecDepts');
$service = new DevicesService();
return $service->GetEnableList();
return $service->GetEnableList($hisExecDepts);
}
public function Save(Request $request)

10
Laravel/app/Services/Admin/YeWu/CheckItemService.php
Unescape Escape View File

@ -45,6 +45,16 @@ public function GetItemList($searchInfo,$page,$pageSize){
});
}
}
//执行科室筛选
if (isset($searchInfo['hisExecDepts']) && $searchInfo['hisExecDepts'] !== '') {
if ($searchInfo['hisExecDepts'] == 1) {
$list->whereNotNull('hisExecDepts')->where('hisExecDepts', '!=', '');
} elseif ($searchInfo['hisExecDepts'] == 0) {
$list->where(function($q) {
$q->whereNull('hisExecDepts')->orWhere('hisExecDepts', '');
});
}
}
$count = $list->count();
$list= $list
->leftJoin('s_appointment_type', 's_check_item.reservation_method', '=', 's_appointment_type.id')

40
Laravel/app/Services/Admin/YeWu/DevicesService.php
Unescape Escape View File

@ -17,9 +17,43 @@ public function GetList($searchInfo,$page,$pageSize){
return \Yz::Return(true, '查询成功', ['list'=>$list,'count'=>$count]);
}
//获取启用的设备列表
public function GetEnableList(){
$list=DB::table('s_devices')->where(['is_del'=>0,'status'=>1])->get();
return \Yz::Return(true, '查询成功', $list);
public function GetEnableList($hisExecDepts = null){
$list=DB::table('s_devices')->where(['is_del'=>0,'status'=>1]);
if (!empty($hisExecDepts)) {
$deptCodes = json_decode($hisExecDepts, true);
if (!empty($deptCodes) && is_array($deptCodes)) {
//找到对应科室
$deptIds = DB::table('s_department')
->whereIn('department_number', $deptCodes)
->where('is_del', 0)
->pluck('id')
->toArray();
//找到这些科室的父级科室IDs
$parentIds = DB::table('s_department')
->whereIn('id', function($q) use ($deptIds) {
$q->select('pid')->from('s_department')
->whereIn('id', $deptIds)
->where('pid', '>', 0);
})
->where('is_del', 0)
->pluck('id')
->toArray();
$allDeptIds = array_merge($deptIds, $parentIds);
//找到这些科室下的设备
$deviceIds = DB::table('s_department_resources_device')
->whereIn('department_id', $allDeptIds)
->pluck('device_id')
->toArray();
$list->whereIn('id', $deviceIds);
}
}
return \Yz::Return(true, '查询成功', $list->get());
}
public function Save($data,$userid){
if(empty($data['id'])){

77
YiJi-admin/src/views/YeWu/CheckItemConfig.vue
Unescape Escape View File

@ -16,10 +16,16 @@
:value="item.id" />
</el-select>
<el-select clearable v-model="searchInfo.deviceBind" placeholder="关联检查室" style="margin-left: 10px;">
<el-select clearable v-model="searchInfo.deviceBind" placeholder="关联排班" style="margin-left: 10px;">
<el-option label="全部" value="" />
<el-option label="已关联检查室" :value="1" />
<el-option label="未关联检查室" :value="0" />
<el-option label="已关联排班" :value="1" />
<el-option label="未关联排班" :value="0" />
</el-select>
<el-select clearable v-model="searchInfo.hisExecDepts" placeholder="执行科室" style="margin-left: 10px;">
<el-option label="全部" value="" />
<el-option label="有执行科室" value="1" />
<el-option label="无执行科室" value="0" />
</el-select>
<el-input v-model="searchInfo.name" placeholder="请输入项目编号/名称" style="margin-left: 10px;" />
@ -27,7 +33,7 @@
<el-button type="primary" @click="GetItemList()" style="margin-left: 10px;">查询</el-button>
<el-button type="warning" @click="GetHisItemClass()" style="margin-left: 10px; margin-left: 40px;">同步分类</el-button>
<el-button type="warning" @click="GetHisCheckItem()" style="margin-left: 10px;">同步检查项目</el-button>
<el-button type="primary" @click="BatchLinkDevice()" style="margin-left: 10px;">批量关联检查室</el-button>
<el-button type="primary" @click="BatchLinkDevice()" style="margin-left: 10px;">批量关联排班</el-button>
</el-row>
</div>
<el-table ref="checkItemTableRef" :data="tableData" style="width: 100%; margin-top: 10px;" row-key="id" @sort-change="onSortChange" @selection-change="onSelectionChange">
@ -44,7 +50,7 @@
<el-table-column prop="check_notice" label="检查须知" />
<el-table-column prop="check_time" label="检查时间" width="100" />
<el-table-column prop="check_begin_time" label="开始预约时间" width="120" />
<el-table-column prop="devicesInfo" label="关联检查室">
<el-table-column prop="devicesInfo" label="关联排班">
<template #default="scope">
<span v-for="(item,index) in scope.row.devicesInfo " :key="index">
<el-tag v-if="item.status==1 && item.is_del==0" class="ml-2"
@ -54,9 +60,9 @@
</span>
</template>
</el-table-column>
<el-table-column prop="" label="医嘱关联检查室" width="150">
<el-table-column prop="" label="医嘱关联排班" width="150">
<template #default="scope">
<el-button size="small" @click="LinkDeviceClick(scope.row)">关联检查室</el-button>
<el-button size="small" @click="LinkDeviceClick(scope.row)">关联排班</el-button>
</template>
</el-table-column>
<el-table-column prop="" label="操作" width="220">
@ -75,7 +81,7 @@
<el-dialog v-model="DevicedialogVisible" :title="linkDialogTitle" width="40%">
<div class="chuansuokuang">
<el-transfer v-model="selectedDevice" :titles="['可选检查室', '已关联检查室']"
<el-transfer v-model="selectedDevice" :titles="['可选排班', '已关联排班']"
:props="{ key: 'id',label: 'device_name'}" :data="deviceList" />
</div>
<div v-if="isBatchLink && batchProgressShow" style="padding: 0 20px 12px; margin-top: 10px;">
@ -299,7 +305,9 @@
smallClass: '',
name: '',
orderField: '',
orderDirection: ''
orderDirection: '',
hisExecDepts: '1',
deviceBind: ''
})
//选中的项目信息
let selectedItemInfo = ref({
@ -399,7 +407,7 @@
// 计算链接对话框标题
const linkDialogTitle = computed(() => {
return isBatchLink.value ? '批量关联检查室' : '关联检查室'
return isBatchLink.value ? '批量关联排班' : '关联排班'
})
// 表格勾选变化
@ -413,34 +421,47 @@
selectedDevice.value = []
DevicedialogVisible.value = true
selectedItemInfo.value.id = row.id
row.devicesInfo.forEach(function(v, i) {
deviceList.value.forEach(function(v2, i2) {
if (v.id == v2.id) {
selectedDevice.value.push(v.id)
}
})
//根据 hisExecDepts 获取设备列表
GetEnableDeviceList({ hisExecDepts: row.hisExecDepts }).then(res => {
if (res.status) {
deviceList.value = res.data
}
// 设备列表更新后，再初始化已选设备
if (row.devicesInfo && row.devicesInfo.length > 0) {
row.devicesInfo.forEach(function(v) {
if (deviceList.value.find(function(d) { return d.id == v.id })) {
selectedDevice.value.push(v.id)
}
})
}
})
}
// 批量关联检查室
// 批量关联排班
const BatchLinkDevice = () => {
if (selectedCheckItems.value.length === 0) {
ElMessage.error('请先勾选要批量关联的检查项目')
return
}
isBatchLink.value = true
// 计算所有勾选项目的共有检查室
let common = []
if (selectedCheckItems.value.length > 0) {
common = selectedCheckItems.value[0].devicesInfo.map(d => d.id)
for (let i = 1; i < selectedCheckItems.value.length; i++) {
const ids = selectedCheckItems.value[i].devicesInfo.map(d => d.id)
common = common.filter(id => ids.includes(id))
// 取第一个项目的 hisExecDepts 进行过滤
const hisExecDepts = selectedCheckItems.value[0].hisExecDepts
GetEnableDeviceList({ hisExecDepts: hisExecDepts }).then(res => {
if (res.status) {
deviceList.value = res.data
}
}
selectedDevice.value = common
DevicedialogVisible.value = true
// 设备列表更新后，再计算共有排班
let common = []
if (selectedCheckItems.value.length > 0) {
common = selectedCheckItems.value[0].devicesInfo.map(d => d.id)
for (let i = 1; i < selectedCheckItems.value.length; i++) {
const ids = selectedCheckItems.value[i].devicesInfo.map(d => d.id)
common = common.filter(id => ids.includes(id))
}
}
selectedDevice.value = common
DevicedialogVisible.value = true
})
}
let selectedDevice = ref([]) //选中的设备

Write Preview
Loading…
Cancel
Save