wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

bug249:手术管理-》门诊手术安排：【新增手术安排】-》【查找】在门诊医生站已【删除】作废的手术申请单在查询界面还能查询出来.

Browse Source 
bug426:门诊医生站-检查开立：已选择列表应支持树形展开，显示套餐明细（项目/数量/单价
This commit is contained in:
yangkexiang
2026-05-08 15:03:17 +08:00
parent 814f9561fe
commit 1fc7116f19
6 changed files with 73 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/ISurgeryAppService.java
View File

@@ -25,7 +25,9 @@ public interface ISurgeryAppService {
* @param plannedTimeEnd 计划结束时间
* @return 手术列表
*/
IPage<SurgeryDto> getSurgeryPage(SurgeryDto surgeryDto, Integer pageNo, Integer pageSize, String plannedTimeStart, String plannedTimeEnd);
IPage<SurgeryDto> getSurgeryPage(SurgeryDto surgeryDto, Integer pageNo, Integer pageSize,
String plannedTimeStart, String plannedTimeEnd,
String createTimeStart, String createTimeEnd);
/**
* 根据ID查询手术详情

32
openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java
View File

@@ -108,7 +108,9 @@ public class SurgeryAppServiceImpl implements ISurgeryAppService {
* @return 手术列表
*/
@Override
public IPage<SurgeryDto> getSurgeryPage(SurgeryDto surgeryDto, Integer pageNo, Integer pageSize, String plannedTimeStart, String plannedTimeEnd) {
public IPage<SurgeryDto> getSurgeryPage(SurgeryDto surgeryDto, Integer pageNo, Integer pageSize,
String plannedTimeStart, String plannedTimeEnd,
String createTimeStart, String createTimeEnd) {
QueryWrapper<SurgeryDto> queryWrapper = HisQueryUtils.buildQueryWrapper(surgeryDto, null,
new HashSet<String>() {{
add("surgery_no");
@@ -148,6 +150,34 @@ public class SurgeryAppServiceImpl implements ISurgeryAppService {
}
}
}
// 申请时间范围（创建时间 create_time）查询：用于“手术申请查询”弹窗
if (createTimeStart != null && !createTimeStart.isEmpty()) {
try {
LocalDateTime startDateTime = LocalDateTime.parse(createTimeStart, DateTimeFormatter.ISO_DATE_TIME);
queryWrapper.ge("create_time", startDateTime);
} catch (Exception e) {
try {
LocalDateTime startDateTime = LocalDateTime.parse(createTimeStart + "T00:00:00", DateTimeFormatter.ISO_DATE_TIME);
queryWrapper.ge("create_time", startDateTime);
} catch (Exception ex) {
log.error("解析创建开始时间失败: {}", createTimeStart, ex);
}
}
}
if (createTimeEnd != null && !createTimeEnd.isEmpty()) {
try {
LocalDateTime endDateTime = LocalDateTime.parse(createTimeEnd, DateTimeFormatter.ISO_DATE_TIME);
queryWrapper.le("create_time", endDateTime);
} catch (Exception e) {
try {
LocalDateTime endDateTime = LocalDateTime.parse(createTimeEnd + "T23:59:59", DateTimeFormatter.ISO_DATE_TIME);
queryWrapper.le("create_time", endDateTime);
} catch (Exception ex) {
log.error("解析创建结束时间失败: {}", createTimeEnd, ex);
}
}
}
queryWrapper.orderByDesc("create_time");
return surgeryAppMapper.getSurgeryPage(new Page<>(pageNo, pageSize), queryWrapper);

7
openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgeryController.java
View File

@@ -40,9 +40,12 @@ public class SurgeryController {
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
@RequestParam(value = "plannedTimeStart", required = false) String plannedTimeStart,
@RequestParam(value = "plannedTimeEnd", required = false) String plannedTimeEnd) {
@RequestParam(value = "plannedTimeEnd", required = false) String plannedTimeEnd,
@RequestParam(value = "createTimeStart", required = false) String createTimeStart,
@RequestParam(value = "createTimeEnd", required = false) String createTimeEnd) {
// 将时间范围参数传递给服务层
IPage<SurgeryDto> page = surgeryAppService.getSurgeryPage(surgeryDto, pageNo, pageSize, plannedTimeStart, plannedTimeEnd);
IPage<SurgeryDto> page = surgeryAppService.getSurgeryPage(surgeryDto, pageNo, pageSize,
plannedTimeStart, plannedTimeEnd, createTimeStart, createTimeEnd);
return R.ok(page);
}