Merge remote-tracking branch 'origin/master'

# Conflicts:
#	transitPF/src/main/java/com/czlis/transitPF/pojo/RegTransitSample.java
#	transitPF/src/main/java/com/czlis/transitPF/pojo/RegTransitSampleDTO.java

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;

transitPF/src/main/java/com/czlis/transitPF/controller/RegTransitSampleController.java

@@ -28,4 +28,5 @@ public class RegTransitSampleController {
     public Result getQuerySample(RegTransitSample labQuerySample) {
         return regTransitSampleService.getRegTransitSample(labQuerySample);
     }
+
 }

transitPF/src/main/java/com/czlis/transitPF/pojo/RegTransitSample.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,14 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+public class RegTransitSample {
+@ApiModel(description = "区域流转主表")
 public class RegTransitSample {
     private Integer uid;
     /**
      * 病人ID
      */
+    @ApiModelProperty(value = "病人ID")
     private String PatId;
     /**
      * 就诊卡类型
@@ -126,6 +131,7 @@ public class RegTransitSample {
     /**
      * 标本条码号
      */
+    @ApiModelProperty(value = "标本条码号")
     private String Barcode;
     /**
      * 试管编码

transitPF/src/main/java/com/czlis/transitPF/pojo/RegTransitSampleDTO.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 RegTransitSampleDTO {
+    @ApiModelProperty(value = "主表信息")
     private List<RegTransitSample> LabQuerySampleList;
     private List<RegTransitSampleDetail> regTransitSampleDetailList;
     }

transitPF/src/main/java/com/czlis/transitPF/pojo/RegTransitSampleDetail.java

@@ -34,11 +34,20 @@ public class RegTransitSampleDetail {
     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;
 }