From 42ea3940d3b309a05dde79b841dd9e497b046c00 Mon Sep 17 00:00:00 2001 From: liuhongrui Date: Tue, 4 Mar 2025 17:27:50 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=B0=B1=E8=AF=8A=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OutpatientRecordController.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java index 31f9b88a..a373a1eb 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.openhis.common.enums.AdministrativeGender; +import com.openhis.common.enums.EncounterSubjectStatus; import com.openhis.web.patientmanage.dto.OutpatientRecordDto; import com.openhis.web.patientmanage.dto.OutpatientRecordSearchParam; import com.openhis.web.patientmanage.dto.PatientListDto; @@ -63,6 +64,24 @@ public class OutpatientRecordController { return R.ok(dtos); } + /** + * 获取就诊状态列表 + */ + @GetMapping("/list-encountersubjectstatus") + public R getEncounterSubjectStatus() { + // 获取就诊状态 + List statusList = Arrays.asList(EncounterSubjectStatus.values()); + List dtos = new ArrayList<>(); + // 取得更新值 + for (EncounterSubjectStatus status : statusList) { + PatientListDto dto = new PatientListDto(); + dto.setValue(status.getValue()); + dto.setInfo(status.getInfo()); + dtos.add(dto); + } + return R.ok(dtos); + } + /** * 分页查询门诊记录,可选条件 * From 7b20de9c3d51c8e552f9d0600f66a37ad2233224 Mon Sep 17 00:00:00 2001 From: liuhongrui Date: Tue, 4 Mar 2025 18:00:21 +0800 Subject: [PATCH 2/6] up --- .../OutpatientRecordController.java | 53 ++++--------------- .../dto/OutpatientRecordDto.java | 2 + .../dto/OutpatientRecordSearchParam.java | 2 +- .../patientmanage/PatientManageMapper.xml | 10 ++-- .../common/enums/EncounterSubjectStatus.java | 2 +- 5 files changed, 20 insertions(+), 49 deletions(-) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java index a373a1eb..c30c9bd9 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java @@ -1,7 +1,5 @@ package com.openhis.web.patientmanage.controller; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -14,9 +12,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.openhis.common.enums.AdministrativeGender; import com.openhis.common.enums.EncounterSubjectStatus; +import com.openhis.common.utils.EnumUtils; import com.openhis.web.patientmanage.dto.OutpatientRecordDto; import com.openhis.web.patientmanage.dto.OutpatientRecordSearchParam; -import com.openhis.web.patientmanage.dto.PatientListDto; import com.openhis.web.patientmanage.mapper.PatientManageMapper; import lombok.extern.slf4j.Slf4j; @@ -46,42 +44,6 @@ public class OutpatientRecordController { return R.ok(listDoctorNames); } - /** - * 获取性别列表 - */ - @GetMapping("/list-administrativegender") - public R getAdministrativeGender() { - // 获取性别 - List statusList = Arrays.asList(AdministrativeGender.values()); - List dtos = new ArrayList<>(); - // 取得更新值 - for (AdministrativeGender status : statusList) { - PatientListDto dto = new PatientListDto(); - dto.setValue(status.getValue()); - dto.setInfo(status.getInfo()); - dtos.add(dto); - } - return R.ok(dtos); - } - - /** - * 获取就诊状态列表 - */ - @GetMapping("/list-encountersubjectstatus") - public R getEncounterSubjectStatus() { - // 获取就诊状态 - List statusList = Arrays.asList(EncounterSubjectStatus.values()); - List dtos = new ArrayList<>(); - // 取得更新值 - for (EncounterSubjectStatus status : statusList) { - PatientListDto dto = new PatientListDto(); - dto.setValue(status.getValue()); - dto.setInfo(status.getInfo()); - dtos.add(dto); - } - return R.ok(dtos); - } - /** * 分页查询门诊记录,可选条件 * @@ -102,10 +64,17 @@ public class OutpatientRecordController { // 查询总记录数 long total = patientManageMapper.countOutpatientRecords(outpatientRecordSearchParam); // 创建Page对象并设置属性 - Page OutpatientRecordPage = new Page<>(pageNo, pageSize, total); - OutpatientRecordPage.setRecords(listOutpatientRecords); + Page outpatientRecordPage = new Page<>(pageNo, pageSize, total); + outpatientRecordPage.setRecords(listOutpatientRecords); + outpatientRecordPage.getRecords().forEach(e -> { + // 性别枚举类回显赋值 + e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum())); + // 就诊对象状态枚举类回显赋值 + e.setSubjectStatusEnum_enumText( + EnumUtils.getInfoByValue(EncounterSubjectStatus.class, e.getSubjectStatusEnum())); + }); - return R.ok(OutpatientRecordPage); + return R.ok(outpatientRecordPage); } } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordDto.java index 4873ce60..3a85e954 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordDto.java @@ -30,12 +30,14 @@ public class OutpatientRecordDto { /** 性别编码 */ private Integer genderEnum; + private String genderEnum_enumText; /** 就诊时间 */ private Date encounterTime; /** 就诊对象状态 */ private Integer subjectStatusEnum; + private String subjectStatusEnum_enumText; /** 机构名称/接诊医院 */ private String organizationName; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordSearchParam.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordSearchParam.java index 4dda4a1e..4ff8c830 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordSearchParam.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordSearchParam.java @@ -25,7 +25,7 @@ public class OutpatientRecordSearchParam { private String doctorName; /** 筛选开始时间 */ - private Date startTime; + private Date beginTime; /** 筛选结束时间 */ private Date endTime; diff --git a/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml index 4e4d7089..59f9b2d5 100644 --- a/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml +++ b/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml @@ -106,13 +106,13 @@ pt.name, pt.id_card, c.description, - pt.bus_no, - e.bus_no, + pt.bus_no as patientBusNo, + e.bus_no as encounterBusNo, pt.gender_enum, - e.start_time, + e.start_time as encounterTime, e.subject_status_enum, - ogt.name, - p.name, + ogt.name as organizationName, + p.name as doctorName, pt.phone FROM adm_encounter e diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.java index b3a3507a..2dd33929 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.java @@ -6,7 +6,7 @@ import lombok.Getter; @Getter @AllArgsConstructor -public enum EncounterSubjectStatus { +public enum EncounterSubjectStatus implements HisEnumInterface { PLANNED(1, "arrived", "已到达"), TRIAGED(2, "triaged", "已分诊"), From 1dd387201b9f1d8311a2cc4e3e83d40da507165e Mon Sep 17 00:00:00 2001 From: duhe Date: Tue, 4 Mar 2025 18:34:20 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=8C=82=E5=8F=B7=E6=94=B6=E8=B4=B9?= =?UTF-8?q?=E7=94=BB=E9=9D=A2=20up=20by=20dh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplier/components/supplier.js | 14 +- .../components/AddDialog.vue | 0 .../register_fee_item/components/api.js | 0 .../basicserve/register_fee_item/index.vue | 0 .../components/registrationfee.js | 72 ++ .../basicservices/registrationfee/index.vue | 835 ++++++++++++++++++ openhis-ui-vue3/vite.config.js | 2 +- 7 files changed, 915 insertions(+), 8 deletions(-) delete mode 100644 openhis-ui-vue3/src/views/basicserve/register_fee_item/components/AddDialog.vue delete mode 100644 openhis-ui-vue3/src/views/basicserve/register_fee_item/components/api.js delete mode 100644 openhis-ui-vue3/src/views/basicserve/register_fee_item/index.vue create mode 100644 openhis-ui-vue3/src/views/basicservices/registrationfee/components/registrationfee.js create mode 100644 openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue diff --git a/openhis-ui-vue3/src/views/basicmanage/supplier/components/supplier.js b/openhis-ui-vue3/src/views/basicmanage/supplier/components/supplier.js index f09dd41a..2e645acb 100644 --- a/openhis-ui-vue3/src/views/basicmanage/supplier/components/supplier.js +++ b/openhis-ui-vue3/src/views/basicmanage/supplier/components/supplier.js @@ -1,7 +1,7 @@ import request from '@/utils/request' import { parseStrEmpty } from "@/utils/openhis"; -// 查询病种目录列表 +// 查询厂商列表 export function getSupplierList(query) { return request({ url: '/data-dictionary/supplier/get-supplier-list', @@ -10,7 +10,7 @@ export function getSupplierList(query) { }) } -// 查询病种目录详细 +// 查询厂商详细 export function getSupplierOne(id) { return request({ url: '/data-dictionary/supplier/get-supplier-detail/' + parseStrEmpty(id), @@ -18,7 +18,7 @@ export function getSupplierOne(id) { }) } -// 新增病种目录 +// 新增厂商 export function addSupplier(data) { return request({ url: '/data-dictionary/supplier/add-supplier', @@ -27,7 +27,7 @@ export function addSupplier(data) { }) } -// 修改病种目录 +// 修改厂商 export function editSupplier(data) { return request({ url: '/data-dictionary/supplier/edit-supplier', @@ -36,7 +36,7 @@ export function editSupplier(data) { }) } -// // 删除病种目录 +// // 删除厂商 // export function delUser(userId) { // return request({ // url: '/system/user/' + userId, @@ -44,7 +44,7 @@ export function editSupplier(data) { // }) // } -// 停用病种目录 +// 停用厂商 export function stopSupplier(ids) { return request({ url: '/data-dictionary/supplier/information-stop', @@ -53,7 +53,7 @@ export function stopSupplier(ids) { }) } -// 启用病种目录 +// 启用厂商 export function startSupplier(ids) { return request({ url: '/data-dictionary/supplier/information-start', diff --git a/openhis-ui-vue3/src/views/basicserve/register_fee_item/components/AddDialog.vue b/openhis-ui-vue3/src/views/basicserve/register_fee_item/components/AddDialog.vue deleted file mode 100644 index e69de29b..00000000 diff --git a/openhis-ui-vue3/src/views/basicserve/register_fee_item/components/api.js b/openhis-ui-vue3/src/views/basicserve/register_fee_item/components/api.js deleted file mode 100644 index e69de29b..00000000 diff --git a/openhis-ui-vue3/src/views/basicserve/register_fee_item/index.vue b/openhis-ui-vue3/src/views/basicserve/register_fee_item/index.vue deleted file mode 100644 index e69de29b..00000000 diff --git a/openhis-ui-vue3/src/views/basicservices/registrationfee/components/registrationfee.js b/openhis-ui-vue3/src/views/basicservices/registrationfee/components/registrationfee.js new file mode 100644 index 00000000..04233fff --- /dev/null +++ b/openhis-ui-vue3/src/views/basicservices/registrationfee/components/registrationfee.js @@ -0,0 +1,72 @@ +import request from '@/utils/request' +import { parseStrEmpty } from "@/utils/openhis"; + +// 查询服务管理列表 +export function getRegistrationfeeList(query) { + return request({ + url: '/basic-service/healthcare/healthcare-service-page', + method: 'get', + params: query + }) +} + +// 查询服务管理详细 +export function getRegistrationfeeOne(id) { + return request({ + url: '/basic-service/healthcare/healthcare-service-detail/' + parseStrEmpty(id), + method: 'get' + }) +} + +// 新增服务管理 +export function addRegistrationfee(data) { + return request({ + url: '/basic-service/healthcare/healthcare-service', + method: 'post', + data: data + }) +} + +// 修改服务管理 +export function editRegistrationfee(data) { + return request({ + url: '/basic-service/healthcare/healthcare-service', + method: 'put', + data: data + }) +} + +// 查询厂商类型 +export function getInit() { + return request({ + url: '/basic-service/healthcare/init', + method: 'get' + }) +} + +// 查询部门树形数据 +export function deptTreeSelect(queryParams) { + return request({ + url: '/basedatamanage/organization/organization', + method: 'get', + param: queryParams + }) +} + +// 查询地点树形数据 +export function locationTreeSelect(queryParams) { + return request({ + url: '/basedatamanage/organization/organization', + method: 'get', + param: queryParams + }) +} + +// 删除收费挂号项目 +export function delRegistrationfee(param) { + return request({ + url: '/basedatamanage/organization/healthcare-service', + method: 'delete', + params: param + }) +} \ No newline at end of file diff --git a/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue b/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue new file mode 100644 index 00000000..f0e88875 --- /dev/null +++ b/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue @@ -0,0 +1,835 @@ + + + + \ No newline at end of file diff --git a/openhis-ui-vue3/vite.config.js b/openhis-ui-vue3/vite.config.js index 65cca806..3fa8a5c1 100644 --- a/openhis-ui-vue3/vite.config.js +++ b/openhis-ui-vue3/vite.config.js @@ -25,7 +25,7 @@ export default defineConfig (({mode, command}) => { }, // vite 相关配置 server: { - port: 80, + port: 81, host: true, open: true, proxy: { From f1fe7077dffd7dc1aa07f0bdcd3c5d56cea71a3a Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Tue, 4 Mar 2025 19:18:54 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OutpatientRegistrationController.java | 24 ++++++- .../dto/OutpatientRegistrationAddDto.java | 14 ++++ .../dto/OutpatientRegistrationInitDto.java | 32 +++++++++ .../openhis/common/enums/EncounterClass.java | 3 +- .../openhis/common/enums/EncounterStatus.java | 2 +- .../common/enums/EncounterSubjectStatus.java | 4 +- .../common/enums/EncounterYbClass.java | 34 ++------- .../administration/domain/Encounter.java | 70 +++++++++++++------ 8 files changed, 129 insertions(+), 54 deletions(-) create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/OutpatientRegistrationAddDto.java create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/OutpatientRegistrationInitDto.java diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/controller/OutpatientRegistrationController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/controller/OutpatientRegistrationController.java index 577452d6..33a1bfad 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/controller/OutpatientRegistrationController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/controller/OutpatientRegistrationController.java @@ -3,11 +3,21 @@ */ package com.openhis.web.outpatientservice.controller; +import com.core.common.core.domain.R; +import com.openhis.common.enums.AccountStatus; +import com.openhis.common.enums.PriorityLevel; +import com.openhis.web.basicservice.dto.HealthcareServiceInitDto; +import com.openhis.web.outpatientservice.dto.OutpatientRegistrationInitDto; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + /** * 门诊挂号 controller */ @@ -17,6 +27,18 @@ import org.springframework.web.bind.annotation.RestController; @AllArgsConstructor public class OutpatientRegistrationController { - + /** + * 门诊挂号基础数据初始化 + */ + @GetMapping(value = "/init") + public R init() { + OutpatientRegistrationInitDto outpatientRegistrationInitDto = new OutpatientRegistrationInitDto(); + // 优先级 + List priorityLevelOptionOptions = Stream.of(PriorityLevel.values()) + .map(e -> new OutpatientRegistrationInitDto.priorityLevelOption(e.getValue(), e.getInfo())) + .collect(Collectors.toList()); + outpatientRegistrationInitDto.setPriorityLevelOptionOptions(priorityLevelOptionOptions); + return R.ok(outpatientRegistrationInitDto); + } } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/OutpatientRegistrationAddDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/OutpatientRegistrationAddDto.java new file mode 100644 index 00000000..d00d57eb --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/OutpatientRegistrationAddDto.java @@ -0,0 +1,14 @@ +package com.openhis.web.outpatientservice.dto; + +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 门诊挂号 新增数据 + */ +@Data +@Accessors(chain = true) +public class OutpatientRegistrationAddDto { + + +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/OutpatientRegistrationInitDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/OutpatientRegistrationInitDto.java new file mode 100644 index 00000000..a9fa09e7 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/OutpatientRegistrationInitDto.java @@ -0,0 +1,32 @@ +package com.openhis.web.outpatientservice.dto; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.List; + +/** + * 门诊挂号 init基础数据 + */ +@Data +@Accessors(chain = true) +public class OutpatientRegistrationInitDto { + + private List priorityLevelOptionOptions; + + /** + * 优先级 + */ + @Data + public static class priorityLevelOption { + private Integer value; + private String label; + + public priorityLevelOption(Integer value, String label) { + this.value = value; + this.label = label; + } + } + + +} diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterClass.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterClass.java index 92842768..192ddee3 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterClass.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterClass.java @@ -1,4 +1,5 @@ package com.openhis.common.enums; + import com.baomidou.mybatisplus.annotation.EnumValue; import lombok.AllArgsConstructor; import lombok.Getter; @@ -8,7 +9,7 @@ import lombok.Getter; */ @Getter @AllArgsConstructor -public enum EncounterClass { +public enum EncounterClass implements HisEnumInterface { IMP(1, "IMP", "住院"), AMB(2, "AMB", "门诊"), diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterStatus.java index 585a7cc8..ed502f78 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterStatus.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterStatus.java @@ -6,7 +6,7 @@ import lombok.Getter; @Getter @AllArgsConstructor -public enum EncounterStatus { +public enum EncounterStatus implements HisEnumInterface { PLANNED(1, "draft", "已安排"), IN_PROGRESS(2, "in-progress", "进行中"), diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.java index 2dd33929..035a82d6 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.java @@ -3,7 +3,9 @@ import com.baomidou.mybatisplus.annotation.EnumValue; import lombok.AllArgsConstructor; import lombok.Getter; - +/** + * 就诊对象状态 + */ @Getter @AllArgsConstructor public enum EncounterSubjectStatus implements HisEnumInterface { diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterYbClass.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterYbClass.java index 2b0e593a..296162c1 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterYbClass.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterYbClass.java @@ -3,38 +3,12 @@ import com.baomidou.mybatisplus.annotation.EnumValue; import lombok.AllArgsConstructor; import lombok.Getter; -/*代码值 代码名称 对应7.28医疗类别med_type 在2203接口用到此信息 - 25 异地住院 - 26 单病种住院 - 27 自主就医 - 81 意外伤害门诊 - 15 特药 - 28 日间手术 - 61 照护保险 - 11 普通门诊 - 12 门诊挂号 - 13 急诊 - 14 门诊慢特病 - 990404 门诊特检特治（限吉林市） - 21 普通住院 - 22 外伤住院 - 23 转外诊治住院 - 24 急诊转住院 - 41 定点药店购药 - 51 生育门诊 - 52 生育住院 - 5212 生育新生儿费用 - 16 中医特色门诊 - 29 起付线治疗 - 9107 体检 - 3101 低自付住院 - 3102 低自付门诊 - 140104 门诊慢病 - 140201 门诊特病 - 2114 舒缓疗护住院*/ +/** + * 医保类别 + */ @Getter @AllArgsConstructor -public enum EncounterYbClass { +public enum EncounterYbClass implements HisEnumInterface { // 住院服务 ORDINARY_HOSPITALIZATION(21, "21" , "普通住院"), FOREIGN_HOSPITALIZATION(25,"25", "异地住院"), diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java index 4a75d177..9e31e7ca 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java @@ -1,19 +1,17 @@ package com.openhis.administration.domain; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.openhis.common.enums.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** * 就诊管理Entity实体 * @@ -25,54 +23,86 @@ import lombok.experimental.Accessors; @EqualsAndHashCode(callSuper = false) public class Encounter extends HisBaseEntity { - /** ID */ + /** + * ID + */ @TableId(type = IdType.ASSIGN_ID) @JsonSerialize(using = ToStringSerializer.class) private Long id; - /** 患者ID */ + /** + * 患者ID + */ private Long patientId; - /** 群组ID */ + /** + * 群组ID + */ private Long groupId; - /** 就诊编码 */ + /** + * 就诊编码 + */ private String busNo; - /** 状态编码 */ + /** + * 状态编码 + */ private Integer statusEnum; - /** 类别编码 */ + /** + * 类别编码 + */ private Integer classEnum; - /** 类别医保编码 */ + /** + * 类别医保编码 + */ private Integer ybClassEnum; - /** 类别编码补充 */ + /** + * 类别编码补充 + */ private String classJson; - /** 优先级编码 */ + /** + * 优先级编码 + */ private Integer priorityEnum; - /** 分类编码 */ + /** + * 分类编码 + */ private Integer typeEnum; - /** 服务ID */ + /** + * 服务ID + */ private Long serviceTypeId; - /** 就诊对象状态 */ + /** + * 就诊对象状态 + */ private Integer subjectStatusEnum; - /** 开始时间 */ + /** + * 开始时间 + */ private Date startTime; - /** 结束时间 */ + /** + * 结束时间 + */ private Date endTime; - /** 机构id */ + /** + * 机构id + */ private Long organizationId; - /** 就诊序号 */ + /** + * 就诊序号 + */ private Integer displayOrder; } From befde6cdfdf066387f23ee0512952af00e0eb00e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=B2=E8=8F=B2?= <12704587+yvwen@user.noreply.gitee.com> Date: Wed, 5 Mar 2025 10:04:17 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=97=A8=E8=AF=8A=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../patientManagement/index.vue | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/openhis-ui-vue3/src/views/patientManagement/patientManagement/index.vue b/openhis-ui-vue3/src/views/patientManagement/patientManagement/index.vue index d56c4ded..e389b0a0 100644 --- a/openhis-ui-vue3/src/views/patientManagement/patientManagement/index.vue +++ b/openhis-ui-vue3/src/views/patientManagement/patientManagement/index.vue @@ -26,18 +26,18 @@ - - + + - + - + - + @@ -238,7 +238,7 @@ const administrativegenderList = ref([]) //性别 const bloodtypeaboList = ref([]) //血型abo const bloodtypearhList = ref([]) //血型RH const familyrelationshiptypeList = ref([]) //家庭关系 -const addressCom = ref(""); +const addressCom = ref(""); //地址 const options = ref(pcas); // 地区数据 const selectedOptions = ref([]); // v-model 绑定的选中值 @@ -295,7 +295,6 @@ const findNodeByCode = (data, code) => { /** 查询菜单列表 */ function getList() { listPatient(queryParams.value).then(response => { - console.log("res",response,queryParams.value) patientList.value = response.data.records total.value = response.data.total; }); @@ -386,7 +385,6 @@ function handleUpdate(row) { const codes = convertAddressToCodes(selectedOptions1.value); selectedOptions.value = codes.filter(code => code !== null); isViewMode.value = false; - console.log("form.value12",form.value) open.value = true; title.value = "修改菜单"; } @@ -422,25 +420,18 @@ function submitForm() { if (form.value.busNo != undefined) { const newAddress = form.value.addressProvince+form.value.addressCity + form.value.addressDistrict + form.value.addressStreet + form.value.address if (addressCom.value !== newAddress) { - console.log("6666666666", form.value.address,addressCom.value); - // 如果不一致，清空并重新赋值 form.value.address = newAddress; - console.log("地址已更新为：", form.value.address); - } - console.log("form.value.up",form.value) + } updatePatient(form.value).then(response => { proxy.$modal.msgSuccess("修改成功"); open.value = false; - reset() getList(); }); } else { form.value.address = form.value.addressProvince+form.value.addressCity + form.value.addressDistrict + form.value.addressStreet + form.value.address - console.log("form.value",form.value) addPatient(form.value).then(response => { proxy.$modal.msgSuccess("新增成功"); open.value = false; - reset() getList(); }); } From b7f30c97ceded1c8acdbdd8ed57288f381fdfcf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=B2=E8=8F=B2?= <12704587+yvwen@user.noreply.gitee.com> Date: Wed, 5 Mar 2025 10:11:36 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=97=A8=E8=AF=8A=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../outpatienRecords/component/api.js | 18 +++ .../outpatienRecords/index.vue | 107 ++++++++++++++++++ 2 files changed, 125 insertions(+) create mode 100644 openhis-ui-vue3/src/views/patientManagement/outpatienRecords/component/api.js create mode 100644 openhis-ui-vue3/src/views/patientManagement/outpatienRecords/index.vue diff --git a/openhis-ui-vue3/src/views/patientManagement/outpatienRecords/component/api.js b/openhis-ui-vue3/src/views/patientManagement/outpatienRecords/component/api.js new file mode 100644 index 00000000..dad6d50a --- /dev/null +++ b/openhis-ui-vue3/src/views/patientManagement/outpatienRecords/component/api.js @@ -0,0 +1,18 @@ +import request from '@/utils/request' + +export function listOutpatienRecords(query) { + return request({ + url: '/patientmanage/records/outpatient-record-page', + method: 'get', + params: query + }) + } + + export function listDoctorNames() { + return request({ + url: '/patientmanage/records/list-doctornames', + method: 'get', + }) + } + + diff --git a/openhis-ui-vue3/src/views/patientManagement/outpatienRecords/index.vue b/openhis-ui-vue3/src/views/patientManagement/outpatienRecords/index.vue new file mode 100644 index 00000000..c1267df7 --- /dev/null +++ b/openhis-ui-vue3/src/views/patientManagement/outpatienRecords/index.vue @@ -0,0 +1,107 @@ + + + \ No newline at end of file