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 e670e0fa..efe91db8 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 @@ -22,14 +22,11 @@ import com.openhis.administration.domain.ChargeItemDefApp; import com.openhis.administration.domain.ChargeItemDefinition; import com.openhis.administration.service.IChargeItemDefAppService; import com.openhis.administration.service.IChargeItemDefinitionService; -import com.openhis.administration.service.IDeviceDefinitionService; import com.openhis.common.constant.PromptMsgConstant; -import com.openhis.medication.service.IMedicationDefinitionService; import com.openhis.web.datadictionary.dto.ChargeItemDefPageDto; import com.openhis.web.datadictionary.dto.ItemDefSearchParam; import com.openhis.web.datadictionary.dto.ItemDefinitionDto; import com.openhis.web.datadictionary.mapper.ChargeItemDefSearchMapper; -import com.openhis.workflow.service.IActivityDefinitionService; import lombok.extern.slf4j.Slf4j; @@ -50,12 +47,12 @@ public class ItemDefinitionController { private IChargeItemDefAppService chargeItemDefAppService; @Autowired(required = false) private ChargeItemDefSearchMapper chargeItemDefSearchMapper; - @Autowired(required = false) - private IMedicationDefinitionService medicationDefinitionService; - @Autowired(required = false) - private IDeviceDefinitionService deviceDefinitionService; - @Autowired(required = false) - private IActivityDefinitionService activityDefinitionService; +// @Autowired(required = false) +// private IMedicationDefinitionService medicationDefinitionService; +// @Autowired(required = false) +// private IDeviceDefinitionService deviceDefinitionService; +// @Autowired(required = false) +// private IActivityDefinitionService activityDefinitionService; /** * 项目定价列表 @@ -141,7 +138,8 @@ public class ItemDefinitionController { chargeItemDefinitionPage.setTotal(0); chargeItemDefinitionPage.setRecords(new ArrayList<>()); } - return R.ok(chargeItemDefinitionPage); + return R.ok(chargeItemDefinitionPage, + MessageUtils.createMessage(PromptMsgConstant.Common.M00009, null)); } else if (DefinitionTypeEnum.DEVICE.getCode().equals(itemDefSearchParam.getDefinitionType())) { chargeItemDefinitionList = chargeItemDefSearchMapper.getDevList(itemDefSearchParam, pageNo, pageSize, skipCount); @@ -154,7 +152,8 @@ public class ItemDefinitionController { chargeItemDefinitionPage.setTotal(0); chargeItemDefinitionPage.setRecords(new ArrayList<>()); } - return R.ok(chargeItemDefinitionPage); + return R.ok(chargeItemDefinitionPage, + MessageUtils.createMessage(PromptMsgConstant.Common.M00009, null)); } else if (DefinitionTypeEnum.ACTIVITY.getCode().equals(itemDefSearchParam.getDefinitionType())) { chargeItemDefinitionList = chargeItemDefSearchMapper.getActList(itemDefSearchParam, pageNo, pageSize, skipCount); @@ -167,9 +166,10 @@ public class ItemDefinitionController { chargeItemDefinitionPage.setTotal(0); chargeItemDefinitionPage.setRecords(new ArrayList<>()); } - return R.ok(chargeItemDefinitionPage); + return R.ok(chargeItemDefinitionPage, + MessageUtils.createMessage(PromptMsgConstant.Common.M00009, null)); } else { - return R.ok(); + return R.ok(new Page<>(), MessageUtils.createMessage(PromptMsgConstant.Common.M00009, null)); } } @@ -185,7 +185,7 @@ public class ItemDefinitionController { ChargeItemDefinition chargeItemDefinition = new ChargeItemDefinition(); BeanUtils.copyProperties(itemDefinitionDto, chargeItemDefinition); if (!chargeItemDefinitionService.updateById(chargeItemDefinition)) { - return R.fail(); + return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null)); } // 更新收费项目adm_charge_item_def_app diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefSearchParam.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefSearchParam.java index 4b44e9a2..3b3a3b0d 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefSearchParam.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefSearchParam.java @@ -17,7 +17,7 @@ import lombok.experimental.Accessors; public class ItemDefSearchParam { /** 定价类型 */ - private String DefinitionType; + private String definitionType; /** 定价项目 */ private String chargeItem; /** 模糊搜索条件 */ diff --git a/openhis-server/openhis-application/src/main/resources/i18n/messages.properties b/openhis-server/openhis-application/src/main/resources/i18n/messages.properties index ecbbd07e..dec8fe35 100644 --- a/openhis-server/openhis-application/src/main/resources/i18n/messages.properties +++ b/openhis-server/openhis-application/src/main/resources/i18n/messages.properties @@ -34,4 +34,12 @@ no.view.permission=您没有查看数据的权限,请联系管理员添加权 -apl.common.M00002={0}保存成功 \ No newline at end of file +apl.common.M00001={0}添加成功 +apl.common.M00002={0}保存成功 +apl.common.M00003={0}已经存在 +apl.common.M00004={0}操作成功 +apl.common.M00005={0}删除成功 +apl.common.M00006=操作失败,该数据已被他人删除,请刷新后重试 +apl.common.M00007=操作失败,该数据已被他人更改,请刷新后重试 +apl.common.M00008=请勿重复提交 +apl.common.M00009=查询成功 \ No newline at end of file diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java index 8fc65117..3a76949d 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java @@ -41,6 +41,10 @@ public interface PromptMsgConstant { * 请勿重复提交 */ String M00008 = "apl.common.M00008"; + /** + * 查询成功 + */ + String M00009 = "apl.common.M00009"; }