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

基本目录调试 up by dh lhr

Browse Source
This commit is contained in:
duhe
2025-03-31 10:53:56 +08:00
parent 4ccd07d3af
commit 7cb6eeb103
8 changed files with 157 additions and 126 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/DiagnosisTreatmentDto.java
View File

@@ -96,11 +96,11 @@ public class DiagnosisTreatmentDto {
/** 财务类别 */
@Dict(dictCode = "fin_type_code")
private String typeCode;
private String typeCode_dictText;
private String itemTypeCode;
private String itemTypeCode_dictText;
/** 医保类别 */
@Dict(dictCode = "med_chrgitm_type")
@Dict(dictCode = "yb_type")
private String ybType;
private String ybType_dictText;

2
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentSelParam.java
View File

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
public class DiagnosisTreatmentSelParam {
/** 目录类别 */
private Integer categoryCode;
private String categoryCode;
/** 类型 */
private Integer typeEnum;

5
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java
View File

@@ -32,7 +32,6 @@ public class DiagnosisTreatmentUpDto {
private String categoryCode;
/** 编码 */
@NotBlank(message = "项目编码不能为空")
private String busNo;
/** 项目名称 */
@@ -40,16 +39,14 @@ public class DiagnosisTreatmentUpDto {
private String name;
/** 项目名称拼音 */
@NotBlank(message = "项目名称拼音不能为空")
private String pyStr;
/** 五笔拼音 */
@NotBlank(message = "五笔拼音不能为空")
private String wbStr;
/** 类型 */
@NotBlank(message = "类型不能为空")
private String typeCode;
private Integer typeEnum;
/** 使用单位 */
@NotBlank(message = "使用单位不能为空")

1
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageUpDto.java
View File

@@ -27,7 +27,6 @@ public class DiseaseManageUpDto {
private ConditionDefinitionSource sourceEnum;
/** 编码 */
@NotBlank(message = "疾病编码不能为空")
private String conditionCode;
/** 诊断名称 */

2
openhis-server/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
View File

@@ -125,7 +125,7 @@
AND T2.instance_table = 'wor_activity_definition'
<if test="id!= null">
AND T2.id = #{id}
AND T1.id = #{id}
</if>
<if test="tenantId!= null">
AND T1.tenant_id = #{tenantId}