fix(common): 修复字典缓存类型转换异常并优化住院登记查询
- 修复 DictUtils 中的字典缓存获取逻辑,添加类型检查避免 ClassCastException - 优化住院登记查询接口,增加时间范围和机构ID参数支持 - 修改审核趋势接口,将开始日期参数设为可选 - 更新申请单分页查询接口,使用 ModelAttribute 替代 RequestBody - 修复住院注册查询方法的参数传递问题
This commit is contained in:
@@ -38,8 +38,11 @@ public class DictUtils {
|
||||
* @return dictDatas 字典数据列表
|
||||
*/
|
||||
public static List<SysDictData> getDictCache(String key) {
|
||||
JsonNode arrayCache = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
|
||||
Object arrayCache = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
|
||||
if (StringUtils.isNotNull(arrayCache)) {
|
||||
if (arrayCache instanceof List) {
|
||||
return (List<SysDictData>) arrayCache;
|
||||
}
|
||||
return new ObjectMapper().convertValue(arrayCache, new com.fasterxml.jackson.core.type.TypeReference<List<SysDictData>>() {});
|
||||
}
|
||||
return null;
|
||||
|
||||
@@ -182,7 +182,7 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS
|
||||
|
||||
IPage<InHospitalRegisterQueryDto> inHospitalRegisterInfo = inHospitalRegisterAppMapper
|
||||
.getInHospitalRegisterInfo(new Page<>(pageNo, pageSize), EncounterClass.IMP.getValue(), encounterStatus,
|
||||
registeredFlag, LocationForm.WARD.getValue(), queryWrapper);
|
||||
registeredFlag, LocationForm.WARD.getValue(), null, null, null, queryWrapper);
|
||||
inHospitalRegisterInfo.getRecords().forEach(e -> {
|
||||
// 性别
|
||||
e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
|
||||
|
||||
@@ -33,6 +33,7 @@ public interface InHospitalRegisterAppMapper {
|
||||
IPage<InHospitalRegisterQueryDto> getInHospitalRegisterInfo(@Param("page") Page<InHospitalRegisterQueryDto> page,
|
||||
@Param("encounterClass") Integer encounterClass, @Param("encounterStatus") Integer encounterStatus,
|
||||
@Param("registeredFlag") String registeredFlag, @Param("formEnum") Integer formEnum,
|
||||
@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("organizationId") Long organizationId,
|
||||
@Param(Constants.WRAPPER) QueryWrapper<InHospitalRegisterQueryDto> queryWrapper);
|
||||
|
||||
/**
|
||||
|
||||
@@ -61,7 +61,7 @@ public class RationalDrugController {
|
||||
|
||||
@GetMapping("/trend")
|
||||
@Operation(summary = "审核趋势")
|
||||
public AjaxResult getAuditTrend(@RequestParam String startDate) {
|
||||
public AjaxResult getAuditTrend(@RequestParam(required = false) String startDate) {
|
||||
List<Map<String, Object>> trend = rationalDrugAppService.getAuditTrend(startDate);
|
||||
return AjaxResult.success(trend);
|
||||
}
|
||||
|
||||
@@ -192,7 +192,7 @@ public class RequestFormManageController {
|
||||
* @return 申请单
|
||||
*/
|
||||
@RequestMapping(value = "/page")
|
||||
public R<IPage<RequestFormPageDto>> getRequestFormPage(@RequestBody RequestFormDto requestFormDto) {
|
||||
public R<IPage<RequestFormPageDto>> getRequestFormPage(@ModelAttribute RequestFormDto requestFormDto) {
|
||||
return R.ok(iRequestFormManageAppService.getRequestFormPage(requestFormDto));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user