From 602501c76f5228a1a991575ecf49644f922bbc5c Mon Sep 17 00:00:00 2001 From: anxin Date: Wed, 26 Feb 2025 09:35:42 +0800 Subject: [PATCH 1/3] Org --- .../administration/service/impl/OrganizationServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java index f3b11be1..6ee12138 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java @@ -8,7 +8,6 @@ import com.openhis.administration.domain.Organization; import com.openhis.administration.mapper.OrganizationMapper; import com.openhis.administration.service.IOrganizationService; import com.openhis.common.enums.AccountStatus; -import com.openhis.common.enums.ActiveFlag; /** * 机构管理Service业务层处理 @@ -29,10 +28,10 @@ public class OrganizationServiceImpl extends ServiceImpl Date: Wed, 26 Feb 2025 10:00:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=96=BE=E7=97=85=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E8=8D=AF=E5=93=81=E7=9B=AE=E5=BD=95=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/datadictionary/controller/DiseaseManageController.java | 2 +- .../datadictionary/controller/MedicationManageController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java index bf4ad9d7..814b91b3 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java @@ -77,7 +77,7 @@ public class DiseaseManageController { * @return */ @GetMapping("/information-page") - public R getDiseaseList(@RequestBody DiseaseManageSelParam diseaseManageSelParam, + public R getDiseaseList(DiseaseManageSelParam diseaseManageSelParam, @RequestParam(value = "searchKey", defaultValue = "") String searchKey, @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) { diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java index e5763602..55057123 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java @@ -136,7 +136,7 @@ public class MedicationManageController { } /** - * 药品目录停用 + * 药品目录启用 * * @param ids 药品ID列表 * @return From de40a5b9c1c5aafaef989824b3f7e2e7a779d9ad 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, 26 Feb 2025 10:39:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=97=85=E4=BA=BA=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../patientManagement/component/api.js | 47 +++ .../patientManagement/index.vue | 360 ++++++++++++++++++ 2 files changed, 407 insertions(+) create mode 100644 openhis-ui-vue3/src/views/patientManagement/patientManagement/component/api.js create mode 100644 openhis-ui-vue3/src/views/patientManagement/patientManagement/index.vue diff --git a/openhis-ui-vue3/src/views/patientManagement/patientManagement/component/api.js b/openhis-ui-vue3/src/views/patientManagement/patientManagement/component/api.js new file mode 100644 index 00000000..7a8185de --- /dev/null +++ b/openhis-ui-vue3/src/views/patientManagement/patientManagement/component/api.js @@ -0,0 +1,47 @@ +import request from '@/utils/request' + + +export function listmaritalstatus() { + return request({ + url: '/patientmanage/information/list-maritalstatus', + method: 'get', + }) +} + +export function listoccupationtype() { + return request({ + url: '/patientmanage/information/list-occupationtype', + method: 'get', + }) +} + +export function lisadministrativegender() { + return request({ + url: '/patientmanage/information/list-administrativegender', + method: 'get', + }) +} + +export function listbloodtypeabo() { + return request({ + url: '/patientmanage/information/list-bloodtypeabo', + method: 'get', + }) +} + + +export function listbloodtypearh() { + return request({ + url: '/patientmanage/information/list-bloodtypearh', + method: 'get', + }) +} + +export function listfamilyrelationshiptype() { + return request({ + url: '/patientmanage/information/list-familyrelationshiptype', + method: 'get', + }) + } + + diff --git a/openhis-ui-vue3/src/views/patientManagement/patientManagement/index.vue b/openhis-ui-vue3/src/views/patientManagement/patientManagement/index.vue new file mode 100644 index 00000000..9e03aeeb --- /dev/null +++ b/openhis-ui-vue3/src/views/patientManagement/patientManagement/index.vue @@ -0,0 +1,360 @@ + + + + + \ No newline at end of file