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

bug 470 494

Browse Source
This commit is contained in:
Ranyunqiao
2026-05-15 09:44:26 +08:00
parent 3ee09b22c7
commit 610fff704a
9 changed files with 235 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java
View File

@@ -5,6 +5,7 @@ import com.core.common.core.domain.R;
import com.openhis.web.doctorstation.dto.AdviceBaseDto;
import com.openhis.web.doctorstation.dto.AdviceSaveParam;
import com.openhis.web.doctorstation.dto.OrderBindInfoDto;
import com.openhis.web.doctorstation.dto.SurgeryItemDto;
import com.openhis.web.doctorstation.dto.UpdateGroupIdParam;
import java.util.List;
@@ -134,4 +135,16 @@ public interface IDoctorStationAdviceAppService {
* @return 已配置的药品类别编码列表
*/
R<?> getConfiguredCategories(Long organizationId);
/**
* 手术项目专用分页查询（仅手术 + 定价，无库存/草稿库存/取药科室等无关逻辑）
*
* @param organizationId 科室ID（可选）
* @param pageNo 当前页
* @param pageSize 每页条数
* @param searchKey 模糊查询关键字（可选）
* @return 手术项目分页数据（含价格信息）
*/
IPage<SurgeryItemDto> getSurgeryPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey);
}

16
openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
View File

@@ -2442,4 +2442,20 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
return R.ok(categoryCodes);
}
/**
* 手术项目专用分页查询（仅手术 + 定价，无库存/草稿库存/取药科室等无关逻辑）
*/
@Override
public IPage<SurgeryItemDto> getSurgeryPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey) {
log.info("getSurgeryPage 开始: orgId={}, page={}/{}, searchKey={}", organizationId, pageNo, pageSize, searchKey);
long start = System.currentTimeMillis();
IPage<SurgeryItemDto> result = doctorStationAdviceAppMapper.getSurgeryPage(
new Page<>(pageNo, pageSize),
PublicationStatus.ACTIVE.getValue(),
organizationId,
searchKey);
log.info("getSurgeryPage 完成: {}ms, total={}, records={}", System.currentTimeMillis() - start, result.getTotal(), result.getRecords().size());
return result;
}
}

18
openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java
View File

@@ -203,4 +203,22 @@ public class DoctorStationAdviceController {
return iDoctorStationAdviceAppService.getConfiguredCategories(organizationId);
}
/**
* 手术项目专用分页查询（仅手术 + 定价，无库存/草稿库存/取药科室等无关逻辑）
*
* @param organizationId 科室ID（可选）
* @param pageNo 当前页
* @param pageSize 每页条数
* @param searchKey 模糊查询关键字（可选）
* @return 手术项目分页数据（含价格信息）
*/
@GetMapping(value = "/surgery-page")
public R<?> getSurgeryPage(
@RequestParam(value = "organizationId", required = false) Long organizationId,
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize", defaultValue = "500") Integer pageSize,
@RequestParam(value = "searchKey", defaultValue = "") String searchKey) {
return R.ok(iDoctorStationAdviceAppService.getSurgeryPage(organizationId, pageNo, pageSize, searchKey));
}
}

42
openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SurgeryItemDto.java Normal file
View File

@@ -0,0 +1,42 @@
package com.openhis.web.doctorstation.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.math.BigDecimal;
/**
* 手术项目选择器专用 DTO（不含 @Dict 注解，绕过 DictAspect 的 Redis 字典翻译）
*/
@Data
public class SurgeryItemDto {
/** 医嘱定义ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long adviceDefinitionId;
/** 手术名称 */
private String adviceName;
/** 所属科室ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long orgId;
/** 执行科室ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long positionId;
/** 费用定价主表ID（用于提交时关联价格） */
@JsonSerialize(using = ToStringSerializer.class)
private Long chargeItemDefinitionId;
/** 单价（直接从定价主表取，无需嵌套 priceList） */
private BigDecimal price;
/** 单位编码 */
private String unitCode;
/** 单位编码字典文本（前端用于显示单位） */
private String unitCodeDictText;
}

14
openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java
View File

@@ -185,4 +185,18 @@ public interface DoctorStationAdviceAppMapper {
*/
Long getDefaultAccountId(@Param("encounterId") Long encounterId);
/**
* 手术项目专用分页查询（仅手术 + 定价，无库存/草稿库存/取药科室等无关逻辑）
*
* @param page 分页参数
* @param statusEnum 启用状态
* @param organizationId 科室ID（可选，用于过滤已配置的手术项目）
* @param searchKey 模糊查询关键字（可选）
* @return 手术项目分页数据
*/
IPage<SurgeryItemDto> getSurgeryPage(@Param("page") Page<SurgeryItemDto> page,
@Param("statusEnum") Integer statusEnum,
@Param("organizationId") Long organizationId,
@Param("searchKey") String searchKey);
}

25
openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
View File

@@ -811,4 +811,29 @@
LIMIT 1
</select>
<!-- 手术项目专用分页查询：仅查手术 + 定价，无库存/草稿库存/取药科室等无关逻辑 -->
<select id="getSurgeryPage" resultType="com.openhis.web.doctorstation.dto.SurgeryItemDto">
SELECT
t1.ID AS advice_definition_id,
t1.NAME AS advice_name,
t1.org_id AS org_id,
t1.org_id AS position_id,
t2.ID AS charge_item_definition_id,
t2.price AS price,
t1.permitted_unit_code AS unit_code,
t1.permitted_unit_code AS unit_code_dict_text
FROM wor_activity_definition t1
LEFT JOIN adm_charge_item_definition t2
ON t2.instance_id = t1.ID
AND t2.delete_flag = '0'
AND t2.status_enum = #{statusEnum}
AND t2.instance_table = 'wor_activity_definition'
WHERE t1.delete_flag = '0'
AND (t1.category_code = '手术' OR t1.category_code = '24')
<if test="searchKey != null and searchKey != ''">
AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%')
</if>
ORDER BY t1.name ASC
</select>
</mapper>