From eaa681c9ff4b6673f53d5b329e44e5c59c3bfb81 Mon Sep 17 00:00:00 2001 From: qk123 <18211963828.@163.cpm> Date: Mon, 8 Dec 2025 16:46:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E8=AF=8A=E5=8C=BB=E7=94=9F=E6=8E=92?= =?UTF-8?q?=E7=8F=AD->=E7=A7=91=E5=AE=A4=E5=90=8D=E7=A7=B0=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E5=9F=BA=E7=A1=80=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appservice/IDeptAppService.java | 8 + .../appservice/impl/DeptAppServiceImpl.java | 39 +++ .../controller/DeptController.java | 41 ++++ .../mapper/DeptAppMapper.java | 7 + .../openhis/administration/domain/Dept.java | 41 ++++ .../administration/mapper/DeptMapper.java | 9 + .../administration/service/IDeptService.java | 7 + .../administration/service/impl/DeptImpl.java | 11 + .../src/api/appoinmentmanage/dept.js | 27 +++ openhis-ui-vue3/src/router/index.js | 15 ++ .../src/views/appoinmentmanage/index.vue | 222 ++++++++++++++++++ openhis-ui-vue3/src/views/index.vue | 6 +- 12 files changed, 432 insertions(+), 1 deletion(-) create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IDeptAppService.java create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DeptAppServiceImpl.java create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DeptController.java create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/DeptAppMapper.java create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Dept.java create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeptMapper.java create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDeptService.java create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeptImpl.java create mode 100644 openhis-ui-vue3/src/api/appoinmentmanage/dept.js create mode 100644 openhis-ui-vue3/src/views/appoinmentmanage/index.vue diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IDeptAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IDeptAppService.java new file mode 100644 index 00000000..41812d06 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IDeptAppService.java @@ -0,0 +1,8 @@ +package com.openhis.web.appointmentmanage.appservice; +import com.core.common.core.domain.R; +public interface IDeptAppService { + + R getDeptList(); + + R searchDept(Integer pageNo, Integer pageSize, String orgName, String deptName); +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DeptAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DeptAppServiceImpl.java new file mode 100644 index 00000000..eb7970e5 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DeptAppServiceImpl.java @@ -0,0 +1,39 @@ +package com.openhis.web.appointmentmanage.appservice.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.core.common.core.domain.R; +import com.openhis.administration.domain.Dept; +import com.openhis.administration.service.IDeptService; +import com.openhis.web.appointmentmanage.appservice.IDeptAppService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class DeptAppServiceImpl implements IDeptAppService { + + @Resource + private IDeptService deptService; + + @Override + public R getDeptList() { + List list = deptService.list(); + return R.ok(list); + } + + @Override + public R searchDept(Integer pageNo, Integer pageSize, String orgName, String deptName) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (orgName != null && ObjectUtil.isNotEmpty(orgName)) { + wrapper.eq(Dept::getOrgName, orgName); + } + if (deptName != null && ObjectUtil.isNotEmpty(deptName)) { + wrapper.eq(Dept::getDeptName, deptName); + } + List list = deptService.list(wrapper); + return R.ok(list); + } + +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DeptController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DeptController.java new file mode 100644 index 00000000..343d4b95 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DeptController.java @@ -0,0 +1,41 @@ +package com.openhis.web.appointmentmanage.controller; + +import com.core.common.core.domain.R; +import com.openhis.web.appointmentmanage.appservice.IDeptAppService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@RestController +@RequestMapping("/dept") +public class DeptController { + + @Resource + private IDeptAppService deptAppService; + + /* + * 获取科室列表 + * + * */ + @GetMapping("/list") + public R getDeptList(){ + return R.ok(deptAppService.getDeptList()); + } + + /* + * 查询科室 + * + * */ + @GetMapping("/search") + public R searchDept( + @RequestParam(required = false) Integer pageNo, + @RequestParam(required = false) Integer pageSize, + @RequestParam(required = false)String orgName, + @RequestParam(required = false)String deptName + ){ + return R.ok(deptAppService.searchDept(pageNo,pageSize,orgName,deptName)); + } +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/DeptAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/DeptAppMapper.java new file mode 100644 index 00000000..ab573730 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/DeptAppMapper.java @@ -0,0 +1,7 @@ +package com.openhis.web.appointmentmanage.mapper; + +import org.springframework.stereotype.Repository; + +@Repository +public interface DeptAppMapper { +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Dept.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Dept.java new file mode 100644 index 00000000..afd8ceff --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Dept.java @@ -0,0 +1,41 @@ +package com.openhis.administration.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 科室Entity实体 + * + * @date 2025-12-08 + */ +@Data +@TableName(value = "adm_dept_info") +@Accessors(chain = true) +public class Dept { + /** id */ + private Integer id; + + /** 关联租户的租户名称 */ + private String orgName; + + /** 科室名称 */ + private String deptName; + + /** 启用状态 */ + private Boolean status; + + /** 预约取消限制 */ + private Integer cancelLimit; + + /** 备注 */ + private String remark; + + /** 创建时间 */ + private LocalDateTime createTime; + + /** 更新时间 */ + private LocalDateTime updateTime; +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeptMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeptMapper.java new file mode 100644 index 00000000..d0f33c48 --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeptMapper.java @@ -0,0 +1,9 @@ +package com.openhis.administration.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.openhis.administration.domain.Dept; +import org.springframework.stereotype.Repository; + +@Repository +public interface DeptMapper extends BaseMapper { +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDeptService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDeptService.java new file mode 100644 index 00000000..396a4ab9 --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDeptService.java @@ -0,0 +1,7 @@ +package com.openhis.administration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.openhis.administration.domain.Dept; + +public interface IDeptService extends IService { +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeptImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeptImpl.java new file mode 100644 index 00000000..f0548a62 --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeptImpl.java @@ -0,0 +1,11 @@ +package com.openhis.administration.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.openhis.administration.domain.Dept; +import com.openhis.administration.mapper.DeptMapper; +import com.openhis.administration.service.IDeptService; +import org.springframework.stereotype.Service; + +@Service +public class DeptImpl extends ServiceImpl implements IDeptService { +} diff --git a/openhis-ui-vue3/src/api/appoinmentmanage/dept.js b/openhis-ui-vue3/src/api/appoinmentmanage/dept.js new file mode 100644 index 00000000..2fc59422 --- /dev/null +++ b/openhis-ui-vue3/src/api/appoinmentmanage/dept.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +// 查询科室列表 +export function listDept(query) { + return request({ + url: '/dept/list', + method: 'get', + params: query + }) +} + +// 查询科室详细 +export function getDept(deptId) { + return request({ + url: '/dept/' + deptId, + method: 'get' + }) +} + +// 搜索科室列表 +export function searchDept(query) { + return request({ + url: '/dept/search', + method: 'get', + params: query + }) +} diff --git a/openhis-ui-vue3/src/router/index.js b/openhis-ui-vue3/src/router/index.js index 94ff9cda..f257c48b 100644 --- a/openhis-ui-vue3/src/router/index.js +++ b/openhis-ui-vue3/src/router/index.js @@ -26,6 +26,21 @@ import Layout from '@/layout' // 公共路由 export const constantRoutes = [ + { + path: '/appoinmentmanage', + component: Layout, + redirect: '/appoinmentmanage', + name: 'AppoinmentManage', + meta: { title: '预约管理', icon: 'component' }, + children: [ + { + path: '', + component: () => import('@/views/appoinmentmanage/index.vue'), + name: 'AppoinmentManageIndex', + meta: { title: '预约管理' } + } + ] + }, { path: '/redirect', component: Layout, diff --git a/openhis-ui-vue3/src/views/appoinmentmanage/index.vue b/openhis-ui-vue3/src/views/appoinmentmanage/index.vue new file mode 100644 index 00000000..4eae5961 --- /dev/null +++ b/openhis-ui-vue3/src/views/appoinmentmanage/index.vue @@ -0,0 +1,222 @@ + + + + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/views/index.vue b/openhis-ui-vue3/src/views/index.vue index 3fd87c1d..ad433ccf 100644 --- a/openhis-ui-vue3/src/views/index.vue +++ b/openhis-ui-vue3/src/views/index.vue @@ -30,7 +30,7 @@ 👥 患者管理 -
+
💉 预约管理
@@ -203,6 +203,10 @@ function awaitingMedicineBtn() { router.push({ path: '/medicationmanagement/statisticalManagement/earlyWarning' }); } +// 跳转到预约管理页面 +function navigateToAppoinmentManage() { + router.push({ path: '/appoinmentmanage' }); +} function getExpirationWarningCount() { getExpirationWarning({ pageNo: 1, pageSize: 10 }).then((res) => { total.value = res.data.total || 0;