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

参与者改造

Browse Source
This commit is contained in:
Wang.Huan
2025-03-28 17:33:32 +08:00
parent 5adb6a8490
commit 22e46a0545
6 changed files with 55 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRolesDto.java
View File

@@ -18,6 +18,12 @@ public class PractitionerRolesDto {
*/ */
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long roleId; private Long roleId;
/**
* 角色code
*/
private String roleCode;
/** /**
* 角色名称 * 角色名称
*/ */

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

@@ -83,7 +83,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
IPage<AdviceBaseDto> adviceBaseInfo = IPage<AdviceBaseDto> adviceBaseInfo =
doctorStationAdviceAppMapper.getAdviceBaseInfo(new Page<>(pageNo, pageSize), doctorStationAdviceAppMapper.getAdviceBaseInfo(new Page<>(pageNo, pageSize),
CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION, CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
CommonConstants.TableName.WOR_ACTIVITY_DEFINITION, DeviceCategory.SINGLE_USE.getInfo(), queryWrapper); CommonConstants.TableName.WOR_ACTIVITY_DEFINITION, DeviceCategory.SINGLE_USE.getCode(), queryWrapper);
List<AdviceBaseDto> adviceBaseDtoList = adviceBaseInfo.getRecords(); List<AdviceBaseDto> adviceBaseDtoList = adviceBaseInfo.getRecords();
// 医嘱定义ID集合 // 医嘱定义ID集合
List<Long> adviceDefinitionIdList = List<Long> adviceDefinitionIdList =
@@ -123,16 +123,17 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
String finalUnitCode = unitCode; String finalUnitCode = unitCode;
// 匹配包装单位 // 匹配包装单位
List<AdvicePriceDto> advicePrice1 = childCharge.stream() List<AdvicePriceDto> advicePrice1 = childCharge.stream()
.filter(e -> e.getDefinitionId().equals(finalChargeItemDefinitionId) && e.getConditionValue() .filter(e -> e.getDefinitionId().equals(finalChargeItemDefinitionId)
.equals(String.format(CommonConstants.Common.COMMA_FORMAT, finalUnitCode, && e.getConditionValue().equals(adviceInventoryDto.getLotNumber()))
adviceInventoryDto.getLotNumber())))
.peek(e -> e.setUnitCode(finalUnitCode)) // 设置 unitCode .peek(e -> e.setUnitCode(finalUnitCode)) // 设置 unitCode
.collect(Collectors.toList()); .collect(Collectors.toList());
priceDtoList.addAll(advicePrice1); priceDtoList.addAll(advicePrice1);
} }
// 价格信息
baseDto.setPriceList(priceDtoList);
} }
// 诊疗活动 // 诊疗活动
else { else if (CommonConstants.TableName.WOR_ACTIVITY_DEFINITION.equals(baseDto.getAdviceTableName())) {
List<AdvicePriceDto> priceList = List<AdvicePriceDto> priceList =
mainCharge.stream().filter(e -> baseDto.getChargeItemDefinitionId().equals(e.getDefinitionId())) mainCharge.stream().filter(e -> baseDto.getChargeItemDefinitionId().equals(e.getDefinitionId()))
.collect(Collectors.toList()); .collect(Collectors.toList());
@@ -144,6 +145,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
} }
} }
return adviceBaseInfo;
// 下面的注释不要删除 2025.03.27 // 下面的注释不要删除 2025.03.27
// // 药品和耗材 // // 药品和耗材
// List<AdviceBaseDto> medicationAndDeviceList = adviceBaseDtoList.stream() // List<AdviceBaseDto> medicationAndDeviceList = adviceBaseDtoList.stream()
@@ -206,7 +209,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
// // 价格信息 // // 价格信息
// baseDto.setPriceList(priceList); // baseDto.setPriceList(priceList);
// } // }
return adviceBaseInfo;
} }
/** /**

20
openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceInventoryDto.java
View File

@@ -23,16 +23,16 @@ public class AdviceInventoryDto {
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long itemId; private Long itemId;
/** 当前库存数量(包装单位) */ // /** 当前库存数量(包装单位) */
private BigDecimal baseQuantity; // private BigDecimal baseQuantity;
//
/** 包装单位 */ // /** 包装单位 */
@Dict(dictCode = "unit_code") // @Dict(dictCode = "unit_code")
private String baseUnitCode; // private String baseUnitCode;
private String baseUnitCode_dictText; // private String baseUnitCode_dictText;
//
/** 当前库存数量(最小单位) */ // /** 当前库存数量(最小单位) */
private BigDecimal minQuantity; // private BigDecimal minQuantity;
/** 最小单位 */ /** 最小单位 */
@Dict(dictCode = "unit_code") @Dict(dictCode = "unit_code")

1
openhis-server/openhis-application/src/main/resources/mapper/basedatamanage/PractitionerAppMapper.xml
View File

@@ -48,6 +48,7 @@
<select id="getPractitionerRolesDtoList" resultType="com.openhis.web.basedatamanage.dto.PractitionerRolesDto"> <select id="getPractitionerRolesDtoList" resultType="com.openhis.web.basedatamanage.dto.PractitionerRolesDto">
SELECT SELECT
sr.role_id, sr.role_id,
sr.role_key AS role_code,
sr.role_name, sr.role_name,
ap.ID AS practitioner_id ap.ID AS practitioner_id
FROM FROM

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

@@ -9,6 +9,7 @@
abi.advice_type, abi.advice_type,
abi.category_code, abi.category_code,
abi.part_percent, abi.part_percent,
abi.part_attribute_enum,
abi.advice_definition_id, abi.advice_definition_id,
abi.advice_name, abi.advice_name,
abi.advice_bus_no, abi.advice_bus_no,
@@ -32,30 +33,31 @@
abi.advice_table_name abi.advice_table_name
from ( from (
SELECT T1.tenant_id, SELECT T1.tenant_id,
1 AS advice_type, 1 AS advice_type,
T1.category_code AS category_code, T1.category_code AS category_code,
T1.part_percent AS part_percent, T1.part_percent AS part_percent,
T1.ID AS advice_definition_id, T1.part_attribute_enum AS part_attribute_enum,
T1.NAME AS advice_name, T1.ID AS advice_definition_id,
T1.bus_no AS advice_bus_no, T1.NAME AS advice_name,
T1.py_str AS py_str, T1.bus_no AS advice_bus_no,
T1.wb_str AS wb_str, T1.py_str AS py_str,
T1.yb_no AS yb_no, T1.wb_str AS wb_str,
T1.merchandise_name AS product_name, T1.yb_no AS yb_no,
0 AS activity_type, T1.merchandise_name AS product_name,
T1.unit_code AS unit_code, 0 AS activity_type,
T1.min_unit_code AS min_unit_code, T1.unit_code AS unit_code,
T2.total_volume AS volume, T1.min_unit_code AS min_unit_code,
T2.method_code AS method_code, T2.total_volume AS volume,
T2.rate_code AS rate_code, T2.method_code AS method_code,
T2.org_id AS org_id, T2.rate_code AS rate_code,
T2.location_id AS location_id, T2.org_id AS org_id,
CAST(T2.dose AS TEXT) AS dose, T2.location_id AS location_id,
T2.dose_unit_code AS dose_unit_code, CAST(T2.dose AS TEXT) AS dose,
T3.NAME AS supplier, T2.dose_unit_code AS dose_unit_code,
T4.NAME AS manufacturer, T3.NAME AS supplier,
T5.id AS charge_item_definition_id, T4.NAME AS manufacturer,
T5.instance_table AS advice_table_name T5.id AS charge_item_definition_id,
T5.instance_table AS advice_table_name
FROM med_medication_definition AS t1 FROM med_medication_definition AS t1
LEFT JOIN med_medication AS T2 ON T2.medication_def_id = T1.ID LEFT JOIN med_medication AS T2 ON T2.medication_def_id = T1.ID
AND T2.delete_flag = '0' AND T2.delete_flag = '0'
@@ -72,6 +74,7 @@
2 AS advice_type, 2 AS advice_type,
T1.category_code AS category_code, T1.category_code AS category_code,
T1.part_percent AS part_percent, T1.part_percent AS part_percent,
null AS part_attribute_enum,
T1.ID AS advice_definition_id, T1.ID AS advice_definition_id,
T1.NAME AS advice_name, T1.NAME AS advice_name,
T1.bus_no AS advice_bus_no, T1.bus_no AS advice_bus_no,
@@ -108,6 +111,7 @@
3 AS advice_type, 3 AS advice_type,
'' AS category_code, '' AS category_code,
1 AS part_percent, 1 AS part_percent,
null AS part_attribute_enum,
T1.ID AS advice_definition_id, T1.ID AS advice_definition_id,
T1.NAME AS advice_name, T1.NAME AS advice_name,
T1.bus_no AS advice_bus_no, T1.bus_no AS advice_bus_no,

2
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionCode.java
View File

@@ -12,7 +12,7 @@ import lombok.Getter;
@AllArgsConstructor @AllArgsConstructor
public enum ConditionCode implements HisEnumInterface { public enum ConditionCode implements HisEnumInterface {
UNIT_PRODUCT_BATCH_NUM(1, "1", "单位,产品批号"), UNIT_PRODUCT_BATCH_NUM(1, "1", "产品批号"),
PROCUREMENT(2,"2","采购"), PROCUREMENT(2,"2","采购"),
UNIT(3,"3","单位"), UNIT(3,"3","单位"),
LIMIT(4,"4","限制"); LIMIT(4,"4","限制");