参与者改造
This commit is contained in:
Wang.Huan
@@ -18,6 +18,12 @@ public class PractitionerRolesDto {
|
||||
*/
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long roleId;
|
||||
|
||||
/**
|
||||
* 角色code
|
||||
*/
|
||||
private String roleCode;
|
||||
|
||||
/**
|
||||
* 角色名称
|
||||
*/
|
||||
|
||||
@@ -83,7 +83,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
IPage<AdviceBaseDto> adviceBaseInfo =
|
||||
doctorStationAdviceAppMapper.getAdviceBaseInfo(new Page<>(pageNo, pageSize),
|
||||
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();
|
||||
// 医嘱定义ID集合
|
||||
List<Long> adviceDefinitionIdList =
|
||||
@@ -123,16 +123,17 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
String finalUnitCode = unitCode;
|
||||
// 匹配包装单位
|
||||
List<AdvicePriceDto> advicePrice1 = childCharge.stream()
|
||||
.filter(e -> e.getDefinitionId().equals(finalChargeItemDefinitionId) && e.getConditionValue()
|
||||
.equals(String.format(CommonConstants.Common.COMMA_FORMAT, finalUnitCode,
|
||||
adviceInventoryDto.getLotNumber())))
|
||||
.filter(e -> e.getDefinitionId().equals(finalChargeItemDefinitionId)
|
||||
&& e.getConditionValue().equals(adviceInventoryDto.getLotNumber()))
|
||||
.peek(e -> e.setUnitCode(finalUnitCode)) // 设置 unitCode
|
||||
.collect(Collectors.toList());
|
||||
priceDtoList.addAll(advicePrice1);
|
||||
}
|
||||
// 价格信息
|
||||
baseDto.setPriceList(priceDtoList);
|
||||
}
|
||||
// 诊疗活动
|
||||
else {
|
||||
else if (CommonConstants.TableName.WOR_ACTIVITY_DEFINITION.equals(baseDto.getAdviceTableName())) {
|
||||
List<AdvicePriceDto> priceList =
|
||||
mainCharge.stream().filter(e -> baseDto.getChargeItemDefinitionId().equals(e.getDefinitionId()))
|
||||
.collect(Collectors.toList());
|
||||
@@ -144,6 +145,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
}
|
||||
}
|
||||
|
||||
return adviceBaseInfo;
|
||||
|
||||
// 下面的注释不要删除 2025.03.27
|
||||
// // 药品和耗材
|
||||
// List<AdviceBaseDto> medicationAndDeviceList = adviceBaseDtoList.stream()
|
||||
@@ -206,7 +209,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
// // 价格信息
|
||||
// baseDto.setPriceList(priceList);
|
||||
// }
|
||||
return adviceBaseInfo;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -23,16 +23,16 @@ public class AdviceInventoryDto {
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long itemId;
|
||||
|
||||
/** 当前库存数量(包装单位) */
|
||||
private BigDecimal baseQuantity;
|
||||
|
||||
/** 包装单位 */
|
||||
@Dict(dictCode = "unit_code")
|
||||
private String baseUnitCode;
|
||||
private String baseUnitCode_dictText;
|
||||
|
||||
/** 当前库存数量(最小单位) */
|
||||
private BigDecimal minQuantity;
|
||||
// /** 当前库存数量(包装单位) */
|
||||
// private BigDecimal baseQuantity;
|
||||
//
|
||||
// /** 包装单位 */
|
||||
// @Dict(dictCode = "unit_code")
|
||||
// private String baseUnitCode;
|
||||
// private String baseUnitCode_dictText;
|
||||
//
|
||||
// /** 当前库存数量(最小单位) */
|
||||
// private BigDecimal minQuantity;
|
||||
|
||||
/** 最小单位 */
|
||||
@Dict(dictCode = "unit_code")
|
||||
|
||||
@@ -48,6 +48,7 @@
|
||||
<select id="getPractitionerRolesDtoList" resultType="com.openhis.web.basedatamanage.dto.PractitionerRolesDto">
|
||||
SELECT
|
||||
sr.role_id,
|
||||
sr.role_key AS role_code,
|
||||
sr.role_name,
|
||||
ap.ID AS practitioner_id
|
||||
FROM
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
abi.advice_type,
|
||||
abi.category_code,
|
||||
abi.part_percent,
|
||||
abi.part_attribute_enum,
|
||||
abi.advice_definition_id,
|
||||
abi.advice_name,
|
||||
abi.advice_bus_no,
|
||||
@@ -32,30 +33,31 @@
|
||||
abi.advice_table_name
|
||||
from (
|
||||
SELECT T1.tenant_id,
|
||||
1 AS advice_type,
|
||||
T1.category_code AS category_code,
|
||||
T1.part_percent AS part_percent,
|
||||
T1.ID AS advice_definition_id,
|
||||
T1.NAME AS advice_name,
|
||||
T1.bus_no AS advice_bus_no,
|
||||
T1.py_str AS py_str,
|
||||
T1.wb_str AS wb_str,
|
||||
T1.yb_no AS yb_no,
|
||||
T1.merchandise_name AS product_name,
|
||||
0 AS activity_type,
|
||||
T1.unit_code AS unit_code,
|
||||
T1.min_unit_code AS min_unit_code,
|
||||
T2.total_volume AS volume,
|
||||
T2.method_code AS method_code,
|
||||
T2.rate_code AS rate_code,
|
||||
T2.org_id AS org_id,
|
||||
T2.location_id AS location_id,
|
||||
CAST(T2.dose AS TEXT) AS dose,
|
||||
T2.dose_unit_code AS dose_unit_code,
|
||||
T3.NAME AS supplier,
|
||||
T4.NAME AS manufacturer,
|
||||
T5.id AS charge_item_definition_id,
|
||||
T5.instance_table AS advice_table_name
|
||||
1 AS advice_type,
|
||||
T1.category_code AS category_code,
|
||||
T1.part_percent AS part_percent,
|
||||
T1.part_attribute_enum AS part_attribute_enum,
|
||||
T1.ID AS advice_definition_id,
|
||||
T1.NAME AS advice_name,
|
||||
T1.bus_no AS advice_bus_no,
|
||||
T1.py_str AS py_str,
|
||||
T1.wb_str AS wb_str,
|
||||
T1.yb_no AS yb_no,
|
||||
T1.merchandise_name AS product_name,
|
||||
0 AS activity_type,
|
||||
T1.unit_code AS unit_code,
|
||||
T1.min_unit_code AS min_unit_code,
|
||||
T2.total_volume AS volume,
|
||||
T2.method_code AS method_code,
|
||||
T2.rate_code AS rate_code,
|
||||
T2.org_id AS org_id,
|
||||
T2.location_id AS location_id,
|
||||
CAST(T2.dose AS TEXT) AS dose,
|
||||
T2.dose_unit_code AS dose_unit_code,
|
||||
T3.NAME AS supplier,
|
||||
T4.NAME AS manufacturer,
|
||||
T5.id AS charge_item_definition_id,
|
||||
T5.instance_table AS advice_table_name
|
||||
FROM med_medication_definition AS t1
|
||||
LEFT JOIN med_medication AS T2 ON T2.medication_def_id = T1.ID
|
||||
AND T2.delete_flag = '0'
|
||||
@@ -72,6 +74,7 @@
|
||||
2 AS advice_type,
|
||||
T1.category_code AS category_code,
|
||||
T1.part_percent AS part_percent,
|
||||
null AS part_attribute_enum,
|
||||
T1.ID AS advice_definition_id,
|
||||
T1.NAME AS advice_name,
|
||||
T1.bus_no AS advice_bus_no,
|
||||
@@ -108,6 +111,7 @@
|
||||
3 AS advice_type,
|
||||
'' AS category_code,
|
||||
1 AS part_percent,
|
||||
null AS part_attribute_enum,
|
||||
T1.ID AS advice_definition_id,
|
||||
T1.NAME AS advice_name,
|
||||
T1.bus_no AS advice_bus_no,
|
||||
|
||||
@@ -12,7 +12,7 @@ import lombok.Getter;
|
||||
@AllArgsConstructor
|
||||
public enum ConditionCode implements HisEnumInterface {
|
||||
|
||||
UNIT_PRODUCT_BATCH_NUM(1, "1", "单位,产品批号"),
|
||||
UNIT_PRODUCT_BATCH_NUM(1, "1", "产品批号"),
|
||||
PROCUREMENT(2,"2","采购"),
|
||||
UNIT(3,"3","单位"),
|
||||
LIMIT(4,"4","限制");
|
||||
|
||||
Reference in New Issue
Block a user