diff --git a/lis-system/pom.xml b/lis-system/pom.xml
index c252fd8..cabec75 100644
--- a/lis-system/pom.xml
+++ b/lis-system/pom.xml
@@ -55,6 +55,11 @@
zybgcx
+
+ com.czlis
+ transitPF
+
+
com.czlis
@@ -172,6 +177,7 @@
zybgcx-8.0.0.jar
zycx-8.0.0.jar
lisresources-8.0.0.jar
+ transitPF-8.0.0.jar
diff --git a/pom.xml b/pom.xml
index 9d0d500..1b6d50a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,7 @@
8.0.0
8.0.0
8.0.0
+ 8.0.0
UTF-8
UTF-8
1.8
@@ -266,6 +267,13 @@
${czlis.version}
+
+ com.czlis
+ transitPF
+ ${czlis.transitPF}
+
+
+
@@ -359,6 +367,7 @@
lis-quartz
lis-interfaceCommon
lisresources
+ transitPF
pom
diff --git a/sql/lis8.0/updatedb_lis8.0.sql b/sql/lis8.0/updatedb_lis8.0.sql
index 3614948..da7ff63 100644
--- a/sql/lis8.0/updatedb_lis8.0.sql
+++ b/sql/lis8.0/updatedb_lis8.0.sql
@@ -112,4 +112,107 @@ if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'lab_
condition varchar(500),
PRIMARY KEY (yq, xh,bgdh)
)
- end
\ No newline at end of file
+ end
+
+if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'lab_QuerySample')
+ 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);
+
+
+ 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);
+
+ end
+
diff --git a/transitPF/pom.xml b/transitPF/pom.xml
new file mode 100644
index 0000000..e6f80e4
--- /dev/null
+++ b/transitPF/pom.xml
@@ -0,0 +1,25 @@
+
+ 4.0.0
+
+ com.czlis
+ czlis
+ 8.0.0
+
+
+ transitPF
+ jar
+
+ transitPF
+
+
+ UTF-8
+
+
+
+
+ com.czlis
+ lis-interfaceCommon
+
+
+
diff --git a/transitPF/src/main/java/com/czlis/transitPF/controller/LabQuerySampleController.java b/transitPF/src/main/java/com/czlis/transitPF/controller/LabQuerySampleController.java
new file mode 100644
index 0000000..0e75704
--- /dev/null
+++ b/transitPF/src/main/java/com/czlis/transitPF/controller/LabQuerySampleController.java
@@ -0,0 +1,31 @@
+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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 区域检验中心，标本流转
+ */
+@Api(tags = "区域检验中心-标本流转")
+@RestController
+@RequestMapping("/transit")
+@Slf4j
+public class LabQuerySampleController {
+
+ @Autowired
+ private LabQuerySampleService labQuerySampleService;
+
+ @ApiOperation("获取流转数据")
+ @GetMapping("/querySample")
+ public Result getQuerySample(LabQuerySample labQuerySample) {
+ return labQuerySampleService.getQuerySample(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
new file mode 100644
index 0000000..c987c8e
--- /dev/null
+++ b/transitPF/src/main/java/com/czlis/transitPF/mapper/LabQuerySampleMapper.java
@@ -0,0 +1,12 @@
+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/pojo/LabQuerySample.java b/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySample.java
new file mode 100644
index 0000000..127fdb7
--- /dev/null
+++ b/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySample.java
@@ -0,0 +1,236 @@
+package com.czlis.transitPF.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabQuerySample {
+ private Integer uid;
+ /**
+ * 病人ID
+ */
+ private String PatId;
+ /**
+ * 就诊卡类型
+ */
+ private String PatCardType;
+ /**
+ * 就诊卡号
+ */
+ private String PatCardNo;
+ /**
+ * 病人类型
+ */
+ private String PatType;
+ /**
+ * 就诊号或住院号
+ */
+ private String RegNo;
+ /**
+ * 病人姓名
+ */
+ private String PatName;
+ /**
+ * 病人性别
+ */
+ private String PatSex;
+ /**
+ * 年龄大小
+ */
+ private String PatAge;
+ /**
+ * 年龄单位
+ */
+ private String AgeUnit;
+ /**
+ * 病人年龄 单位具体有：天、月、岁
+ */
+ private String PatAgeShow;
+ /**
+ * 出生日期 时间格式：yyyy-MM-dd
+ */
+ private String PatBirthday;
+ /**
+ * 身份证号
+ */
+ private String PatIdentity;
+ /**
+ * 手机
+ */
+ private String Phone;
+ /**
+ * 现居地址
+ */
+ private String Address;
+ /**
+ * 费用类型 1-自费 2-医保 3-职工报销 4-其他
+ */
+ private String PatFeeType;
+ /**
+ * 申请科室编码
+ */
+ private String DepartCode;
+ /**
+ * 申请科室名称
+ */
+ private String DepartName;
+ /**
+ * 申请病区编码
+ */
+ private String AreaCode;
+ /**
+ * 申请病区名
+ */
+ private String AreaName;
+ /**
+ * 床号
+ */
+ private String PatBed;
+ /**
+ * 诊断编码
+ */
+ private String DiagnosisCode;
+ /**
+ * 诊断名称
+ */
+ private String DiagnosisName;
+ /**
+ * 申请单号
+ */
+ private String OrderPatId;
+ /**
+ * 开单医生代码
+ */
+ private String OrderUserCode;
+ /**
+ * 开单医生姓名
+ */
+ private String OrderUserName;
+ /**
+ * 开单时间
+ */
+ private Date OrderTime;
+ /**
+ * 委托机构编码
+ */
+ private String SrcHospCode;
+ /**
+ * 委托机构名称
+ */
+ private String SrcHospName;
+ /**
+ * 标本条码号
+ */
+ private String Barcode;
+ /**
+ * 试管编码
+ */
+ private String SrcHospBarcode;
+ /**
+ * 试管编码
+ */
+ private String TubeCode;
+ /**
+ * 试管名称
+ */
+ private String TubeName;
+ /**
+ * 试管颜色
+ */
+ private String tubeColor;
+ /**
+ * 标本类型代码
+ */
+ private String SampleTypeCode;
+ /**
+ * 标本类型名称
+ */
+ private String SampleTypeName;
+ /**
+ * 采集部位编码
+ */
+ private String BodyCode;
+ /**
+ * 采集部位名称
+ */
+ private String BodyName;
+ /**
+ * 是否急查
+ */
+ private String IsER;
+ /**
+ * 状态
+ */
+ private String Status;
+ /**
+ *标本采集时间
+ */
+ private Date AffirmTime;
+ /**
+ *标本采集人编码
+ */
+ private String AffirmUserCode;
+ /**
+ *标本采集人姓名
+ */
+ private String AffirmUserName;
+ /**
+ *送出时间
+ */
+ private Date SendPackTime;
+ /**
+ * 送出人代码
+ */
+ private String SendUserCode;
+ /**
+ * 送出人姓名
+ */
+ private String SendUserName;
+ /**
+ * 签收时间
+ */
+ private Date SignInTime;
+ /**
+ * 签收人代码
+ */
+ private String SignInUserCode;
+ /**
+ * 签收人姓名
+ */
+ private String SignInUserName;
+ /**
+ *检测机构编码
+ */
+ private String DstHospCode;
+ /**
+ * 检测机构名称
+ */
+ private String DstHospName;
+ /**
+ * 扩展编码
+ */
+ private String ExpressComCode;
+ /**
+ * 扩展名称
+ */
+ private String ExpressComName;
+ /**
+ *包裹排序
+ */
+ private String PackSerial;
+ /**
+ * 扩展序号
+ */
+ private String ExpressNum;
+
+
+
+
+
+
+}
diff --git a/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySampleDTO.java b/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySampleDTO.java
new file mode 100644
index 0000000..1e1e3a6
--- /dev/null
+++ b/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySampleDTO.java
@@ -0,0 +1,15 @@
+package com.czlis.transitPF.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class LabQuerySampleDTO {
+ 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
new file mode 100644
index 0000000..e31d9f6
--- /dev/null
+++ b/transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySampleDetail.java
@@ -0,0 +1,44 @@
+package com.czlis.transitPF.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabQuerySampleDetail {
+ private Integer uid;
+ /**
+ * 条码号
+ */
+ private String Barcode;
+ /**
+ * 序号
+ */
+ private BigDecimal OrderItemSerial;
+ /**
+ * 项目代码
+ */
+ private String OrderItemCode;
+ /**
+ * 项目名称
+ */
+ private String OrderItemName;
+ private String GroupItemCode;
+ private String GroupItemName;
+ private String SrcOrderItemCode;
+ 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;
+}
diff --git a/transitPF/src/main/java/com/czlis/transitPF/service/LabQuerySampleService.java b/transitPF/src/main/java/com/czlis/transitPF/service/LabQuerySampleService.java
new file mode 100644
index 0000000..e1fb7c7
--- /dev/null
+++ b/transitPF/src/main/java/com/czlis/transitPF/service/LabQuerySampleService.java
@@ -0,0 +1,8 @@
+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/impl/LabQuerySampleServiceImpl.java b/transitPF/src/main/java/com/czlis/transitPF/service/impl/LabQuerySampleServiceImpl.java
new file mode 100644
index 0000000..46c681c
--- /dev/null
+++ b/transitPF/src/main/java/com/czlis/transitPF/service/impl/LabQuerySampleServiceImpl.java
@@ -0,0 +1,34 @@
+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/resources/mapper/LabQuerySampleMapper.xml b/transitPF/src/main/resources/mapper/LabQuerySampleMapper.xml
new file mode 100644
index 0000000..f3a0dd2
--- /dev/null
+++ b/transitPF/src/main/resources/mapper/LabQuerySampleMapper.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file