From fb79c8c2407371be7836edc211101ca2d1985275 Mon Sep 17 00:00:00 2001 From: tangw Date: Tue, 11 Nov 2025 09:39:08 +0800 Subject: [PATCH] RegTransitSample --- sql/lis8.0/updatedb_lis8.0.sql | 213 ++++++++++-------- sql/ry_20240629.sql | 6 +- ...r.java => RegTransitSampleController.java} | 12 +- .../mapper/LabQuerySampleMapper.java | 12 - .../mapper/RegTransitSampleMapper.java | 11 + ...QuerySample.java => RegTransitSample.java} | 2 +- ...ampleDTO.java => RegTransitSampleDTO.java} | 6 +- ...etail.java => RegTransitSampleDetail.java} | 2 +- .../service/LabQuerySampleService.java | 8 - .../service/RegTransitSampleService.java | 8 + .../impl/LabQuerySampleServiceImpl.java | 34 --- .../impl/RegTransitSampleServiceImpl.java | 35 +++ ...eMapper.xml => RegTransitSampleMapper.xml} | 10 +- 13 files changed, 193 insertions(+), 166 deletions(-) rename transitPF/src/main/java/com/czlis/transitPF/controller/{LabQuerySampleController.java => RegTransitSampleController.java} (65%) delete mode 100644 transitPF/src/main/java/com/czlis/transitPF/mapper/LabQuerySampleMapper.java create mode 100644 transitPF/src/main/java/com/czlis/transitPF/mapper/RegTransitSampleMapper.java rename transitPF/src/main/java/com/czlis/transitPF/pojo/{LabQuerySample.java => RegTransitSample.java} (99%) rename transitPF/src/main/java/com/czlis/transitPF/pojo/{LabQuerySampleDTO.java => RegTransitSampleDTO.java} (54%) rename transitPF/src/main/java/com/czlis/transitPF/pojo/{LabQuerySampleDetail.java => RegTransitSampleDetail.java} (96%) delete mode 100644 transitPF/src/main/java/com/czlis/transitPF/service/LabQuerySampleService.java create mode 100644 transitPF/src/main/java/com/czlis/transitPF/service/RegTransitSampleService.java delete mode 100644 transitPF/src/main/java/com/czlis/transitPF/service/impl/LabQuerySampleServiceImpl.java create mode 100644 transitPF/src/main/java/com/czlis/transitPF/service/impl/RegTransitSampleServiceImpl.java rename transitPF/src/main/resources/mapper/{LabQuerySampleMapper.xml => RegTransitSampleMapper.xml} (55%) diff --git a/sql/lis8.0/updatedb_lis8.0.sql b/sql/lis8.0/updatedb_lis8.0.sql index da7ff63..a9dc8ea 100644 --- a/sql/lis8.0/updatedb_lis8.0.sql +++ b/sql/lis8.0/updatedb_lis8.0.sql @@ -114,105 +114,128 @@ if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'lab_ ) end -if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'lab_QuerySample') - begin +if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'reg_TransitSample') +begin - CREATE TABLE [dbo].[lab_QuerySample]( - [uid] [bigint] IDENTITY(1,1) NOT FOR REPLICATION NOT NULL, - [PatId] [varchar](50) NULL, - [PatCardType] [varchar](10) NULL, - [PatCardNo] [varchar](30) NULL, - [PatType] [varchar](10) NULL, - [RegNo] [varchar](50) NULL, - [PatName] [varchar](100) NULL, - [PatSex] [varchar](10) NULL, - [PatAge] [varchar](10) NULL, - [AgeUnit] [varchar](10) NULL, - [PatAgeShow] [varchar](10) NULL, - [PatBirthday] [varchar](10) NULL, - [PatIdentity] [varchar](30) NULL, - [Phone] [varchar](30) NULL, - [Address] [varchar](200) NULL, - [PatFeeType] [varchar](10) NULL, - [DepartCode] [varchar](30) NULL, - [DepartName] [varchar](30) NULL, - [AreaCode] [varchar](30) NULL, - [AreaName] [varchar](50) NULL, - [PatBed] [varchar](30) NULL, - [DiagnosisCode] [varchar](200) NULL, - [DiagnosisName] [varchar](200) NULL, - [OrderPatId] [varchar](30) NULL, - [OrderUserCode] [varchar](30) NULL, - [OrderUserName] [varchar](50) NULL, - [OrderTime] [datetime] NULL, - [SrcHospCode] [varchar](30) NULL, - [SrcHospName] [varchar](200) NULL, - [Barcode] [varchar](30) NULL, - [SrcHospBarcode] [varchar](30) NULL, - [TubeCode] [varchar](30) NULL, - [TubeName] [varchar](50) NULL, - [tubeColor] [varchar](30) NULL, - [SampleTypeCode] [varchar](30) NULL, - [SampleTypeName] [varchar](50) NULL, - [BodyCode] [varchar](30) NULL, - [BodyName] [varchar](50) NULL, - [IsER] [varchar](10) NULL, - [Status] [varchar](30) NULL, - [AffirmTime] [datetime] NULL, - [AffirmUserCode] [varchar](30) NULL, - [AffirmUserName] [varchar](50) NULL, - [SendPackTime] [datetime] NULL, - [SendUserCode] [varchar](30) NULL, - [SendUserName] [varchar](50) NULL, - [SignInTime] [datetime] NULL, - [SignInUserCode] [varchar](30) NULL, - [SignInUserName] [varchar](50) NULL, - [DstHospCode] [varchar](30) NULL, - [DstHospName] [varchar](50) NULL, - [ExpressComCode] [varchar](30) NULL, - [ExpressComName] [varchar](50) NULL, - [PackSerial] [varchar](30) NULL, - [ExpressNum] [varchar](30) NULL, - create_by varchar(50), - create_time datetime, - update_by varchar(50), - update_time datetime, - DataSource varchar(50) - CONSTRAINT [PK_lab_QuerySample] PRIMARY KEY CLUSTERED - ( - [uid] ASC - )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] - ) ON [PRIMARY]; - CREATE INDEX IX_lab_QuerySample_Barcode ON lab_QuerySample(Barcode); +CREATE TABLE [dbo].[reg_TransitSample]( + [uid] [bigint] IDENTITY(1,1) NOT FOR REPLICATION NOT NULL, + [PatId] [varchar](50) NULL, + [PatCardType] [varchar](10) NULL, + [PatCardNo] [varchar](30) NULL, + [PatType] [varchar](10) NULL, + [RegNo] [varchar](50) NULL, + [PatName] [varchar](100) NULL, + [PatSex] [varchar](10) NULL, + [PatAge] [varchar](10) NULL, + [AgeUnit] [varchar](10) NULL, + [PatAgeShow] [varchar](10) NULL, + [PatBirthday] [varchar](10) NULL, + [PatIdentity] [varchar](30) NULL, + [Phone] [varchar](30) NULL, + [Address] [varchar](200) NULL, + [PatFeeType] [varchar](10) NULL, + [DepartCode] [varchar](30) NULL, + [DepartName] [varchar](30) NULL, + [AreaCode] [varchar](30) NULL, + [AreaName] [varchar](50) NULL, + [PatBed] [varchar](30) NULL, + [DiagnosisCode] [varchar](200) NULL, + [DiagnosisName] [varchar](200) NULL, + [OrderPatId] [varchar](30) NULL, + [OrderUserCode] [varchar](30) NULL, + [OrderUserName] [varchar](50) NULL, + [OrderTime] [datetime] NULL, + [SrcHospCode] [varchar](30) NULL, + [SrcHospName] [varchar](200) NULL, + [Barcode] [varchar](30) NULL, + [SrcHospBarcode] [varchar](30) NULL, + [TubeCode] [varchar](30) NULL, + [TubeName] [varchar](50) NULL, + [tubeColor] [varchar](30) NULL, + [SampleTypeCode] [varchar](30) NULL, + [SampleTypeName] [varchar](50) NULL, + [BodyCode] [varchar](30) NULL, + [BodyName] [varchar](50) NULL, + [IsER] [varchar](10) NULL, + [Status] [varchar](30) NULL, + [AffirmTime] [datetime] NULL, + [AffirmUserCode] [varchar](30) NULL, + [AffirmUserName] [varchar](50) NULL, + [SendPackTime] [datetime] NULL, + [SendUserCode] [varchar](30) NULL, + [SendUserName] [varchar](50) NULL, + [SignInTime] [datetime] NULL, + [SignInUserCode] [varchar](30) NULL, + [SignInUserName] [varchar](50) NULL, + [DstHospCode] [varchar](30) NULL, + [DstHospName] [varchar](50) NULL, + [ExpressComCode] [varchar](30) NULL, + [ExpressComName] [varchar](50) NULL, + [PackSerial] [varchar](30) NULL, + [ExpressNum] [varchar](30) NULL, + create_by varchar(50), + create_time datetime, + update_by varchar(50), + update_time datetime, + DataSource varchar(50) + CONSTRAINT [PK_reg_TransitSample] PRIMARY KEY CLUSTERED +( +[uid] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] + ) ON [PRIMARY]; +CREATE INDEX IX_reg_TransitSample_Barcode ON reg_TransitSample(Barcode); - end +end -if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'lab_QuerySample_detail') - begin - create table lab_QuerySample_detail ( - [uid] [bigint] IDENTITY(1,1) primary key, - Barcode varchar(20), - OrderItemSerial decimal(2), - OrderItemCode varchar(50), - OrderItemName varchar(100), - [GroupItemCode] [varchar](30) NULL, - [GroupItemName] [varchar](50) NULL, - [SrcOrderItemCode] [varchar](30) NULL, - [SrcOrderItemName] [varchar](50) NULL, - [FeeCode] [varchar](30) NULL, - [FeeName] [varchar](50) NULL, - [Cost] [decimal](18,2) NULL, - [Status] [varchar](30) NULL, - create_by varchar(50), - create_time datetime, - update_by varchar(50), - update_time datetime, - DataSource varchar(50) - ); - ALTER TABLE lab_QuerySample_detail ADD CONSTRAINT UQ_lab_QuerySample_detail_Barcode_OrderItemSerial UNIQUE (Barcode, OrderItemSerial); - CREATE INDEX IX_lab_QuerySample_detail_Barcode_OrderItemSerial ON lab_QuerySample_detail(Barcode, OrderItemSerial); +if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'reg_TransitSample_detail') +begin +create table reg_TransitSample_detail ( + [uid] [bigint] IDENTITY(1,1) primary key, + Barcode varchar(20), + OrderItemSerial decimal(2), + OrderItemCode varchar(50), + OrderItemName varchar(100), + [GroupItemCode] [varchar](30) NULL, + [GroupItemName] [varchar](50) NULL, + [SrcOrderItemCode] [varchar](30) NULL, + [SrcOrderItemName] [varchar](50) NULL, + [FeeCode] [varchar](30) NULL, + [FeeName] [varchar](50) NULL, + [Cost] [decimal](18,2) NULL, + [Status] [varchar](30) NULL, + create_by varchar(50), + create_time datetime, + update_by varchar(50), + update_time datetime, + DataSource varchar(50) + ); +ALTER TABLE reg_TransitSample_detail ADD CONSTRAINT UQ_reg_TransitSample_detail_Barcode_OrderItemSerial UNIQUE (Barcode, OrderItemSerial); +CREATE INDEX IX_reg_TransitSample_detail_Barcode_OrderItemSerial ON reg_TransitSample_detail(Barcode, OrderItemSerial); - end +end +if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'reg_hospital') +begin + +CREATE TABLE [dbo].[reg_hospital]( + [hospital_id] [bigint] IDENTITY(1,1) NOT NULL, + [hospital_code] [varchar](64) NOT NULL, + [hospital_name] [varchar](50) NOT NULL, + [hospital_userinfo] [varchar](200) NULL, + [status] [char](1) NOT NULL, + [create_by] [varchar](64) NULL, + [create_time] [datetime] NULL, + [update_by] [varchar](64) NULL, + [update_time] [datetime] NULL, + [remark] [varchar](500) NULL, + PRIMARY KEY CLUSTERED +( +[hospital_id] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] + ) ON [PRIMARY] +ALTER TABLE [dbo].[reg_hospital] ADD DEFAULT ('') FOR [create_by] +ALTER TABLE [dbo].[reg_hospital] ADD DEFAULT ('') FOR [update_by] +ALTER TABLE [dbo].[reg_hospital] ADD DEFAULT (NULL) FOR [remark] +end \ No newline at end of file diff --git a/sql/ry_20240629.sql b/sql/ry_20240629.sql index 9e52558..ddd5a77 100644 --- a/sql/ry_20240629.sql +++ b/sql/ry_20240629.sql @@ -701,4 +701,8 @@ create table gen_table_column ( update_by varchar(64) default '' comment '更新者', update_time datetime comment '更新时间', primary key (column_id) -) engine=innodb auto_increment=1 comment = '代码生成业务表字段'; \ No newline at end of file +) engine=innodb auto_increment=1 comment = '代码生成业务表字段'; + + + + diff --git a/transitPF/src/main/java/com/czlis/transitPF/controller/LabQuerySampleController.java b/transitPF/src/main/java/com/czlis/transitPF/controller/RegTransitSampleController.java similarity index 65% rename from transitPF/src/main/java/com/czlis/transitPF/controller/LabQuerySampleController.java rename to transitPF/src/main/java/com/czlis/transitPF/controller/RegTransitSampleController.java index 0e75704..6fb9a7f 100644 --- a/transitPF/src/main/java/com/czlis/transitPF/controller/LabQuerySampleController.java +++ b/transitPF/src/main/java/com/czlis/transitPF/controller/RegTransitSampleController.java @@ -1,8 +1,8 @@ package com.czlis.transitPF.controller; import com.czlis.common.core.domain.Result; -import com.czlis.transitPF.pojo.LabQuerySample; -import com.czlis.transitPF.service.LabQuerySampleService; +import com.czlis.transitPF.pojo.RegTransitSample; +import com.czlis.transitPF.service.RegTransitSampleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -18,14 +18,14 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/transit") @Slf4j -public class LabQuerySampleController { +public class RegTransitSampleController { @Autowired - private LabQuerySampleService labQuerySampleService; + private RegTransitSampleService regTransitSampleService; @ApiOperation("获取流转数据") @GetMapping("/querySample") - public Result getQuerySample(LabQuerySample labQuerySample) { - return labQuerySampleService.getQuerySample(labQuerySample); + public Result getQuerySample(RegTransitSample labQuerySample) { + return regTransitSampleService.getRegTransitSample(labQuerySample); } } diff --git a/transitPF/src/main/java/com/czlis/transitPF/mapper/LabQuerySampleMapper.java b/transitPF/src/main/java/com/czlis/transitPF/mapper/LabQuerySampleMapper.java deleted file mode 100644 index c987c8e..0000000 --- a/transitPF/src/main/java/com/czlis/transitPF/mapper/LabQuerySampleMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.czlis.transitPF.mapper; - -import com.czlis.transitPF.pojo.LabQuerySample; -import com.czlis.transitPF.pojo.LabQuerySampleDTO; -import com.czlis.transitPF.pojo.LabQuerySampleDetail; - -import java.util.List; - -public interface LabQuerySampleMapper { - List getQuerySample(LabQuerySample labQuerySample); - List getQuerySampleDetail(LabQuerySampleDetail labQuerySampleDetail); -} diff --git a/transitPF/src/main/java/com/czlis/transitPF/mapper/RegTransitSampleMapper.java b/transitPF/src/main/java/com/czlis/transitPF/mapper/RegTransitSampleMapper.java new file mode 100644 index 0000000..c0038bd --- /dev/null +++ b/transitPF/src/main/java/com/czlis/transitPF/mapper/RegTransitSampleMapper.java @@ -0,0 +1,11 @@ +package com.czlis.transitPF.mapper; + +import com.czlis.transitPF.pojo.RegTransitSample; +import com.czlis.transitPF.pojo.RegTransitSampleDetail; + +import java.util.List; + +public interface RegTransitSampleMapper { + List getRegTransitSample(RegTransitSample labQuerySample); + List getRegTransitSampleDetail(RegTransitSampleDetail regTransitSampleDetail); +} diff --git a/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySample.java b/transitPF/src/main/java/com/czlis/transitPF/pojo/RegTransitSample.java similarity index 99% rename from transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySample.java rename to transitPF/src/main/java/com/czlis/transitPF/pojo/RegTransitSample.java index 127fdb7..ca2cf73 100644 --- a/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySample.java +++ b/transitPF/src/main/java/com/czlis/transitPF/pojo/RegTransitSample.java @@ -9,7 +9,7 @@ import java.util.Date; @Data @AllArgsConstructor @NoArgsConstructor -public class LabQuerySample { +public class RegTransitSample { private Integer uid; /** * 病人ID diff --git a/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySampleDTO.java b/transitPF/src/main/java/com/czlis/transitPF/pojo/RegTransitSampleDTO.java similarity index 54% rename from transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySampleDTO.java rename to transitPF/src/main/java/com/czlis/transitPF/pojo/RegTransitSampleDTO.java index 1e1e3a6..077ef93 100644 --- a/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySampleDTO.java +++ b/transitPF/src/main/java/com/czlis/transitPF/pojo/RegTransitSampleDTO.java @@ -9,7 +9,7 @@ import java.util.List; @Data @NoArgsConstructor @AllArgsConstructor -public class LabQuerySampleDTO { - private List LabQuerySampleList; - private List LabQuerySampleDetailList; +public class RegTransitSampleDTO { + private List LabQuerySampleList; + private List regTransitSampleDetailList; } diff --git a/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySampleDetail.java b/transitPF/src/main/java/com/czlis/transitPF/pojo/RegTransitSampleDetail.java similarity index 96% rename from transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySampleDetail.java rename to transitPF/src/main/java/com/czlis/transitPF/pojo/RegTransitSampleDetail.java index e31d9f6..394f078 100644 --- a/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySampleDetail.java +++ b/transitPF/src/main/java/com/czlis/transitPF/pojo/RegTransitSampleDetail.java @@ -10,7 +10,7 @@ import java.util.Date; @Data @AllArgsConstructor @NoArgsConstructor -public class LabQuerySampleDetail { +public class RegTransitSampleDetail { private Integer uid; /** * 条码号 diff --git a/transitPF/src/main/java/com/czlis/transitPF/service/LabQuerySampleService.java b/transitPF/src/main/java/com/czlis/transitPF/service/LabQuerySampleService.java deleted file mode 100644 index e1fb7c7..0000000 --- a/transitPF/src/main/java/com/czlis/transitPF/service/LabQuerySampleService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.czlis.transitPF.service; - -import com.czlis.common.core.domain.Result; -import com.czlis.transitPF.pojo.LabQuerySample; - -public interface LabQuerySampleService { - Result getQuerySample(LabQuerySample labQuerySample); -} diff --git a/transitPF/src/main/java/com/czlis/transitPF/service/RegTransitSampleService.java b/transitPF/src/main/java/com/czlis/transitPF/service/RegTransitSampleService.java new file mode 100644 index 0000000..c3c80b6 --- /dev/null +++ b/transitPF/src/main/java/com/czlis/transitPF/service/RegTransitSampleService.java @@ -0,0 +1,8 @@ +package com.czlis.transitPF.service; + +import com.czlis.common.core.domain.Result; +import com.czlis.transitPF.pojo.RegTransitSample; + +public interface RegTransitSampleService { + Result getRegTransitSample(RegTransitSample regTransitSample); +} diff --git a/transitPF/src/main/java/com/czlis/transitPF/service/impl/LabQuerySampleServiceImpl.java b/transitPF/src/main/java/com/czlis/transitPF/service/impl/LabQuerySampleServiceImpl.java deleted file mode 100644 index 46c681c..0000000 --- a/transitPF/src/main/java/com/czlis/transitPF/service/impl/LabQuerySampleServiceImpl.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.czlis.transitPF.service.impl; - -import com.czlis.common.core.domain.Result; -import com.czlis.transitPF.mapper.LabQuerySampleMapper; -import com.czlis.transitPF.pojo.LabQuerySample; -import com.czlis.transitPF.pojo.LabQuerySampleDTO; -import com.czlis.transitPF.pojo.LabQuerySampleDetail; -import com.czlis.transitPF.service.LabQuerySampleService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -@Slf4j -public class LabQuerySampleServiceImpl implements LabQuerySampleService { - - @Autowired - LabQuerySampleMapper labQuerySampleMapper; - - - @Override - public Result getQuerySample(LabQuerySample labQuerySample) { - List labQuerySampleList = labQuerySampleMapper.getQuerySample(labQuerySample); - LabQuerySampleDetail labQuerySampleDetail = new LabQuerySampleDetail(); - labQuerySampleDetail.setBarcode(labQuerySample.getBarcode()); - List querySampleDetailList = labQuerySampleMapper.getQuerySampleDetail(labQuerySampleDetail); - LabQuerySampleDTO labQuerySampleDTO = new LabQuerySampleDTO(); - labQuerySampleDTO.setLabQuerySampleList(labQuerySampleList); - labQuerySampleDTO.setLabQuerySampleDetailList(querySampleDetailList); - return new Result("0","查询成功！",labQuerySampleDTO); - } -} diff --git a/transitPF/src/main/java/com/czlis/transitPF/service/impl/RegTransitSampleServiceImpl.java b/transitPF/src/main/java/com/czlis/transitPF/service/impl/RegTransitSampleServiceImpl.java new file mode 100644 index 0000000..3269589 --- /dev/null +++ b/transitPF/src/main/java/com/czlis/transitPF/service/impl/RegTransitSampleServiceImpl.java @@ -0,0 +1,35 @@ +package com.czlis.transitPF.service.impl; + +import com.czlis.common.core.domain.Result; +import com.czlis.transitPF.mapper.RegTransitSampleMapper; +import com.czlis.transitPF.pojo.RegTransitSample; +import com.czlis.transitPF.pojo.RegTransitSampleDTO; +import com.czlis.transitPF.pojo.RegTransitSampleDetail; +import com.czlis.transitPF.service.RegTransitSampleService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Slf4j +public class RegTransitSampleServiceImpl implements RegTransitSampleService { + + @Autowired + RegTransitSampleMapper regTransitSampleMapper; + + + @Override + public Result getRegTransitSample(RegTransitSample labQuerySample) { + List labQuerySampleList = regTransitSampleMapper.getRegTransitSample(labQuerySample); + RegTransitSampleDetail regTransitSampleDetail = new RegTransitSampleDetail(); + regTransitSampleDetail.setBarcode(labQuerySample.getBarcode()); + List querySampleDetailList = regTransitSampleMapper.getRegTransitSampleDetail(regTransitSampleDetail); + RegTransitSampleDTO regTransitSampleDTO = new RegTransitSampleDTO(); + regTransitSampleDTO.setLabQuerySampleList(labQuerySampleList); + regTransitSampleDTO.setRegTransitSampleDetailList(querySampleDetailList); + return new Result("0","查询成功！", regTransitSampleDTO); + } + +} diff --git a/transitPF/src/main/resources/mapper/LabQuerySampleMapper.xml b/transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml similarity index 55% rename from transitPF/src/main/resources/mapper/LabQuerySampleMapper.xml rename to transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml index f3a0dd2..498bb8a 100644 --- a/transitPF/src/main/resources/mapper/LabQuerySampleMapper.xml +++ b/transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml @@ -2,17 +2,17 @@ - + - + select * from Reg_TransitSample and Barcode = #{Barcode} - + select * from Reg_TransitSample_detail and Barcode = #{Barcode}