diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java index 42b99c85..159503fd 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java @@ -114,8 +114,10 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp Integer pricingFlag, List adviceTypes) { // 医嘱定价来源 String orderPricingSource = TenantOptionUtil.getOptionContent(TenantOptionDict.ORDER_PRICING_SOURCE); + // 如果配置为空，使用retailPrice作为默认值 if (StringUtils.isEmpty(orderPricingSource)) { - throw new ServiceException("租户配置项【医嘱定价来源】未配置"); + // throw new ServiceException("租户配置项【医嘱定价来源】未配置"); + orderPricingSource = "retailPrice"; } // 构建查询条件 QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(adviceBaseDto, searchKey, diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/CallNumberVoiceConfigAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/CallNumberVoiceConfigAppService.java new file mode 100644 index 00000000..a4f8e84b --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/CallNumberVoiceConfigAppService.java @@ -0,0 +1,10 @@ +package com.openhis.web.triageandqueuemanage.appservice; + +import com.core.common.core.domain.R; +import com.openhis.triageandqueuemanage.domain.CallNumberVoiceConfig; + +public interface CallNumberVoiceConfigAppService { + R addCallNumberVoiceConfig(CallNumberVoiceConfig callNumberVoiceConfig); + + R updateCallNumberVoiceConfig(CallNumberVoiceConfig callNumberVoiceConfig); +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/CallNumberVoiceConfigAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/CallNumberVoiceConfigAppServiceImpl.java new file mode 100644 index 00000000..a3cca1e7 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/CallNumberVoiceConfigAppServiceImpl.java @@ -0,0 +1,35 @@ +package com.openhis.web.triageandqueuemanage.appservice.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.core.common.core.domain.R; +import com.openhis.triageandqueuemanage.domain.CallNumberVoiceConfig; +import com.openhis.triageandqueuemanage.service.CallNumberVoiceConfigService; +import com.openhis.web.triageandqueuemanage.appservice.CallNumberVoiceConfigAppService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class CallNumberVoiceConfigAppServiceImpl implements CallNumberVoiceConfigAppService { + + @Resource + private CallNumberVoiceConfigService callNumberVoiceConfigService; + + @Override + public R addCallNumberVoiceConfig(CallNumberVoiceConfig callNumberVoiceConfig) { + if(ObjectUtil.isNull(callNumberVoiceConfig)){ + return R.fail("叫号语音设置实体不能为空"); + } + boolean save = callNumberVoiceConfigService.save(callNumberVoiceConfig); + return R.ok(save); + } + + @Override + public R updateCallNumberVoiceConfig(CallNumberVoiceConfig callNumberVoiceConfig) { + if(ObjectUtil.isNull(callNumberVoiceConfig)){ + return R.fail("叫号语音设置实体不能为空"); + } + boolean updateById = callNumberVoiceConfigService.updateById(callNumberVoiceConfig); + return R.ok(updateById); + } +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/controller/CallNumberVoiceConfigController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/controller/CallNumberVoiceConfigController.java new file mode 100644 index 00000000..5f5efa39 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/controller/CallNumberVoiceConfigController.java @@ -0,0 +1,40 @@ +package com.openhis.web.triageandqueuemanage.controller; + +import com.core.common.core.domain.R; +import com.openhis.triageandqueuemanage.domain.CallNumberVoiceConfig; +import com.openhis.web.triageandqueuemanage.appservice.CallNumberVoiceConfigAppService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@RestController +@Slf4j +@RequestMapping("/CallNumberVoice") +public class CallNumberVoiceConfigController { + + @Resource + private CallNumberVoiceConfigAppService callNumberVoiceConfigAppService; + + /** + * 新增叫号语音设置实体 + * + * @param callNumberVoiceConfig 叫号语音设置实体 + * @return 结果 + */ + @PostMapping("/add") + public R addCallNumberVoiceConfig(@RequestBody CallNumberVoiceConfig callNumberVoiceConfig) { + return R.ok(callNumberVoiceConfigAppService.addCallNumberVoiceConfig(callNumberVoiceConfig)); + } + + /** + * 修改叫号语音设置实体 + * + * @param callNumberVoiceConfig 叫号语音设置实体 + * @return 结果 + */ + @PutMapping("/update") + public R updateCallNumberVoiceConfig(@RequestBody CallNumberVoiceConfig callNumberVoiceConfig) { + return R.ok(callNumberVoiceConfigAppService.updateCallNumberVoiceConfig(callNumberVoiceConfig)); + } +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/mapper/CallNumberVoiceConfigAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/mapper/CallNumberVoiceConfigAppMapper.java new file mode 100644 index 00000000..f65eb42a --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/mapper/CallNumberVoiceConfigAppMapper.java @@ -0,0 +1,7 @@ +package com.openhis.web.triageandqueuemanage.mapper; + +import org.springframework.stereotype.Repository; + +@Repository +public interface CallNumberVoiceConfigAppMapper { +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/CallNumberVoiceConfig.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/CallNumberVoiceConfig.java new file mode 100644 index 00000000..a642cb9b --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/CallNumberVoiceConfig.java @@ -0,0 +1,47 @@ +package com.openhis.triageandqueuemanage.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +@Data +@Accessors(chain = true) +@TableName(value = "call_number_voice") +@EqualsAndHashCode(callSuper = false) +public class CallNumberVoiceConfig { + /** id */ + @TableId(type = IdType.AUTO) + private Integer id; + + /** 播放次数（1-5次） */ + private Integer playCount; + + /** 叫号前缀 */ + private String callPrefix; + + /** 叫号后缀 */ + private String callSuffix; + + /** 语速（较慢/正常/较快） */ + private String speed; + + /** (音量0-100%) */ + private Integer volume; + + /** 播报间隔 */ + private Integer intervalSeconds; + + /** 是否循环播报 */ + private Boolean cycleBroadcast; + + /** 创建时间 */ + private LocalDateTime createTime; + + /** 更新时间 */ + private LocalDateTime updateTime; +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/CallNumberVoiceConfigMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/CallNumberVoiceConfigMapper.java new file mode 100644 index 00000000..be167d9a --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/CallNumberVoiceConfigMapper.java @@ -0,0 +1,9 @@ +package com.openhis.triageandqueuemanage.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.openhis.triageandqueuemanage.domain.CallNumberVoiceConfig; +import org.springframework.stereotype.Repository; + +@Repository +public interface CallNumberVoiceConfigMapper extends BaseMapper { +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/CallNumberVoiceConfigService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/CallNumberVoiceConfigService.java new file mode 100644 index 00000000..2b60ec80 --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/CallNumberVoiceConfigService.java @@ -0,0 +1,7 @@ +package com.openhis.triageandqueuemanage.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.openhis.triageandqueuemanage.domain.CallNumberVoiceConfig; + +public interface CallNumberVoiceConfigService extends IService { +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/CallNumberVoiceConfigServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/CallNumberVoiceConfigServiceImpl.java new file mode 100644 index 00000000..7f899ece --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/CallNumberVoiceConfigServiceImpl.java @@ -0,0 +1,11 @@ +package com.openhis.triageandqueuemanage.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.openhis.triageandqueuemanage.domain.CallNumberVoiceConfig; +import com.openhis.triageandqueuemanage.mapper.CallNumberVoiceConfigMapper; +import com.openhis.triageandqueuemanage.service.CallNumberVoiceConfigService; +import org.springframework.stereotype.Service; + +@Service +public class CallNumberVoiceConfigServiceImpl extends ServiceImpl implements CallNumberVoiceConfigService { +}