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

UP

Browse Source
This commit is contained in:
liuhongrui
2025-03-27 19:26:10 +08:00
parent 45b7d87cda
commit 07f525b510
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java
View File

@@ -239,4 +239,10 @@ public class MedicationManageUpDto {
private String antibioticCode; private String antibioticCode;
private String antibioticCode_dictText; private String antibioticCode_dictText;
/** 权限限制 */
private Integer restrictedEnum;
/** 基药标识 */
private Integer basicFlag;
} }

4
openhis-server/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml
View File

@@ -235,12 +235,16 @@
FROM adm_charge_item_definition T3 FROM adm_charge_item_definition T3
LEFT JOIN adm_charge_item_def_detail T4 ON T4.definition_id = T3.id LEFT JOIN adm_charge_item_def_detail T4 ON T4.definition_id = T3.id
WHERE T4.condition_code = '2'--2:采购价 WHERE T4.condition_code = '2'--2:采购价
AND T3.instance_id = T2.medication_def_id
AND T3.instance_table = 'med_medication_definition'
) as purchase_price,--购入价 ) as purchase_price,--购入价
( (
SELECT T4.amount SELECT T4.amount
FROM adm_charge_item_definition T3 FROM adm_charge_item_definition T3
LEFT JOIN adm_charge_item_def_detail T4 ON T4.definition_id = T3.id LEFT JOIN adm_charge_item_def_detail T4 ON T4.definition_id = T3.id
WHERE T4.condition_code = '4'--4:限制 WHERE T4.condition_code = '4'--4:限制
AND T3.instance_id = T2.medication_def_id
AND T3.instance_table = 'med_medication_definition'
) as maximum_retail_price--最高零售价 ) as maximum_retail_price--最高零售价
FROM med_medication_definition T1 FROM med_medication_definition T1
LEFT JOIN med_medication T2 on T1.id = T2.medication_def_id LEFT JOIN med_medication T2 on T1.id = T2.medication_def_id

3
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java
View File

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.core.domain.HisBaseEntity; import com.core.common.core.domain.HisBaseEntity;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@@ -26,6 +28,7 @@ public class Supplier extends HisBaseEntity {
/** ID */ /** ID */
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
/** 编号 */ /** 编号 */