jiangs/lis8.0
2
0
Fork 0
Code Issues 29 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: jiangs:140bcc5a353aad843b946f84fddcd9f6ac2a8082
Branches Tags
jiangs:master
jiangs:wy
jiangs:lis8.0_test
..
compare: jiangs:9e600c821a19609d280ad2f58d42707f5b9b0e41
Branches Tags
jiangs:master
jiangs:wy
jiangs:lis8.0_test

No commits in common. "140bcc5a353aad843b946f84fddcd9f6ac2a8082" and "9e600c821a19609d280ad2f58d42707f5b9b0e41" have entirely different histories.
140bcc5a35 ... 9e600c821a

5 changed files with 0 additions and 21 deletions
Show Stats Expand all files Collapse all files

3
lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComDict.java
View File

@ -2,8 +2,6 @@ package com.czlis.common.core.domain.entity.lis;
import com.czlis.common.annotation.Excel; import com.czlis.common.annotation.Excel;
import com.czlis.common.core.domain.BaseEntity; import com.czlis.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@ -25,7 +23,6 @@ public class ComDict {
@Excel(name = "机构编码") @Excel(name = "机构编码")
private String yljg; private String yljg;
@Excel(name = "备注") @Excel(name = "备注")
@ApiModelProperty(value = "备注")
private String bz; private String bz;
@Excel(name = "作废标识", readConverterExp = "1=是,0=否") @Excel(name = "作废标识", readConverterExp = "1=是,0=否")
private String userflag; private String userflag;

1
transitPF/src/main/java/com/czlis/transitPF/controller/LabQuerySampleController.java
View File

@ -28,5 +28,4 @@ public class LabQuerySampleController {
public Result getQuerySample(LabQuerySample labQuerySample) { public Result getQuerySample(LabQuerySample labQuerySample) {
return labQuerySampleService.getQuerySample(labQuerySample); return labQuerySampleService.getQuerySample(labQuerySample);
} }
} }

5
transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySample.java
View File

@ -1,7 +1,5 @@
package com.czlis.transitPF.pojo; package com.czlis.transitPF.pojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@ -11,13 +9,11 @@ import java.util.Date;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@ApiModel(description = "区域流转主表")
public class LabQuerySample { public class LabQuerySample {
private Integer uid; private Integer uid;
/** /**
* 病人ID * 病人ID
*/ */
@ApiModelProperty(value = "病人ID")
private String PatId; private String PatId;
/** /**
* 就诊卡类型 * 就诊卡类型
@ -130,7 +126,6 @@ public class LabQuerySample {
/** /**
* 标本条码号 * 标本条码号
*/ */
@ApiModelProperty(value = "标本条码号")
private String Barcode; private String Barcode;
/** /**
* 试管编码 * 试管编码

3
transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySampleDTO.java
View File

@ -1,7 +1,5 @@
package com.czlis.transitPF.pojo; package com.czlis.transitPF.pojo;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@ -12,7 +10,6 @@ import java.util.List;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class LabQuerySampleDTO { public class LabQuerySampleDTO {
@ApiModelProperty(value = "主表信息")
private List<LabQuerySample> LabQuerySampleList; private List<LabQuerySample> LabQuerySampleList;
private List<LabQuerySampleDetail> LabQuerySampleDetailList; private List<LabQuerySampleDetail> LabQuerySampleDetailList;
} }

9
transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySampleDetail.java
View File

@ -34,20 +34,11 @@ public class LabQuerySampleDetail {
private String SrcOrderItemName; private String SrcOrderItemName;
private String FeeCode; private String FeeCode;
private String FeeName; private String FeeName;
/**
* 费用
*/
private BigDecimal Cost; private BigDecimal Cost;
/**
* 状态
*/
private String Status; private String Status;
private String create_by; private String create_by;
private Date create_time; private Date create_time;
private String update_by; private String update_by;
private Date update_time; private Date update_time;
/**
* 数据来源
*/
private String DataSource; private String DataSource;
} }