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

feat(card): 实现医生个人报卡管理系统

Browse Source 
- 添加医生个人报卡统计、分页查询、提交、撤回、删除功能
- 实现批量提交和删除报卡操作
- 添加报卡导出为Word文档功能
- 新增DoctorCardStatisticsDto、DoctorCardListDto等数据传输对象
- 在InfectiousCardDto中添加状态文本字段
- 优化报卡状态显示，将"待审核"改为"已提交"并新增"作废"状态
- 添加多个DTO类的getter/setter方法以确保序列化正常工作
- 实现医生权限验证确保只能操作自己的报卡
- 完善报卡状态流转控制和业务逻辑验证
This commit is contained in:
chenqi
2026-03-09 14:57:45 +08:00
parent c3776c642b
commit d99188bfb9
24 changed files with 1080 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageDto.java
View File

@@ -104,4 +104,8 @@ public class InstrumentManageDto {
/** 备注 */
private String remarks;
// 手动添加 getter 方法
public Integer getInstrumentTypeEnum() {
return instrumentTypeEnum;
}
}

13
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageInitDto.java
View File

@@ -18,6 +18,19 @@ public class InstrumentManageInitDto {
private List<InstrumentType> InstrumentTypeList;
private List<InstrumentStatusEnumOption> InstrumentStatusEnumList;
// 手动添加 setter 方法
public void setStatusFlagOptions(List<statusEnumOption> statusFlagOptions) {
this.statusFlagOptions = statusFlagOptions;
}
public void setInstrumentTypeList(List<InstrumentType> InstrumentTypeList) {
this.InstrumentTypeList = InstrumentTypeList;
}
public void setInstrumentStatusEnumList(List<InstrumentStatusEnumOption> InstrumentStatusEnumList) {
this.InstrumentStatusEnumList = InstrumentStatusEnumList;
}
/**
* 状态
*/

9
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentStatusRequest.java
View File

@@ -13,4 +13,13 @@ import java.util.List;
public class InstrumentStatusRequest {
private List<Long> ids;
private String type;
// 手动添加 getter 方法
public String getType() {
return type;
}
public List<Long> getIds() {
return ids;
}
}

32
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/LisConfigManageDto.java
View File

@@ -28,4 +28,36 @@ public class LisConfigManageDto {
private List<ActivityDefSpecimenDef> activityDefSpecimenDefs;
// 手动添加 getter 和 setter 方法
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public List<ActivityDefDeviceDef> getActivityDefDeviceDefs() {
return activityDefDeviceDefs;
}
public void setActivityDefDeviceDefs(List<ActivityDefDeviceDef> activityDefDeviceDefs) {
this.activityDefDeviceDefs = activityDefDeviceDefs;
}
public List<ActivityDefObservationDef> getActivityDefObservationDefs() {
return activityDefObservationDefs;
}
public void setActivityDefObservationDefs(List<ActivityDefObservationDef> activityDefObservationDefs) {
this.activityDefObservationDefs = activityDefObservationDefs;
}
public List<ActivityDefSpecimenDef> getActivityDefSpecimenDefs() {
return activityDefSpecimenDefs;
}
public void setActivityDefSpecimenDefs(List<ActivityDefSpecimenDef> activityDefSpecimenDefs) {
this.activityDefSpecimenDefs = activityDefSpecimenDefs;
}
}

12
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/LisConfigManageInitDto.java
View File

@@ -23,4 +23,16 @@ public class LisConfigManageInitDto {
private List<SpecimenDefinition> specimenDefs;
// 手动添加 setter 方法
public void setDeviceDefs(List<DeviceDefinition> deviceDefs) {
this.deviceDefs = deviceDefs;
}
public void setObservationDefs(List<ObservationDefinition> observationDefs) {
this.observationDefs = observationDefs;
}
public void setSpecimenDefs(List<SpecimenDefinition> specimenDefs) {
this.specimenDefs = specimenDefs;
}
}

11
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ObservationDefManageDto.java
View File

@@ -44,7 +44,16 @@ public class ObservationDefManageDto {
/** 删除状态） */
private String deleteFlag;
// 手动添加 getter 方法
public Long getInstrumentId() {
return instrumentId;
}
public Integer getStatusEnum() {
return statusEnum;
}
public Integer getObservationTypeEnum() {
return observationTypeEnum;
}
}

13
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ObservationDefManageInitDto.java
View File

@@ -18,6 +18,19 @@ public class ObservationDefManageInitDto {
private List<ObservationTypeEnumOption> ObservationTypeList;
private List<InstrumentEnumOption> instrumentEnumOptionList;
// 手动添加 setter 方法
public void setStatusFlagOptions(List<statusEnumOption> statusFlagOptions) {
this.statusFlagOptions = statusFlagOptions;
}
public void setObservationTypeList(List<ObservationTypeEnumOption> ObservationTypeList) {
this.ObservationTypeList = ObservationTypeList;
}
public void setInstrumentEnumOptionList(List<InstrumentEnumOption> instrumentEnumOptionList) {
this.instrumentEnumOptionList = instrumentEnumOptionList;
}
/**
* 状态
*/

9
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ObservationDefStatusRequest.java
View File

@@ -13,4 +13,13 @@ import java.util.List;
public class ObservationDefStatusRequest {
private List<Long> ids;
private String type;
// 手动添加 getter 方法
public String getType() {
return type;
}
public List<Long> getIds() {
return ids;
}
}

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ReportResultManageDto.java
View File

@@ -32,4 +32,8 @@ public class ReportResultManageDto {
private String authoredTime; // 开单时间
// 手动添加 getter 方法
public Integer getGenderEnum() {
return genderEnum;
}
}

8
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SampleCollectManageDto.java
View File

@@ -40,4 +40,12 @@ public class SampleCollectManageDto {
private String authoredTime; // 开单时间
// 手动添加 getter 方法
public Integer getGenderEnum() {
return genderEnum;
}
public Integer getCollectionStatusEnum() {
return collectionStatusEnum;
}
}

9
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SampleCollectStatusRequest.java
View File

@@ -13,4 +13,13 @@ import java.util.List;
public class SampleCollectStatusRequest {
private List<Long> ids;
private String type;
// 手动添加 getter 方法
public String getType() {
return type;
}
public List<Long> getIds() {
return ids;
}
}

8
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SpecimenDefManageDto.java
View File

@@ -59,4 +59,12 @@ public class SpecimenDefManageDto {
private Integer statusEnum;
private String statusEnumText;
// 手动添加 getter 方法
public Integer getSpecimenTypeEnum() {
return specimenTypeEnum;
}
public Integer getStatusEnum() {
return statusEnum;
}
}

9
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SpecimenDefManageInitDto.java
View File

@@ -18,6 +18,15 @@ public class SpecimenDefManageInitDto {
private List<statusEnumOption> statusFlagOptions;
private List<SpecimenType> SpecimenTypeList;
// 手动添加 setter 方法
public void setStatusFlagOptions(List<statusEnumOption> statusFlagOptions) {
this.statusFlagOptions = statusFlagOptions;
}
public void setSpecimenTypeList(List<SpecimenType> SpecimenTypeList) {
this.SpecimenTypeList = SpecimenTypeList;
}
/**
* 状态
*/

9
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SpecimenDefStatusRequest.java
View File

@@ -13,4 +13,13 @@ import java.util.List;
public class SpecimenDefStatusRequest {
private List<Long> ids;
private String type;
// 手动添加 getter 方法
public String getType() {
return type;
}
public List<Long> getIds() {
return ids;
}
}