From 421a9f5e14d3425d09b352b002bf3679f714f78d Mon Sep 17 00:00:00 2001 From: "Zhang.YC" Date: Wed, 26 Feb 2025 10:44:58 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/components/api.js | 54 +++ .../views/basicmanage/organization/index.vue | 317 ++++++++++++++++++ 2 files changed, 371 insertions(+) create mode 100644 openhis-ui-vue3/src/views/basicmanage/organization/components/api.js create mode 100644 openhis-ui-vue3/src/views/basicmanage/organization/index.vue diff --git a/openhis-ui-vue3/src/views/basicmanage/organization/components/api.js b/openhis-ui-vue3/src/views/basicmanage/organization/components/api.js new file mode 100644 index 00000000..5681a3d9 --- /dev/null +++ b/openhis-ui-vue3/src/views/basicmanage/organization/components/api.js @@ -0,0 +1,54 @@ +import request from '@/utils/request' + +export function getList(queryParams) { + return request({ + url: '/basedatamanage/organization/organization', + method: 'get', + param: queryParams + }) +} + +export function addOrganization(data) { + return request({ + url: '/basedatamanage/organization/organization', + method: 'post', + data: data + }) +} + +export function updateOrganization(data) { + return request({ + url: '/basedatamanage/organization/organization', + method: 'put', + data: data + }) +} + +export function deleteOrganization(param) { + return request({ + url: '/basedatamanage/organization/organization', + method: 'delete', + params: param + }) +} + +export function getOrgDetail(id) { + return request({ + url: '/basedatamanage/organization/organization?orgId=' + id, + method: 'get', + }) +} + +export function initOrgTypeOption() { + return request({ + url: '/basedatamanage/organization/organization', + method: 'get', + }) +} + +export function disableOrg(id) { + return request({ + url: '/basedatamanage/organization/organization?orgId=' + id, + method: 'put', + }) +} diff --git a/openhis-ui-vue3/src/views/basicmanage/organization/index.vue b/openhis-ui-vue3/src/views/basicmanage/organization/index.vue new file mode 100644 index 00000000..cd53dec4 --- /dev/null +++ b/openhis-ui-vue3/src/views/basicmanage/organization/index.vue @@ -0,0 +1,317 @@ + + + \ No newline at end of file From dea1ea05e53c8e4200d3746f55359f373c41001b Mon Sep 17 00:00:00 2001 From: Zhuangxingyu Date: Wed, 26 Feb 2025 13:07:53 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AE=9A=E4=BB=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ItemDefinitionController.java | 92 +- .../dto/ChargeItemDefPageDto.java | 3 +- .../dto/ChargeItemOptionDto.java | 5 + .../datadictionary/dto/ItemDefinitionDto.java | 3 +- .../mapper/ChargeItemDefSearchMapper.java | 9 +- .../common/enums/PublicationStatus.java | 8 + openhis-ui-vue3/package.json | 5 +- openhis-ui-vue3/src/utils/his.js | 264 ++++++ .../definition/components/definition.js | 36 + .../definition/components/edit.vue | 215 +++++ .../views/datadictionary/definition/index.vue | 790 ++++++++++++++++++ 11 files changed, 1377 insertions(+), 53 deletions(-) create mode 100644 openhis-ui-vue3/src/utils/his.js create mode 100644 openhis-ui-vue3/src/views/datadictionary/definition/components/definition.js create mode 100644 openhis-ui-vue3/src/views/datadictionary/definition/components/edit.vue create mode 100644 openhis-ui-vue3/src/views/datadictionary/definition/index.vue diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java index e068e18a..17f3e656 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java @@ -3,10 +3,8 @@ */ package com.openhis.web.datadictionary.controller; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; @@ -33,6 +31,7 @@ import com.openhis.administration.domain.ChargeItemDefinition; import com.openhis.administration.service.IChargeItemDefAppService; import com.openhis.administration.service.IChargeItemDefinitionService; import com.openhis.common.constant.PromptMsgConstant; +import com.openhis.common.enums.PublicationStatus; import com.openhis.web.datadictionary.dto.ChargeItemDefPageDto; import com.openhis.web.datadictionary.dto.ChargeItemOptionDto; import com.openhis.web.datadictionary.dto.ItemDefSearchParam; @@ -72,56 +71,55 @@ public class ItemDefinitionController { List chargeItemOptions = new ArrayList<>(); if (DefinitionTypeEnum.MEDICATION.getCode().equals(itemDefSearchParam.getDefinitionType())) { // 西药 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.WEST_MEDICINE.getCode()) - .setLabel(ChargeItemEnum.WEST_MEDICINE.getInfo())); + chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.WEST_MEDICINE.getCode(), + ChargeItemEnum.WEST_MEDICINE.getInfo())); // 中药饮片 - chargeItemOptions - .add(new ChargeItemOptionDto().setValue(ChargeItemEnum.CHINESE_MEDICINE_SLICES_FEE.getCode()) - .setLabel(ChargeItemEnum.CHINESE_MEDICINE_SLICES_FEE.getInfo())); + chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.CHINESE_MEDICINE_SLICES_FEE.getCode(), + ChargeItemEnum.CHINESE_MEDICINE_SLICES_FEE.getInfo())); // 中成药 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.CHINESE_MEDICINE_FEE.getCode()) - .setLabel(ChargeItemEnum.CHINESE_MEDICINE_FEE.getInfo())); + chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.CHINESE_MEDICINE_FEE.getCode(), + ChargeItemEnum.CHINESE_MEDICINE_FEE.getInfo())); // 其他 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.OTHER_FEE.getCode()) - .setLabel(ChargeItemEnum.OTHER_FEE.getInfo())); + chargeItemOptions + .add(new ChargeItemOptionDto(ChargeItemEnum.OTHER_FEE.getCode(), ChargeItemEnum.OTHER_FEE.getInfo())); } else if (DefinitionTypeEnum.DEVICE.getCode().equals(itemDefSearchParam.getDefinitionType())) { // 卫生材料 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.SANITARY_MATERIALS_FEE.getCode()) - .setLabel(ChargeItemEnum.SANITARY_MATERIALS_FEE.getInfo())); + chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.SANITARY_MATERIALS_FEE.getCode(), + ChargeItemEnum.SANITARY_MATERIALS_FEE.getInfo())); // 其他 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.OTHER_FEE.getCode()) - .setLabel(ChargeItemEnum.OTHER_FEE.getInfo())); + chargeItemOptions + .add(new ChargeItemOptionDto(ChargeItemEnum.OTHER_FEE.getCode(), ChargeItemEnum.OTHER_FEE.getInfo())); } else if (DefinitionTypeEnum.ACTIVITY.getCode().equals(itemDefSearchParam.getDefinitionType())) { // 床位 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.BED_FEE.getCode()) - .setLabel(ChargeItemEnum.BED_FEE.getInfo())); + chargeItemOptions + .add(new ChargeItemOptionDto(ChargeItemEnum.BED_FEE.getCode(), ChargeItemEnum.BED_FEE.getInfo())); // 诊察 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.DIAGNOSTIC_FEE.getCode()) - .setLabel(ChargeItemEnum.DIAGNOSTIC_FEE.getInfo())); + chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.DIAGNOSTIC_FEE.getCode(), + ChargeItemEnum.DIAGNOSTIC_FEE.getInfo())); // 检查 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.CHECK_FEE.getCode()) - .setLabel(ChargeItemEnum.CHECK_FEE.getInfo())); + chargeItemOptions + .add(new ChargeItemOptionDto(ChargeItemEnum.CHECK_FEE.getCode(), ChargeItemEnum.CHECK_FEE.getInfo())); // 化验 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.DIAGNOSTIC_TEST_FEE.getCode()) - .setLabel(ChargeItemEnum.DIAGNOSTIC_TEST_FEE.getInfo())); + chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.DIAGNOSTIC_TEST_FEE.getCode(), + ChargeItemEnum.DIAGNOSTIC_TEST_FEE.getInfo())); // 治疗 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.MEDICAL_EXPENSE_FEE.getCode()) - .setLabel(ChargeItemEnum.MEDICAL_EXPENSE_FEE.getInfo())); + chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.MEDICAL_EXPENSE_FEE.getCode(), + ChargeItemEnum.MEDICAL_EXPENSE_FEE.getInfo())); // 手术 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.OPERATION_FEE.getCode()) - .setLabel(ChargeItemEnum.OPERATION_FEE.getInfo())); + chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.OPERATION_FEE.getCode(), + ChargeItemEnum.OPERATION_FEE.getInfo())); // 护理费 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.NURSING_FEE.getCode()) - .setLabel(ChargeItemEnum.NURSING_FEE.getInfo())); + chargeItemOptions.add( + new ChargeItemOptionDto(ChargeItemEnum.NURSING_FEE.getCode(), ChargeItemEnum.NURSING_FEE.getInfo())); // 其他 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.GENERAL_CONSULTATION_FEE.getCode()) - .setLabel(ChargeItemEnum.GENERAL_CONSULTATION_FEE.getInfo())); + chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.GENERAL_CONSULTATION_FEE.getCode(), + ChargeItemEnum.GENERAL_CONSULTATION_FEE.getInfo())); // 挂号 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.REGISTRATION_FEE.getCode()) - .setLabel(ChargeItemEnum.REGISTRATION_FEE.getInfo())); + chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.REGISTRATION_FEE.getCode(), + ChargeItemEnum.REGISTRATION_FEE.getInfo())); // 其他 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.OTHER_FEE.getCode()) - .setLabel(ChargeItemEnum.OTHER_FEE.getInfo())); + chargeItemOptions + .add(new ChargeItemOptionDto(ChargeItemEnum.OTHER_FEE.getCode(), ChargeItemEnum.OTHER_FEE.getInfo())); } return R.ok(chargeItemOptions); } @@ -157,16 +155,13 @@ public class ItemDefinitionController { // 通过 DefinitionType 区分药品定价/器具定价/活动定价 if (DefinitionTypeEnum.MEDICATION.getCode().equals(chargeItemDefPageDto.getDefinitionType())) { queryWrapper.eq(ChargeItemDefPageDto::getInstanceTable, "med_medication_definition"); - chargeItemDefinitionPage = - chargeItemDefSearchMapper.getMedList(new Page<>(pageNo, pageSize), queryWrapper); + chargeItemDefinitionPage = chargeItemDefSearchMapper.getMedList(new Page<>(pageNo, pageSize), queryWrapper); } else if (DefinitionTypeEnum.DEVICE.getCode().equals(chargeItemDefPageDto.getDefinitionType())) { queryWrapper.eq(ChargeItemDefPageDto::getInstanceTable, "adm_device_definition"); - chargeItemDefinitionPage = - chargeItemDefSearchMapper.getDevList(new Page<>(pageNo, pageSize), queryWrapper); + chargeItemDefinitionPage = chargeItemDefSearchMapper.getDevList(new Page<>(pageNo, pageSize), queryWrapper); } else if (DefinitionTypeEnum.ACTIVITY.getCode().equals(chargeItemDefPageDto.getDefinitionType())) { queryWrapper.eq(ChargeItemDefPageDto::getInstanceTable, "wor_activity_definition"); - chargeItemDefinitionPage = - chargeItemDefSearchMapper.getActList(new Page<>(pageNo, pageSize), queryWrapper); + chargeItemDefinitionPage = chargeItemDefSearchMapper.getActList(new Page<>(pageNo, pageSize), queryWrapper); } return R.ok(chargeItemDefinitionPage, MessageUtils.createMessage(PromptMsgConstant.Common.M00009, null)); } @@ -196,6 +191,17 @@ public class ItemDefinitionController { : R.fail(PromptMsgConstant.Common.M00007, null); } + /** + * 修改项目定价 + * + * @return 修改结果 + */ + @GetMapping(value = "/status-enum-option") + public R getDropdownOption() { + return R.ok(Arrays.stream(PublicationStatus.values()) + .map(status -> new ChargeItemOptionDto(status.getValue(), status.getInfo())).collect(Collectors.toList())); + } + /** * 采番测试（例子，非常规代码，请勿调用） * diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java index 1b076786..c2e4d91e 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java @@ -6,6 +6,7 @@ package com.openhis.web.datadictionary.dto; import java.math.BigDecimal; import java.util.Date; +import com.openhis.common.enums.PublicationStatus; import lombok.Data; import lombok.experimental.Accessors; @@ -35,7 +36,7 @@ public class ChargeItemDefPageDto { private String totalVolume; /** 状态 */ - private Integer statusEnum; + private PublicationStatus statusEnum; /** 单位 */ private String unitCode; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemOptionDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemOptionDto.java index 78bb83c9..ebf06774 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemOptionDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemOptionDto.java @@ -21,4 +21,9 @@ public class ChargeItemOptionDto { /** 标签 */ private String label; + + public ChargeItemOptionDto(Integer value, String info) { + this.value = value; + this.label = info; + } } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java index 0ca84024..9413ceb6 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java @@ -3,6 +3,7 @@ */ package com.openhis.web.datadictionary.dto; +import com.openhis.common.enums.PublicationStatus; import lombok.Data; import lombok.experimental.Accessors; @@ -32,7 +33,7 @@ public class ItemDefinitionDto { private String title; /** 状态 */ - private Integer statusEnum; + private PublicationStatus statusEnum; /** 机构编码 */ private String orgCode; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java index a2fc70b2..7566cd11 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java @@ -1,7 +1,5 @@ package com.openhis.web.datadictionary.mapper; -import java.util.List; - import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -12,7 +10,6 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.administration.domain.ChargeItemDefinition; import com.openhis.web.datadictionary.dto.ChargeItemDefPageDto; -import com.openhis.web.datadictionary.dto.ItemDefSearchParam; /** * 费用定价管理Mapper接口 @@ -31,7 +28,7 @@ public interface ChargeItemDefSearchMapper extends BaseMapper getMedList(@Param("page") Page page, - @Param(Constants.WRAPPER) LambdaQueryWrapper queryWrapper); + @Param(Constants.WRAPPER) LambdaQueryWrapper queryWrapper); /** * 器具费用定价分页查询 @@ -41,7 +38,7 @@ public interface ChargeItemDefSearchMapper extends BaseMapper getDevList(@Param("page") Page page, - @Param(Constants.WRAPPER) LambdaQueryWrapper queryWrapper); + @Param(Constants.WRAPPER) LambdaQueryWrapper queryWrapper); /** * 活动费用定价分页查询 @@ -51,5 +48,5 @@ public interface ChargeItemDefSearchMapper extends BaseMapper getActList(@Param("page") Page page, - @Param(Constants.WRAPPER) LambdaQueryWrapper queryWrapper); + @Param(Constants.WRAPPER) LambdaQueryWrapper queryWrapper); } \ No newline at end of file diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java index c7272fd2..4ece8aa5 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java @@ -1,5 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; +import com.fasterxml.jackson.annotation.JsonValue; import lombok.AllArgsConstructor; import lombok.Getter; @@ -16,7 +17,14 @@ public enum PublicationStatus { UNKNOWN(4, "unknown", "未知"); + PublicationStatus(int value, String code, String info) { + this.value = value; + this.code = code; + this.info = info; + } + @EnumValue + @JsonValue // 标记响应json值 private final Integer value; private final String code; private final String info; diff --git a/openhis-ui-vue3/package.json b/openhis-ui-vue3/package.json index a820a230..acd8f81f 100644 --- a/openhis-ui-vue3/package.json +++ b/openhis-ui-vue3/package.json @@ -26,6 +26,7 @@ "fuse.js": "6.6.2", "js-cookie": "3.0.5", "jsencrypt": "3.3.2", + "moment": "^2.30.1", "nprogress": "0.2.0", "pinia": "2.1.7", "vue": "3.3.9", @@ -37,9 +38,9 @@ "@vue/compiler-sfc": "3.3.9", "sass": "1.69.5", "unplugin-auto-import": "0.17.1", + "unplugin-vue-setup-extend-plus": "1.0.0", "vite": "5.0.4", "vite-plugin-compression": "0.5.1", - "vite-plugin-svg-icons": "2.0.1", - "unplugin-vue-setup-extend-plus": "1.0.0" + "vite-plugin-svg-icons": "2.0.1" } } diff --git a/openhis-ui-vue3/src/utils/his.js b/openhis-ui-vue3/src/utils/his.js new file mode 100644 index 00000000..25954883 --- /dev/null +++ b/openhis-ui-vue3/src/utils/his.js @@ -0,0 +1,264 @@ + + +// 日期格式化 +export function parseTime(time, pattern) { + if (arguments.length === 0 || !time) { + return null + } + const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}' + let date + if (typeof time === 'object') { + date = time + } else { + if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { + time = parseInt(time) + } else if (typeof time === 'string') { + time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), ''); + } + if ((typeof time === 'number') && (time.toString().length === 10)) { + time = time * 1000 + } + date = new Date(time) + } + const formatObj = { + y: date.getFullYear(), + m: date.getMonth() + 1, + d: date.getDate(), + h: date.getHours(), + i: date.getMinutes(), + s: date.getSeconds(), + a: date.getDay() + } + const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => { + let value = formatObj[key] + // Note: getDay() returns 0 on Sunday + if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] } + if (result.length > 0 && value < 10) { + value = '0' + value + } + return value || 0 + }) + return time_str +} + +// 表单重置 +export function resetForm(refName) { + if (this.$refs[refName]) { + this.$refs[refName].resetFields(); + } +} + +// 添加日期范围 +export function addDateRange(params, dateRange, propName) { + let search = params; + search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {}; + dateRange = Array.isArray(dateRange) ? dateRange : []; + if (typeof (propName) === 'undefined') { + search.params['beginTime'] = dateRange[0]; + search.params['endTime'] = dateRange[1]; + } else { + search.params['begin' + propName] = dateRange[0]; + search.params['end' + propName] = dateRange[1]; + } + return search; +} +export function addDateRanges(params, dateRange1, dateRange2, propName) { + let search = params; + search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {}; + dateRange1 = Array.isArray(dateRange1) ? dateRange1 : []; + dateRange2 = Array.isArray(dateRange2) ? dateRange2 : []; + if (typeof (propName) === 'undefined') { + search.params['beginTime'] = dateRange1[0]; + search.params['endTime'] = dateRange1[1]; + search.params['timeFrom'] = dateRange2[0]; + search.params['timeTo'] = dateRange2[1]; + } else { + search.params['begin' + propName] = dateRange1[0]; + search.params['end' + propName] = dateRange1[1]; + search.params['from' + propName] = dateRange2[0]; + search.params['to' + propName] = dateRange2[1]; + } + return search; +} + +// 回显数据字典 +export function selectDictLabel(datas, value) { + if (value === undefined) { + return ""; + } + var actions = []; + Object.keys(datas).some((key) => { + if (datas[key].value == ('' + value)) { + actions.push(datas[key].label); + return true; + } + }) + if (actions.length === 0) { + actions.push(value); + } + return actions.join(''); +} + +// 回显数据字典（字符串数组） +export function selectDictLabels(datas, value, separator) { + if (value === undefined || value.length ===0) { + return ""; + } + if (Array.isArray(value)) { + value = value.join(","); + } + var actions = []; + var currentSeparator = undefined === separator ? "," : separator; + var temp = value.split(currentSeparator); + Object.keys(value.split(currentSeparator)).some((val) => { + var match = false; + Object.keys(datas).some((key) => { + if (datas[key].value == ('' + temp[val])) { + actions.push(datas[key].label + currentSeparator); + match = true; + } + }) + if (!match) { + actions.push(temp[val] + currentSeparator); + } + }) + return actions.join('').substring(0, actions.join('').length - 1); +} + +// 字符串格式化(%s ) +export function sprintf(str) { + var args = arguments, flag = true, i = 1; + str = str.replace(/%s/g, function () { + var arg = args[i++]; + if (typeof arg === 'undefined') { + flag = false; + return ''; + } + return arg; + }); + return flag ? str : ''; +} + +// 转换字符串，undefined,null等转化为"" +export function parseStrEmpty(str) { + if (!str || str == "undefined" || str == "null") { + return ""; + } + return str; +} + +// 千位分隔 +export function thousandNumber (num) { + return String(num).replace(/\B(?=(\d{3})+(?!\d))/g, ','); // 3是千分位，4是万分位 +}; + +// 数据合并 +export function mergeRecursive(source, target) { + for (var p in target) { + try { + if (target[p].constructor == Object) { + source[p] = mergeRecursive(source[p], target[p]); + } else { + source[p] = target[p]; + } + } catch (e) { + source[p] = target[p]; + } + } + return source; +}; + +/** + * 构造树型结构数据 + * @param {*} data 数据源 + * @param {*} id id字段 默认 'id' + * @param {*} parentId 父节点字段 默认 'parentId' + * @param {*} children 孩子节点字段 默认 'children' + */ +export function handleTree(data, id, parentId, children) { + let config = { + id: id || 'id', + parentId: parentId || 'parentId', + childrenList: children || 'children' + }; + + var childrenListMap = {}; + var nodeIds = {}; + var tree = []; + + for (let d of data) { + let parentId = d[config.parentId]; + if (childrenListMap[parentId] == null) { + childrenListMap[parentId] = []; + } + nodeIds[d[config.id]] = d; + childrenListMap[parentId].push(d); + } + + for (let d of data) { + let parentId = d[config.parentId]; + if (nodeIds[parentId] == null) { + tree.push(d); + } + } + + for (let t of tree) { + adaptToChildrenList(t); + } + + function adaptToChildrenList(o) { + if (childrenListMap[o[config.id]] !== null) { + o[config.childrenList] = childrenListMap[o[config.id]]; + } + if (o[config.childrenList]) { + for (let c of o[config.childrenList]) { + adaptToChildrenList(c); + } + } + } + return tree; +} + +/** +* 参数处理 +* @param {*} params 参数 +*/ +export function tansParams(params) { + let result = '' + for (const propName of Object.keys(params)) { + const value = params[propName]; + var part = encodeURIComponent(propName) + "="; + if (value !== null && value !== "" && typeof (value) !== "undefined") { + if (typeof value === 'object') { + for (const key of Object.keys(value)) { + if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') { + let params = propName + '[' + key + ']'; + var subPart = encodeURIComponent(params) + "="; + result += subPart + encodeURIComponent(value[key]) + "&"; + } + } + } else { + result += part + encodeURIComponent(value) + "&"; + } + } + } + return result +} + + +// 返回项目路径 +export function getNormalPath(p) { + if (p.length === 0 || !p || p == 'undefined') { + return p + }; + let res = p.replace('//', '/') + if (res[res.length - 1] === '/') { + return res.slice(0, res.length - 1) + } + return res; +} + +// 验证是否为blob格式 +export function blobValidate(data) { + return data.type !== 'application/json' +} diff --git a/openhis-ui-vue3/src/views/datadictionary/definition/components/definition.js b/openhis-ui-vue3/src/views/datadictionary/definition/components/definition.js new file mode 100644 index 00000000..e974408f --- /dev/null +++ b/openhis-ui-vue3/src/views/datadictionary/definition/components/definition.js @@ -0,0 +1,36 @@ +import request from '@/utils/request' + +// 查询费用定价信息列表 +export function listDefinition(query) { + return request({ + url: '/dict-manager/definition/item-definition-page', + method: 'get', + params: query + }) +} + +// 初始化下拉选 +export function initOption(query) { + return request({ + url: '/dict-manager/definition/init', + method: 'get', + params: query + }) +} + +// 修改费用定价信息 +export function updateDefinition(data) { + return request({ + url: '/dict-manager/definition/item-definition', + method: 'put', + data: data + }) +} + +// 修改费用定价信息 +export function getOptions() { + return request({ + url: '/dict-manager/definition/status-enum-option', + method: 'get', + }) +} \ No newline at end of file diff --git a/openhis-ui-vue3/src/views/datadictionary/definition/components/edit.vue b/openhis-ui-vue3/src/views/datadictionary/definition/components/edit.vue new file mode 100644 index 00000000..0c9f73a1 --- /dev/null +++ b/openhis-ui-vue3/src/views/datadictionary/definition/components/edit.vue @@ -0,0 +1,215 @@ + + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/views/datadictionary/definition/index.vue b/openhis-ui-vue3/src/views/datadictionary/definition/index.vue new file mode 100644 index 00000000..de908c52 --- /dev/null +++ b/openhis-ui-vue3/src/views/datadictionary/definition/index.vue @@ -0,0 +1,790 @@ + + + \ No newline at end of file From 044f5715900da245be0cb41df5727ec7df743927 Mon Sep 17 00:00:00 2001 From: Zhuangxingyu Date: Wed, 26 Feb 2025 13:32:05 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AE=9A=E4=BB=B7=E4=BB=A3=E7=A0=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ItemDefinitionController.java | 2 +- .../datadictionary/definition/components/definition.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java index 17f3e656..e3f7512c 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java @@ -47,7 +47,7 @@ import lombok.extern.slf4j.Slf4j; * @date 2025-02-21 */ @RestController -@RequestMapping("/dict-manager/definition") +@RequestMapping("/dict-dictionary/definition") @Slf4j public class ItemDefinitionController { diff --git a/openhis-ui-vue3/src/views/datadictionary/definition/components/definition.js b/openhis-ui-vue3/src/views/datadictionary/definition/components/definition.js index e974408f..3bc24713 100644 --- a/openhis-ui-vue3/src/views/datadictionary/definition/components/definition.js +++ b/openhis-ui-vue3/src/views/datadictionary/definition/components/definition.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询费用定价信息列表 export function listDefinition(query) { return request({ - url: '/dict-manager/definition/item-definition-page', + url: '/dict-dictionary/definition/item-definition-page', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listDefinition(query) { // 初始化下拉选 export function initOption(query) { return request({ - url: '/dict-manager/definition/init', + url: '/dict-dictionary/definition/init', method: 'get', params: query }) @@ -21,7 +21,7 @@ export function initOption(query) { // 修改费用定价信息 export function updateDefinition(data) { return request({ - url: '/dict-manager/definition/item-definition', + url: '/dict-dictionary/definition/item-definition', method: 'put', data: data }) @@ -30,7 +30,7 @@ export function updateDefinition(data) { // 修改费用定价信息 export function getOptions() { return request({ - url: '/dict-manager/definition/status-enum-option', + url: '/dict-dictionary/definition/status-enum-option', method: 'get', }) } \ No newline at end of file From a9325aa66c7b5c72ae6143446d1f3c24aa2bc298 Mon Sep 17 00:00:00 2001 From: anxin Date: Wed, 26 Feb 2025 13:36:48 +0800 Subject: [PATCH 04/25] Location --- .../controller/CabinetLocationController.java | 141 ++++++++++++++++++ .../controller/OrganizationController.java | 2 +- .../basedatamanage/dto/LocationQueryDto.java | 67 +++++++++ .../dto/LocationQueryParam.java | 25 ++++ .../dto/OrganizationQueryDto.java | 6 + 5 files changed, 240 insertions(+), 1 deletion(-) create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/CabinetLocationController.java create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationQueryDto.java create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationQueryParam.java diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/CabinetLocationController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/CabinetLocationController.java new file mode 100644 index 00000000..aa5d0cc1 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/CabinetLocationController.java @@ -0,0 +1,141 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.basedatamanage.controller; + +import java.util.Arrays; +import java.util.HashSet; + +import javax.servlet.http.HttpServletRequest; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.core.common.core.domain.R; +import com.core.common.utils.MessageUtils; +import com.core.common.utils.bean.BeanUtils; +import com.openhis.administration.domain.Location; +import com.openhis.administration.mapper.LocationMapper; +import com.openhis.administration.service.ILocationService; +import com.openhis.common.constant.PromptMsgConstant; +import com.openhis.common.enums.LocationForm; +import com.openhis.common.utils.HisPageUtils; +import com.openhis.common.utils.HisQueryUtils; +import com.openhis.web.basedatamanage.dto.LocationQueryDto; +import com.openhis.web.basedatamanage.dto.LocationQueryParam; + +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +/** + * 位置管理Controller业务层处理 + * + * @author + * @date 2025-02-21 + */ +@RestController +@RequestMapping("/basedatamanage/cabinet-location") +@Slf4j +@AllArgsConstructor +public class CabinetLocationController { + + private final ILocationService locationService; + + @Autowired + private LocationMapper locationMapper; + + /** + * 位置分页列表 + * + * @param locationQueryParam 查询字段 + * @param searchKey 模糊查询关键字 + * @param pageNo 当前页码 + * @param pageSize 查询条数 + * @param request 请求数据 + * @return 位置分页列表 + */ + @GetMapping(value = "/cabinet-location") + public R getLocationPage(LocationQueryParam locationQueryParam, + @RequestParam(value = "searchKey", defaultValue = "") String searchKey, + @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) { + + // 构建查询条件 + QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(locationQueryParam, searchKey, + new HashSet<>(Arrays.asList("name", "py_str", "wb_str")), request); + + // 设置排序 + queryWrapper.orderByDesc("create_time"); + // 执行分页查询并转换为 locationQueryDtoPage + Page locationQueryDtoPage = + HisPageUtils.selectPage(locationMapper, queryWrapper, pageNo, pageSize, LocationQueryDto.class); + + return R.ok(locationQueryDtoPage, + MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"位置信息"})); + } + + /** + * 添加库房位置信息 + * + * @param locationQueryDto 位置信息 + */ + @PostMapping("/cabinet-location") + public R addLocation(@Validated @RequestBody LocationQueryDto locationQueryDto) { + + LocationQueryDto locationQuery = new LocationQueryDto(LocationForm.CABINET); + Location location = new Location(); + BeanUtils.copyProperties(locationQuery, location); + + boolean saveLocationSuccess = locationService.save(location); + + return saveLocationSuccess + ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[] {"位置信息"})) + : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00003, new Object[] {"位置信息"})); + } + + /** + * 获取位置需要编辑的信息 + * + * @param locationId 位置信息 + */ + @GetMapping("/cabinet-location-editById") + public R getLocationById(@Validated @RequestParam Long locationId) { + + Location location = locationService.getById(locationId); + return R.ok(location, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"位置信息"})); + } + + /** + * 编辑位置信息 + * + * @param location 位置信息 + */ + @PutMapping("/cabinet-location") + public R editLocation(@Validated @RequestBody Location location) { + + boolean updateLocationSuccess = locationService.updateById(location); + + return updateLocationSuccess + ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"位置信息"})) + : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, new Object[] {"位置信息"})); + } + + /** + * 删除位置信息 + * + * @param locationId 主表id + */ + @DeleteMapping("/cabinet-location") + public R deleteLocation(@RequestParam Long locationId) { + + boolean deleteLocationSuccess = locationService.removeById(locationId); + + return deleteLocationSuccess + ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00005, new Object[] {"位置信息"})) + : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00006, new Object[] {"位置信息"})); + } + +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java index 33a7ba03..f551b232 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java @@ -77,7 +77,7 @@ public class OrganizationController { * @return 机构分页列表 */ @GetMapping(value = "/organization") - public R getOrganizationPage(@RequestBody OrgQueryParam orgQueryParam, + public R getOrganizationPage(OrgQueryParam orgQueryParam, @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/basedatamanage/dto/LocationQueryDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationQueryDto.java new file mode 100644 index 00000000..3fd2b5a0 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationQueryDto.java @@ -0,0 +1,67 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.basedatamanage.dto; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.openhis.common.enums.*; + +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * @author + * @date 2025-02-21 + */ +@Data +@Accessors(chain = true) +public class LocationQueryDto { + + /** ID */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** 编码 */ + private String busNo; + + /** 名称 */ + private String name; + + /** 状态编码 */ + private LocationStatus statusEnum; + + /** 操作状态 */ + private LocationBedStatus operationalEnum; + + /** 模式编码 */ + private LocationMode modeEnum; + + /** 模式编码 */ + private String typeCode; + + /** 功能编码 */ + private String typeJson; + + /** 拼音码 */ + private String pyStr; + + /** 五笔码 */ + private String wbStr; + + /** 物理形式枚举 */ + private LocationForm formEnum; + + /** 机构编码 */ + private Long organizationId; + + /** 显示顺序 */ + private Integer displayOrder; + +// public LocationQueryDto(LocationForm form, String busNo, LocationMode mode) { + public LocationQueryDto(LocationForm form) { + this.statusEnum = LocationStatus.ACTIVE; + this.formEnum = form; +// this.modeEnum = mode; + } +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationQueryParam.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationQueryParam.java new file mode 100644 index 00000000..97f71502 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationQueryParam.java @@ -0,0 +1,25 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.basedatamanage.dto; + +import java.io.Serializable; + +import com.openhis.common.enums.LocationMode; + +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 科室分页查询条件 + * + * @author + * @date 2025-02-21 + */ +@Data +@Accessors(chain = true) +public class LocationQueryParam implements Serializable { + /** 模式编码 */ + private LocationMode modeEnum; + +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationQueryDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationQueryDto.java index 9f092423..1525cd94 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationQueryDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationQueryDto.java @@ -3,6 +3,9 @@ */ package com.openhis.web.basedatamanage.dto; +import java.util.ArrayList; +import java.util.List; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.openhis.common.enums.OrganizationClass; @@ -52,4 +55,7 @@ public class OrganizationQueryDto { /** 显示顺序 */ private Integer displayOrder; + + List children = new ArrayList<>(); + } From 775b8a9e667081f208b45ab72e1f3d64daaf4b99 Mon Sep 17 00:00:00 2001 From: liupanting Date: Wed, 26 Feb 2025 13:59:08 +0800 Subject: [PATCH 05/25] up --- .../datadictionary/controller/DiseaseManageController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 814b91b3..320770f0 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 @@ -102,10 +102,11 @@ public class DiseaseManageController { */ @GetMapping("/information-one/{id}") public R getDiseaseOne(@PathVariable("id") Long id) { - + DiseaseManageDto diseaseManageDto = new DiseaseManageDto(); // 根据ID查询【病种目录】 - ConditionDefinition byId = iConditionDefinitionService.getById(id); - return R.ok(byId); + ConditionDefinition conditionDefinition = iConditionDefinitionService.getById(id); + BeanUtils.copyProperties(conditionDefinition, diseaseManageDto); + return R.ok(diseaseManageDto); } /** From 153011c18c0621b57af8e84bbdd6469cf0eb1ff1 Mon Sep 17 00:00:00 2001 From: "Zhang.YC" Date: Wed, 26 Feb 2025 14:29:14 +0800 Subject: [PATCH 06/25] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E6=A0=91=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OrganizationController.java | 74 +++++++++++++++---- .../dto/OrganizationQueryDto.java | 6 ++ .../administration/domain/Organization.java | 3 + 3 files changed, 67 insertions(+), 16 deletions(-) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java index 33a7ba03..70b8b66f 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java @@ -3,10 +3,7 @@ */ package com.openhis.web.basedatamanage.controller; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; @@ -16,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -26,8 +22,6 @@ import com.openhis.administration.mapper.OrganizationMapper; import com.openhis.administration.service.IOrganizationService; import com.openhis.common.constant.PromptMsgConstant; import com.openhis.common.enums.OrganizationType; -import com.openhis.common.utils.HisPageUtils; -import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.basedatamanage.dto.OrgQueryParam; import com.openhis.web.basedatamanage.dto.OrganizationInitDto; import com.openhis.web.basedatamanage.dto.OrganizationQueryDto; @@ -82,15 +76,22 @@ public class OrganizationController { @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) { - // 构建查询条件 - QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(orgQueryParam, searchKey, - new HashSet<>(Arrays.asList("name", "py_str", "wb_str")), request); - - // 设置排序 - queryWrapper.orderByDesc("create_time"); - // 执行分页查询并转换为 orgQueryDtoPage - Page orgQueryDtoPage = - HisPageUtils.selectPage(organizationMapper, queryWrapper, pageNo, pageSize, OrganizationQueryDto.class); + // // 构建查询条件 + // QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(orgQueryParam, searchKey, + // new HashSet<>(Arrays.asList("name", "py_str", "wb_str")), request); + // + // // 设置排序 + // queryWrapper.orderByDesc("create_time"); + // // 执行分页查询并转换为 orgQueryDtoPage + // Page orgQueryDtoPage = + // HisPageUtils.selectPage(organizationMapper, queryWrapper, pageNo, pageSize, OrganizationQueryDto.class); + // 查询机构列表 + Page page = organizationService.page(new Page<>(pageNo, pageSize)); + List organizationList = page.getRecords(); + // 将机构列表转为树结构 + List orgTree = buildTree(organizationList); + Page orgQueryDtoPage = new Page<>(pageNo, pageSize, page.getCurrent()); + orgQueryDtoPage.setRecords(orgTree); return R.ok(orgQueryDtoPage, MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"机构信息"})); @@ -184,4 +185,45 @@ public class OrganizationController { : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, new Object[] {"机构活动标识"})); } + /** + * 将机构列表转换为树结构 + * + * @param records 机构列表 + * @return tree + */ + private List buildTree(List records) { + // 按b_no的层级排序，确保父节点先处理 + List sortedRecords = records.stream() + .sorted(Comparator.comparingInt(r -> r.getBusNo().split("\\.").length)).collect(Collectors.toList()); + + Map nodeMap = new HashMap<>(); + List tree = new ArrayList<>(); + + for (Organization record : sortedRecords) { + String bNo = record.getBusNo(); + String[] parts = bNo.split("\\."); + OrganizationQueryDto node = new OrganizationQueryDto(); + BeanUtils.copyProperties(record, node); + // 将当前节点加入映射 + nodeMap.put(bNo, node); + + if (parts.length == 1) { + // 根节点 + tree.add(node); + } else { + // 获取父节点的b_no（去掉最后一部分） + String parentBNo = String.join(".", Arrays.copyOf(parts, parts.length - 1)); + OrganizationQueryDto parent = nodeMap.get(parentBNo); + + if (parent != null) { + parent.getChildren().add(node); + } else { + // 处理父节点不存在的情况（例如数据缺失） + // 可根据需求调整为将节点加入根或抛出异常 + } + } + } + return tree; + } + } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationQueryDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationQueryDto.java index 9f092423..c1f9f8fd 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationQueryDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationQueryDto.java @@ -3,6 +3,9 @@ */ package com.openhis.web.basedatamanage.dto; +import java.util.ArrayList; +import java.util.List; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.openhis.common.enums.OrganizationClass; @@ -52,4 +55,7 @@ public class OrganizationQueryDto { /** 显示顺序 */ private Integer displayOrder; + + /** 子集合 */ + private List children = new ArrayList<>(); } diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java index 257970b4..3ec0f9c2 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java @@ -4,6 +4,8 @@ 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.OrganizationClass; import com.openhis.common.enums.OrganizationType; @@ -25,6 +27,7 @@ public class Organization extends HisBaseEntity { /** ID */ @TableId(type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** 编码 */ From 4078acba451bb59db0dd2c02668a0b5b26e46c7d Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Wed, 26 Feb 2025 15:54:44 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HealthcareServiceController.java | 73 ++++++++++++++++ .../dto/HealthcareServiceInitDto.java | 48 +++++++++++ .../mapper/HealthcareServiceBizMapper.java | 10 +++ .../src/main/resources/application.yml | 2 + .../HealthcareServiceBizMapper.xml | 7 ++ .../openhis/common/utils/HisQueryUtils.java | 86 ++++++++++--------- .../domain/HealthcareService.java | 6 +- 7 files changed, 185 insertions(+), 47 deletions(-) create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/mapper/HealthcareServiceBizMapper.java create mode 100644 openhis-server/openhis-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java new file mode 100644 index 00000000..d45cb09f --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java @@ -0,0 +1,73 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.basicservice.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.core.common.core.domain.R; +import com.openhis.administration.domain.Location; +import com.openhis.administration.mapper.LocationMapper; +import com.openhis.administration.service.IHealthcareServiceService; +import com.openhis.common.enums.AccountStatus; +import com.openhis.common.utils.HisPageUtils; +import com.openhis.common.utils.HisQueryUtils; +import com.openhis.medication.domain.Medication; +import com.openhis.medication.domain.MedicationQueryDto; +import com.openhis.web.basicservice.dto.HealthcareServiceInitDto; +import com.openhis.web.basicservice.mapper.HealthcareServiceBizMapper; +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.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +/** + * 服务管理 controller + */ +@RestController +@RequestMapping("/basic-service/healthcare") +@Slf4j +@AllArgsConstructor +public class HealthcareServiceController { + + private final IHealthcareServiceService iHealthcareServiceService; + private final HealthcareServiceBizMapper healthcareServiceBizMapper; + private final LocationMapper locationMapper; + + /** + * 服务管理基础数据初始化 + */ + @GetMapping(value = "/init") + public R init(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, + @RequestParam(value = "searchKey", defaultValue = "") String searchKey) { + HealthcareServiceInitDto healthcareServiceInitDto = new HealthcareServiceInitDto(); + // 活动标记 + List activeFlagOptions = Stream.of(AccountStatus.values()) + .map(status -> new HealthcareServiceInitDto.activeFlagOption(status.getValue(), status.getInfo())) + .collect(Collectors.toList()); + healthcareServiceInitDto.setActiveFlagOptions(activeFlagOptions); + // 构建查询条件 + QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(null, searchKey, + new HashSet<>(Arrays.asList("name")), null); + Page LocationPage = HisPageUtils.selectPage( + locationMapper, queryWrapper, pageNo, pageSize, Location.class); + List LocationList = LocationPage.getRecords(); + // 位置信息 + List locationIdOptions = LocationList.stream() + .map(location -> new HealthcareServiceInitDto.locationIdOption(location.getId(), location.getName())) + .collect(Collectors.toList()); + healthcareServiceInitDto.setLocationIdOptions(locationIdOptions); + return R.ok(healthcareServiceInitDto); + } + + +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java new file mode 100644 index 00000000..4dc1b3ce --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java @@ -0,0 +1,48 @@ +package com.openhis.web.basicservice.dto; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.List; + +/** + * 服务管理 基础数据 + */ +@Data +@Accessors(chain = true) +public class HealthcareServiceInitDto { + + + private List activeFlagOptions; + private List locationIdOptions; + + + /** + * 活动标记 + */ + @Data + public static class activeFlagOption { + private Integer value; + private String label; + + public activeFlagOption(Integer value, String label) { + this.value = value; + this.label = label; + } + } + + /** + * 位置信息 + */ + @Data + public static class locationIdOption { + private Long value; + private String label; + + public locationIdOption(Long value, String label) { + this.value = value; + this.label = label; + } + } + +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/mapper/HealthcareServiceBizMapper.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/mapper/HealthcareServiceBizMapper.java new file mode 100644 index 00000000..a4444503 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/mapper/HealthcareServiceBizMapper.java @@ -0,0 +1,10 @@ +package com.openhis.web.basicservice.mapper; + +import org.springframework.stereotype.Repository; + +/** + * 服务管理 自定义Mapper + */ +@Repository +public interface HealthcareServiceBizMapper { +} diff --git a/openhis-server/openhis-application/src/main/resources/application.yml b/openhis-server/openhis-application/src/main/resources/application.yml index 4144e50a..46f4f629 100644 --- a/openhis-server/openhis-application/src/main/resources/application.yml +++ b/openhis-server/openhis-application/src/main/resources/application.yml @@ -47,6 +47,8 @@ user: # Spring配置 spring: + main: + allow-circular-references: true # 资源信息 messages: # 国际化资源文件路径 diff --git a/openhis-server/openhis-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml new file mode 100644 index 00000000..85dec8ae --- /dev/null +++ b/openhis-server/openhis-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/utils/HisQueryUtils.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/utils/HisQueryUtils.java index c2765cae..057de430 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/utils/HisQueryUtils.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/utils/HisQueryUtils.java @@ -35,6 +35,50 @@ public class HisQueryUtils { QueryWrapper queryWrapper = new QueryWrapper<>(); // 添加租户id查询条件 queryWrapper.eq(CommonConstants.Common.TENANT_ID, getCurrentTenantId()); + // 处理模糊查询关键字 + if (searchKey != null && !searchKey.isEmpty() && searchFields != null && !searchFields.isEmpty()) { + queryWrapper.and(wrapper -> { + for (String field : searchFields) { + wrapper.or().like(field, searchKey); + } + }); + } + // 处理时间段查询 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DateUtils.YYYY_MM_DD); + if (request != null) { + Map parameterMap = request.getParameterMap(); + for (Map.Entry entry : parameterMap.entrySet()) { + String paramName = entry.getKey(); + // 检查参数名是否以 "STime" 或 "ETime" 结尾 + if (paramName.endsWith(CommonConstants.Common.S_TIME) + || paramName.endsWith(CommonConstants.Common.E_TIME)) { + // 提取字段名（去掉 "STime" 或 "ETime" 后缀） + String fieldName = paramName.substring(0, paramName.length() - 5); + // 驼峰转下划线 + String dbFieldName = camelToUnderline(fieldName); + // 获取对应的 STime 和 ETime 值 + String startValue = getParameterValue(request, fieldName + CommonConstants.Common.S_TIME); + String endValue = getParameterValue(request, fieldName + CommonConstants.Common.E_TIME); + // 如果 Start 和 End 都有值，则添加时间段查询条件 + if (startValue != null && endValue != null) { + try { + SimpleDateFormat dateFormat; + if (isValidFormat(formatter, startValue)) { + dateFormat = new SimpleDateFormat(DateUtils.YYYY_MM_DD); + } else { + dateFormat = new SimpleDateFormat(DateUtils.YYYY_MM_DD_HH_MM_SS); + } + Date startDate = dateFormat.parse(startValue); + Date endDate = dateFormat.parse(endValue); + queryWrapper.ge(dbFieldName, startDate); // 大于等于 STime + queryWrapper.le(dbFieldName, endDate); // 小于等于 ETime + } catch (ParseException e) { + e.printStackTrace(); + } + } + } + } + } if (entity == null) { return queryWrapper; } @@ -54,48 +98,6 @@ public class HisQueryUtils { e.printStackTrace(); } } - // 处理模糊查询关键字 - if (searchKey != null && !searchKey.isEmpty() && searchFields != null && !searchFields.isEmpty()) { - queryWrapper.and(wrapper -> { - for (String field : searchFields) { - wrapper.or().like(field, searchKey); - } - }); - } - // 处理时间段查询 - DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DateUtils.YYYY_MM_DD); - Map parameterMap = request.getParameterMap(); - for (Map.Entry entry : parameterMap.entrySet()) { - String paramName = entry.getKey(); - // 检查参数名是否以 "STime" 或 "ETime" 结尾 - if (paramName.endsWith(CommonConstants.Common.S_TIME) - || paramName.endsWith(CommonConstants.Common.E_TIME)) { - // 提取字段名（去掉 "STime" 或 "ETime" 后缀） - String fieldName = paramName.substring(0, paramName.length() - 5); - // 驼峰转下划线 - String dbFieldName = camelToUnderline(fieldName); - // 获取对应的 STime 和 ETime 值 - String startValue = getParameterValue(request, fieldName + CommonConstants.Common.S_TIME); - String endValue = getParameterValue(request, fieldName + CommonConstants.Common.E_TIME); - // 如果 Start 和 End 都有值，则添加时间段查询条件 - if (startValue != null && endValue != null) { - try { - SimpleDateFormat dateFormat; - if (isValidFormat(formatter, startValue)) { - dateFormat = new SimpleDateFormat(DateUtils.YYYY_MM_DD); - } else { - dateFormat = new SimpleDateFormat(DateUtils.YYYY_MM_DD_HH_MM_SS); - } - Date startDate = dateFormat.parse(startValue); - Date endDate = dateFormat.parse(endValue); - queryWrapper.ge(dbFieldName, startDate); // 大于等于 STime - queryWrapper.le(dbFieldName, endDate); // 小于等于 ETime - } catch (ParseException e) { - e.printStackTrace(); - } - } - } - } return queryWrapper; } diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java index 2076efff..e77e76b0 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java @@ -1,12 +1,8 @@ package com.openhis.administration.domain; -import java.math.BigDecimal; -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 lombok.Data; import lombok.EqualsAndHashCode; @@ -44,7 +40,7 @@ public class HealthcareService extends HisBaseEntity { private String specialtyCode; /** 地点 */ - private String locationId; + private Long locationId; /** 服务名称 */ private String name; From 3ebeb1a013af2fdb7ed9b3fce863214617205eda Mon Sep 17 00:00:00 2001 From: duhe Date: Wed, 26 Feb 2025 15:55:44 +0800 Subject: [PATCH 08/25] =?UTF-8?q?=E7=96=BE=E7=97=85=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=8D=AF=E5=93=81?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E7=94=BB=E9=9D=A2=E4=BF=AE=E6=AD=A3=20up=20b?= =?UTF-8?q?y=20dh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../catalog/disease/components/disease.js | 32 +- .../src/views/catalog/disease/index.vue | 72 ++-- .../medicine/components/medicineDialog.vue | 106 ++--- .../components/medicineViewDialog.vue | 363 ++++++++++++++++++ .../src/views/catalog/medicine/index.vue | 87 +++-- 5 files changed, 545 insertions(+), 115 deletions(-) create mode 100644 openhis-ui-vue3/src/views/catalog/medicine/components/medicineViewDialog.vue diff --git a/openhis-ui-vue3/src/views/catalog/disease/components/disease.js b/openhis-ui-vue3/src/views/catalog/disease/components/disease.js index 6ab99b62..e8f173a1 100644 --- a/openhis-ui-vue3/src/views/catalog/disease/components/disease.js +++ b/openhis-ui-vue3/src/views/catalog/disease/components/disease.js @@ -36,13 +36,13 @@ export function editDisease(data) { }) } -// 删除病种目录 -export function delUser(userId) { - return request({ - url: '/system/user/' + userId, - method: 'delete' - }) -} +// // 删除病种目录 +// export function delUser(userId) { +// return request({ +// url: '/system/user/' + userId, +// method: 'delete' +// }) +// } // 病种目录分类查询 export function getDiseaseCategory() { @@ -50,4 +50,22 @@ export function getDiseaseCategory() { url: '/datadictionary/disease/information-category', method: 'get' }) +} + +// 停用病种目录 +export function stopDisease(ids) { + return request({ + url: '/datadictionary/disease/information-stop', + method: 'put', + data: ids + }) +} + +// 启用病种目录 +export function startDisease(ids) { + return request({ + url: '/datadictionary/disease/information-start', + method: 'put', + data: ids + }) } \ No newline at end of file diff --git a/openhis-ui-vue3/src/views/catalog/disease/index.vue b/openhis-ui-vue3/src/views/catalog/disease/index.vue index 629e75c7..b204e3c3 100644 --- a/openhis-ui-vue3/src/views/catalog/disease/index.vue +++ b/openhis-ui-vue3/src/views/catalog/disease/index.vue @@ -12,19 +12,33 @@ style="margin-bottom: 20px" /> --> - + > + + + @@ -287,18 +301,22 @@ import { addDisease, getDiseaseCategory, getDiseaseOne, + stopDisease, + startDisease } from "./components/disease"; const router = useRouter(); const { proxy } = getCurrentInstance(); -const { sys_normal_disable, sys_user_sex } = proxy.useDict( "sys_normal_disable","sys_user_sex"); +const { sys_normal_disable, sys_user_sex } = proxy.useDict( + "sys_normal_disable", + "sys_user_sex" +); const diseaseList = ref([]); const open = ref(false); const loading = ref(true); const showSearch = ref(true); const ids = ref([]); -const selectedData = ref([]); // 存储选择的行数据 const single = ref(true); const multiple = ref(true); const total = ref(0); @@ -317,12 +335,10 @@ const data = reactive({ status: undefined, // 状态（包括 1：预置，2：启用，3：停用） }, rules: { - name: [ - { required: true, message: "名称不能为空", trigger: "blur" }, - ], + name: [{ required: true, message: "名称不能为空", trigger: "blur" }], conditionCode: [ { required: true, message: "编码不能为空", trigger: "blur" }, - ] + ], }, }); @@ -374,17 +390,12 @@ function handleQuery() { // handleQuery(); // }; /** 启用按钮操作 */ -function handleStart() { - selectedData.value.forEach((item) => { - item.statusEnum = "2"; - }); - const data = selectedData.value; - // selectedData - console.log(data, "data"); +function handleStart(row) { + const stardIds = row.id || ids.value; proxy.$modal .confirm("是否确定启用数据！") .then(function () { - return editDisease(data); + return startDisease(stardIds); }) .then(() => { getList(); @@ -393,16 +404,12 @@ function handleStart() { .catch(() => {}); } /** 停用按钮操作 */ -function handleClose() { - selectedData.value.forEach((item) => { - item.statusEnum = "3"; - }); - const data = selectedData.value; - console.log(data, "data"); +function handleClose(row) { + const stopIds = row.id || ids.value; proxy.$modal .confirm("是否确认停用数据！") .then(function () { - return editDisease(data); + return stopDisease(stopIds); }) .then(() => { getList(); @@ -435,7 +442,8 @@ function handleExport() { /** 选择条数 */ function handleSelectionChange(selection) { console.log(selection, "selection"); - selectedData.value = selection.map((item) => ({ ...item })); // 存储选择的行数据 + // selectedData.value = selection.map((item) => ({ ...item })); // 存储选择的行数据 + ids.value = selection.map(item => item.userId); single.value = selection.length != 1; multiple.value = !selection.length; } @@ -487,9 +495,7 @@ function submitForm() { // ? (form.value.statusEnum = "3") // : (form.value.statusEnum = "2"); console.log(form.value, "editDisease", form.value.statusEnum); - let param = []; - param.push(form.value); - editDisease(param).then((response) => { + editDisease(form.value).then((response) => { proxy.$modal.msgSuccess("修改成功"); open.value = false; getList(); @@ -518,3 +524,9 @@ function handleView(row) { getDiseaseCategoryList(); getList(); + \ No newline at end of file diff --git a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue index 73839c75..7893cf47 100644 --- a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue +++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue @@ -28,18 +28,12 @@ v-model="form.name" placeholder="请输入药品名" maxlength="30" - :disabled="form.id != undefined" /> - + @@ -50,28 +44,17 @@ v-model="form.conditionCode" placeholder="" maxlength="30" - :disabled="form.id != undefined" /> - + - + @@ -82,7 +65,6 @@ v-model="form.conditionCode" placeholder="" maxlength="30" - :disabled="form.id != undefined" /> @@ -146,28 +128,17 @@ v-model="form.conditionCode" placeholder="" maxlength="30" - :disabled="form.id != undefined" /> - + - + @@ -208,7 +179,11 @@ - + - + - + - + - - - + @@ -349,7 +329,11 @@ - + - + @@ -503,7 +491,7 @@ @@ -575,14 +563,32 @@ const data = reactive({ const { queryParams, form, rules } = toRefs(data); +const props = defineProps({ + item: { + type: Object, + required: false, + }, +}); + // 显示弹框 function show() { // queryParams.roleId = props.roleId; // getList(); visible.value = true; } +// 显示弹框 +function edit() { + // queryParams.roleId = props.roleId; + // getList(); + console.log(props, "22222"); + console.log(props.item); + console.log("props.item"); + form.value = props.item; + visible.value = true; +} defineExpose({ show, + edit, }); diff --git a/openhis-ui-vue3/src/views/catalog/medicine/index.vue b/openhis-ui-vue3/src/views/catalog/medicine/index.vue index 0bc0e1ab..eb86b449 100644 --- a/openhis-ui-vue3/src/views/catalog/medicine/index.vue +++ b/openhis-ui-vue3/src/views/catalog/medicine/index.vue @@ -129,7 +129,7 @@ type="primary" plain icon="Plus" - @click="openMedicineDialog" + @click="openAddMedicine" v-hasPermi="['system:user:add']" >添加新项目 @@ -154,7 +154,7 @@ >停用 - + @@ -255,8 +255,8 @@ @@ -400,7 +400,7 @@ link type="primary" icon="Edit" - @click="handleUpdate(scope.row)" + @click="openEditMedicine(scope.row)" v-hasPermi="['system:user:edit']" >编辑 @@ -408,7 +408,7 @@ link type="primary" icon="View" - @click="handleView(scope.row)" + @click="openViewMedicine(scope.row)" v-hasPermi="['system:user:remove']" >查看 @@ -424,7 +424,12 @@ /> - + + + - + - + - + - + @@ -83,7 +83,7 @@ - + - @@ -109,18 +108,18 @@ style="width: 100%" > - + { - orgTypeOption.value = res.data.records; + orgTypeOption.value = res.data; }); } } +function reset() { + form.value.busNo = undefined; + form.value.name = undefined; + form.value.typeEnum = undefined; + form.value.busNoParent = undefined; + proxy.resetForm("orgRef"); +} + function getPageList() { loading.value = false; getList(queryParams.value).then((res) => { organization.value = res.data.records; - console.log(res.data.records); - + total.value = res.data.total; loading.value = false; }); } function handleAdd() { + reset(); initOption(); - proxy.resetForm("orgRef"); open.value = true; + console.log(form.value); } -function handelEdit(id) { +function handelEdit(row) { + reset(); initOption(); - getOrgDetail(id).then((res) => { - form.value = res.data.records; - }); + // if (row.busNo.lastIndexOf(".") != -1) { + // row.busNoParent = row.busNo.substring(0, row.busNo.lastIndexOf(".")); + // row.busNo = row.busNo.substring( + // row.busNo.lastIndexOf(".") + 1, + // row.busNo.length + // ); + // } + form.value.busNo = row.busNo; + form.value.name = row.name; + form.value.typeEnum = row.typeEnum; + form.value.busNoParent = undefined; open.value = true; } function cancel() { open.value = false; - proxy.resetForm("orgRef"); + reset(); } -/** - * 新增提交 - */ function submitForm() { proxy.$refs["orgRef"].validate((valid) => { if (valid) { - if (form.value.id != undefined) { + if (form.value.busNoParent) { + form.value.busNo = form.value.busNoParent + "." + form.value.busNo; + } + if (form.value.id == undefined) { addOrganization(form.value).then((res) => { proxy.$modal.msgSuccess(res.msg); open.value = false; @@ -255,11 +273,24 @@ function handleDisabled(id) { }); } -function handleSelectionChange() { - console.log(orgTableRef.value.getSelectionRows()); +function handelEnable(id){ + enableOrg(id).then((res) => { + proxy.$modal.msgSuccess(res.msg); + getList(); + }); +} +function handleSelectionChange() { selectRowIds.value = orgTableRef.value .getSelectionRows() .map((item) => item.id); } + +// function handleAddInferior(row) { +// initOption(); +// proxy.resetForm("orgRef"); +// open.value = true; +// form.value.busNoParent = row.busNo; +// row.busNo = undefined; +// } \ No newline at end of file