diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComDict.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComDict.java index b5f79c8..7ad0322 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComDict.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComDict.java @@ -2,6 +2,8 @@ package com.czlis.common.core.domain.entity.lis; import com.czlis.common.annotation.Excel; import com.czlis.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -23,6 +25,7 @@ public class ComDict { @Excel(name = "机构编码") private String yljg; @Excel(name = "备注") + @ApiModelProperty(value = "备注") private String bz; @Excel(name = "作废标识", readConverterExp = "1=是,0=否") private String userflag; diff --git a/transitPF/src/main/java/com/czlis/transitPF/controller/LabQuerySampleController.java b/transitPF/src/main/java/com/czlis/transitPF/controller/LabQuerySampleController.java index 0e75704..ea365ae 100644 --- a/transitPF/src/main/java/com/czlis/transitPF/controller/LabQuerySampleController.java +++ b/transitPF/src/main/java/com/czlis/transitPF/controller/LabQuerySampleController.java @@ -28,4 +28,5 @@ public class LabQuerySampleController { public Result getQuerySample(LabQuerySample labQuerySample) { return labQuerySampleService.getQuerySample(labQuerySample); } + } diff --git a/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySample.java b/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySample.java index 127fdb7..7019f77 100644 --- a/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySample.java +++ b/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySample.java @@ -1,5 +1,7 @@ package com.czlis.transitPF.pojo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -9,11 +11,13 @@ import java.util.Date; @Data @AllArgsConstructor @NoArgsConstructor +@ApiModel(description = "区域流转主表") public class LabQuerySample { private Integer uid; /** * 病人ID */ + @ApiModelProperty(value = "病人ID") private String PatId; /** * 就诊卡类型 @@ -126,6 +130,7 @@ public class LabQuerySample { /** * 标本条码号 */ + @ApiModelProperty(value = "标本条码号") private String Barcode; /** * 试管编码 diff --git a/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySampleDTO.java b/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySampleDTO.java index 1e1e3a6..d4591c5 100644 --- a/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySampleDTO.java +++ b/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySampleDTO.java @@ -1,5 +1,7 @@ package com.czlis.transitPF.pojo; + +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -10,6 +12,7 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor public class LabQuerySampleDTO { + @ApiModelProperty(value = "主表信息") private List LabQuerySampleList; private List LabQuerySampleDetailList; } diff --git a/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySampleDetail.java b/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySampleDetail.java index e31d9f6..c26ee08 100644 --- a/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySampleDetail.java +++ b/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySampleDetail.java @@ -34,11 +34,20 @@ public class LabQuerySampleDetail { private String SrcOrderItemName; private String FeeCode; private String FeeName; + /** + * 费用 + */ private BigDecimal Cost; + /** + * 状态 + */ private String Status; private String create_by; private Date create_time; private String update_by; private Date update_time; + /** + * 数据来源 + */ private String DataSource; }