wangjunping/his
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

up

Browse Source
This commit is contained in:
liuhongrui
2025-03-27 09:24:14 +08:00
parent a2994d59bb
commit c07ab2c498
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IMedicationManageAppService.java
View File

@@ -48,7 +48,7 @@ public interface IMedicationManageAppService {
* @param id 查询条件
* @return 药品目录查询结果
*/
R<?> getMedicationOne(@PathVariable("id") Long id);
R<?> getMedicationOne(@RequestParam Long id);
/**
* 编辑药品目录信息

25
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
View File

@@ -11,7 +11,6 @@ import java.util.stream.Stream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.openhis.common.enums.PermissionLimit;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -33,6 +32,7 @@ import com.openhis.administration.service.ISupplierService;
import com.openhis.common.constant.CommonConstants;
import com.openhis.common.constant.PromptMsgConstant;
import com.openhis.common.enums.ApplicableScope;
import com.openhis.common.enums.PermissionLimit;
import com.openhis.common.enums.PublicationStatus;
import com.openhis.common.enums.Whether;
import com.openhis.common.utils.EnumUtils;
@@ -168,13 +168,13 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
e.setActiveFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getActiveFlag()));
// 医保是否对码
e.setYbMatchFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getYbMatchFlag()));
//是否皮试
// 是否皮试
e.setSkinTestFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getSkinTestFlag()));;
//是否为注射药物
// 是否为注射药物
e.setInjectFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getInjectFlag()));
//是否限制使用
// 是否限制使用
e.setRestrictedFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getRestrictedFlag()));
//儿童用药标志
// 儿童用药标志
e.setChildrenFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getChildrenFlag()));
// 适用范围
e.setDomainEnum_enumText(EnumUtils.getInfoByValue(ApplicableScope.class, e.getDomainEnum()));
@@ -186,9 +186,8 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
// 基药标识
e.setBasicFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getBasicFlag()));
// // 活动标记
// e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag()));
// // 活动标记
// e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag()));
});
@@ -210,8 +209,12 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
BeanUtils.copyProperties(medicationManageUpDto, medicationDefinition);// 主表信息
// 拼音码
medicationDefinition.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(medicationDefinition.getName()));
medicationDefinition
.setMerchandisePyStr(ChineseConvertUtils.toPinyinFirstLetter(medicationDefinition.getMerchandiseName()));
// 五笔码
medicationDefinition.setWbStr(ChineseConvertUtils.toWBFirstLetter(medicationDefinition.getName()));
medicationDefinition
.setMerchandiseWbStr(ChineseConvertUtils.toWBFirstLetter(medicationDefinition.getMerchandiseName()));
// 更新子表药品信息
if (medicationService.updateById(medication)) {
@@ -231,7 +234,7 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
* @return 药品目录查询结果
*/
@Override
public R<?> getMedicationOne(@PathVariable("id") Long id) {
public R<?> getMedicationOne(@RequestParam Long id) {
// 获取租户ID
Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
@@ -299,8 +302,12 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
BeanUtils.copyProperties(medicationManageUpDto, medicationDetail);
// 拼音码
medicationDetail.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(medicationDetail.getName()));
medicationDetail
.setMerchandisePyStr(ChineseConvertUtils.toPinyinFirstLetter(medicationDetail.getMerchandiseName()));
// 五笔码
medicationDetail.setWbStr(ChineseConvertUtils.toWBFirstLetter(medicationDetail.getName()));
medicationDetail
.setMerchandiseWbStr(ChineseConvertUtils.toWBFirstLetter(medicationDetail.getMerchandiseName()));
// 新增主表外来药品目录
if (medicationDefinitionService.addMedication(medicationDetail)) {