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

RegTransitSample

Browse Source
This commit is contained in:
tangw 2025-11-11 09:39:08 +08:00
parent 9e600c821a
commit fb79c8c240
13 changed files with 193 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

213
sql/lis8.0/updatedb_lis8.0.sql
View File

@ -114,105 +114,128 @@ if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'lab_
) )
end end
if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'lab_QuerySample') if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'reg_TransitSample')
begin begin
CREATE TABLE [dbo].[lab_QuerySample]( CREATE TABLE [dbo].[reg_TransitSample](
[uid] [bigint] IDENTITY(1,1) NOT FOR REPLICATION NOT NULL, [uid] [bigint] IDENTITY(1,1) NOT FOR REPLICATION NOT NULL,
[PatId] [varchar](50) NULL, [PatId] [varchar](50) NULL,
[PatCardType] [varchar](10) NULL, [PatCardType] [varchar](10) NULL,
[PatCardNo] [varchar](30) NULL, [PatCardNo] [varchar](30) NULL,
[PatType] [varchar](10) NULL, [PatType] [varchar](10) NULL,
[RegNo] [varchar](50) NULL, [RegNo] [varchar](50) NULL,
[PatName] [varchar](100) NULL, [PatName] [varchar](100) NULL,
[PatSex] [varchar](10) NULL, [PatSex] [varchar](10) NULL,
[PatAge] [varchar](10) NULL, [PatAge] [varchar](10) NULL,
[AgeUnit] [varchar](10) NULL, [AgeUnit] [varchar](10) NULL,
[PatAgeShow] [varchar](10) NULL, [PatAgeShow] [varchar](10) NULL,
[PatBirthday] [varchar](10) NULL, [PatBirthday] [varchar](10) NULL,
[PatIdentity] [varchar](30) NULL, [PatIdentity] [varchar](30) NULL,
[Phone] [varchar](30) NULL, [Phone] [varchar](30) NULL,
[Address] [varchar](200) NULL, [Address] [varchar](200) NULL,
[PatFeeType] [varchar](10) NULL, [PatFeeType] [varchar](10) NULL,
[DepartCode] [varchar](30) NULL, [DepartCode] [varchar](30) NULL,
[DepartName] [varchar](30) NULL, [DepartName] [varchar](30) NULL,
[AreaCode] [varchar](30) NULL, [AreaCode] [varchar](30) NULL,
[AreaName] [varchar](50) NULL, [AreaName] [varchar](50) NULL,
[PatBed] [varchar](30) NULL, [PatBed] [varchar](30) NULL,
[DiagnosisCode] [varchar](200) NULL, [DiagnosisCode] [varchar](200) NULL,
[DiagnosisName] [varchar](200) NULL, [DiagnosisName] [varchar](200) NULL,
[OrderPatId] [varchar](30) NULL, [OrderPatId] [varchar](30) NULL,
[OrderUserCode] [varchar](30) NULL, [OrderUserCode] [varchar](30) NULL,
[OrderUserName] [varchar](50) NULL, [OrderUserName] [varchar](50) NULL,
[OrderTime] [datetime] NULL, [OrderTime] [datetime] NULL,
[SrcHospCode] [varchar](30) NULL, [SrcHospCode] [varchar](30) NULL,
[SrcHospName] [varchar](200) NULL, [SrcHospName] [varchar](200) NULL,
[Barcode] [varchar](30) NULL, [Barcode] [varchar](30) NULL,
[SrcHospBarcode] [varchar](30) NULL, [SrcHospBarcode] [varchar](30) NULL,
[TubeCode] [varchar](30) NULL, [TubeCode] [varchar](30) NULL,
[TubeName] [varchar](50) NULL, [TubeName] [varchar](50) NULL,
[tubeColor] [varchar](30) NULL, [tubeColor] [varchar](30) NULL,
[SampleTypeCode] [varchar](30) NULL, [SampleTypeCode] [varchar](30) NULL,
[SampleTypeName] [varchar](50) NULL, [SampleTypeName] [varchar](50) NULL,
[BodyCode] [varchar](30) NULL, [BodyCode] [varchar](30) NULL,
[BodyName] [varchar](50) NULL, [BodyName] [varchar](50) NULL,
[IsER] [varchar](10) NULL, [IsER] [varchar](10) NULL,
[Status] [varchar](30) NULL, [Status] [varchar](30) NULL,
[AffirmTime] [datetime] NULL, [AffirmTime] [datetime] NULL,
[AffirmUserCode] [varchar](30) NULL, [AffirmUserCode] [varchar](30) NULL,
[AffirmUserName] [varchar](50) NULL, [AffirmUserName] [varchar](50) NULL,
[SendPackTime] [datetime] NULL, [SendPackTime] [datetime] NULL,
[SendUserCode] [varchar](30) NULL, [SendUserCode] [varchar](30) NULL,
[SendUserName] [varchar](50) NULL, [SendUserName] [varchar](50) NULL,
[SignInTime] [datetime] NULL, [SignInTime] [datetime] NULL,
[SignInUserCode] [varchar](30) NULL, [SignInUserCode] [varchar](30) NULL,
[SignInUserName] [varchar](50) NULL, [SignInUserName] [varchar](50) NULL,
[DstHospCode] [varchar](30) NULL, [DstHospCode] [varchar](30) NULL,
[DstHospName] [varchar](50) NULL, [DstHospName] [varchar](50) NULL,
[ExpressComCode] [varchar](30) NULL, [ExpressComCode] [varchar](30) NULL,
[ExpressComName] [varchar](50) NULL, [ExpressComName] [varchar](50) NULL,
[PackSerial] [varchar](30) NULL, [PackSerial] [varchar](30) NULL,
[ExpressNum] [varchar](30) NULL, [ExpressNum] [varchar](30) NULL,
create_by varchar(50), create_by varchar(50),
create_time datetime, create_time datetime,
update_by varchar(50), update_by varchar(50),
update_time datetime, update_time datetime,
DataSource varchar(50) DataSource varchar(50)
CONSTRAINT [PK_lab_QuerySample] PRIMARY KEY CLUSTERED CONSTRAINT [PK_reg_TransitSample] PRIMARY KEY CLUSTERED
( (
[uid] ASC [uid] ASC
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
) ON [PRIMARY]; ) ON [PRIMARY];
CREATE INDEX IX_lab_QuerySample_Barcode ON lab_QuerySample(Barcode); 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') if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'reg_TransitSample_detail')
begin begin
create table lab_QuerySample_detail ( create table reg_TransitSample_detail (
[uid] [bigint] IDENTITY(1,1) primary key, [uid] [bigint] IDENTITY(1,1) primary key,
Barcode varchar(20), Barcode varchar(20),
OrderItemSerial decimal(2), OrderItemSerial decimal(2),
OrderItemCode varchar(50), OrderItemCode varchar(50),
OrderItemName varchar(100), OrderItemName varchar(100),
[GroupItemCode] [varchar](30) NULL, [GroupItemCode] [varchar](30) NULL,
[GroupItemName] [varchar](50) NULL, [GroupItemName] [varchar](50) NULL,
[SrcOrderItemCode] [varchar](30) NULL, [SrcOrderItemCode] [varchar](30) NULL,
[SrcOrderItemName] [varchar](50) NULL, [SrcOrderItemName] [varchar](50) NULL,
[FeeCode] [varchar](30) NULL, [FeeCode] [varchar](30) NULL,
[FeeName] [varchar](50) NULL, [FeeName] [varchar](50) NULL,
[Cost] [decimal](18,2) NULL, [Cost] [decimal](18,2) NULL,
[Status] [varchar](30) NULL, [Status] [varchar](30) NULL,
create_by varchar(50), create_by varchar(50),
create_time datetime, create_time datetime,
update_by varchar(50), update_by varchar(50),
update_time datetime, update_time datetime,
DataSource varchar(50) DataSource varchar(50)
); );
ALTER TABLE lab_QuerySample_detail ADD CONSTRAINT UQ_lab_QuerySample_detail_Barcode_OrderItemSerial UNIQUE (Barcode, OrderItemSerial); ALTER TABLE reg_TransitSample_detail ADD CONSTRAINT UQ_reg_TransitSample_detail_Barcode_OrderItemSerial UNIQUE (Barcode, OrderItemSerial);
CREATE INDEX IX_lab_QuerySample_detail_Barcode_OrderItemSerial ON lab_QuerySample_detail(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

4
sql/ry_20240629.sql
View File

@ -702,3 +702,7 @@ create table gen_table_column (
update_time datetime comment '更新时间', update_time datetime comment '更新时间',
primary key (column_id) primary key (column_id)
) engine=innodb auto_increment=1 comment = '代码生成业务表字段'; ) engine=innodb auto_increment=1 comment = '代码生成业务表字段';

12
transitPF/src/main/java/com/czlis/transitPF/controller/LabQuerySampleController.java → transitPF/src/main/java/com/czlis/transitPF/controller/RegTransitSampleController.java
View File

@ -1,8 +1,8 @@
package com.czlis.transitPF.controller; package com.czlis.transitPF.controller;
import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.Result;
import com.czlis.transitPF.pojo.LabQuerySample; import com.czlis.transitPF.pojo.RegTransitSample;
import com.czlis.transitPF.service.LabQuerySampleService; import com.czlis.transitPF.service.RegTransitSampleService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -18,14 +18,14 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@RequestMapping("/transit") @RequestMapping("/transit")
@Slf4j @Slf4j
public class LabQuerySampleController { public class RegTransitSampleController {
@Autowired @Autowired
private LabQuerySampleService labQuerySampleService; private RegTransitSampleService regTransitSampleService;
@ApiOperation("获取流转数据") @ApiOperation("获取流转数据")
@GetMapping("/querySample") @GetMapping("/querySample")
public Result getQuerySample(LabQuerySample labQuerySample) { public Result getQuerySample(RegTransitSample labQuerySample) {
return labQuerySampleService.getQuerySample(labQuerySample); return regTransitSampleService.getRegTransitSample(labQuerySample);
} }
} }

12
transitPF/src/main/java/com/czlis/transitPF/mapper/LabQuerySampleMapper.java
View File

@ -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<LabQuerySample> getQuerySample(LabQuerySample labQuerySample);
List<LabQuerySampleDetail> getQuerySampleDetail(LabQuerySampleDetail labQuerySampleDetail);
}

11
transitPF/src/main/java/com/czlis/transitPF/mapper/RegTransitSampleMapper.java Normal file
View File

@ -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<RegTransitSample> getRegTransitSample(RegTransitSample labQuerySample);
List<RegTransitSampleDetail> getRegTransitSampleDetail(RegTransitSampleDetail regTransitSampleDetail);
}

2
transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySample.java → transitPF/src/main/java/com/czlis/transitPF/pojo/RegTransitSample.java
View File

@ -9,7 +9,7 @@ import java.util.Date;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public class LabQuerySample { public class RegTransitSample {
private Integer uid; private Integer uid;
/** /**
* 病人ID * 病人ID

6
transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySampleDTO.java → transitPF/src/main/java/com/czlis/transitPF/pojo/RegTransitSampleDTO.java
View File

@ -9,7 +9,7 @@ import java.util.List;
@Data @Data
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class LabQuerySampleDTO { public class RegTransitSampleDTO {
private List<LabQuerySample> LabQuerySampleList; private List<RegTransitSample> LabQuerySampleList;
private List<LabQuerySampleDetail> LabQuerySampleDetailList; private List<RegTransitSampleDetail> regTransitSampleDetailList;
} }

2
transitPF/src/main/java/com/czlis/transitPF/pojo/LabQuerySampleDetail.java → transitPF/src/main/java/com/czlis/transitPF/pojo/RegTransitSampleDetail.java
View File

@ -10,7 +10,7 @@ import java.util.Date;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public class LabQuerySampleDetail { public class RegTransitSampleDetail {
private Integer uid; private Integer uid;
/** /**
* 条码号 * 条码号

8
transitPF/src/main/java/com/czlis/transitPF/service/LabQuerySampleService.java
View File

@ -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);
}

8
transitPF/src/main/java/com/czlis/transitPF/service/RegTransitSampleService.java Normal file
View File

@ -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);
}

34
transitPF/src/main/java/com/czlis/transitPF/service/impl/LabQuerySampleServiceImpl.java
View File

@ -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<LabQuerySample> labQuerySampleList = labQuerySampleMapper.getQuerySample(labQuerySample);
LabQuerySampleDetail labQuerySampleDetail = new LabQuerySampleDetail();
labQuerySampleDetail.setBarcode(labQuerySample.getBarcode());
List<LabQuerySampleDetail> querySampleDetailList = labQuerySampleMapper.getQuerySampleDetail(labQuerySampleDetail);
LabQuerySampleDTO labQuerySampleDTO = new LabQuerySampleDTO();
labQuerySampleDTO.setLabQuerySampleList(labQuerySampleList);
labQuerySampleDTO.setLabQuerySampleDetailList(querySampleDetailList);
return new Result("0","查询成功！",labQuerySampleDTO);
}
}

35
transitPF/src/main/java/com/czlis/transitPF/service/impl/RegTransitSampleServiceImpl.java Normal file
View File

@ -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<RegTransitSample> labQuerySampleList = regTransitSampleMapper.getRegTransitSample(labQuerySample);
RegTransitSampleDetail regTransitSampleDetail = new RegTransitSampleDetail();
regTransitSampleDetail.setBarcode(labQuerySample.getBarcode());
List<RegTransitSampleDetail> querySampleDetailList = regTransitSampleMapper.getRegTransitSampleDetail(regTransitSampleDetail);
RegTransitSampleDTO regTransitSampleDTO = new RegTransitSampleDTO();
regTransitSampleDTO.setLabQuerySampleList(labQuerySampleList);
regTransitSampleDTO.setRegTransitSampleDetailList(querySampleDetailList);
return new Result("0","查询成功！", regTransitSampleDTO);
}
}

10
transitPF/src/main/resources/mapper/LabQuerySampleMapper.xml → transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml
View File

@ -2,17 +2,17 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.czlis.transitPF.mapper.LabQuerySampleMapper"> <mapper namespace="com.czlis.transitPF.mapper.RegTransitSampleMapper">
<select id="getQuerySample" resultType="com.czlis.transitPF.pojo.LabQuerySample"> <select id="getRegTransitSample" resultType="com.czlis.transitPF.pojo.RegTransitSample">
select * from lab_QuerySample select * from Reg_TransitSample
<where> <where>
<if test="Barcode != null and Barcode !=''">and Barcode = #{Barcode}</if> <if test="Barcode != null and Barcode !=''">and Barcode = #{Barcode}</if>
</where> </where>
</select> </select>
<select id="getQuerySampleDetail" resultType="com.czlis.transitPF.pojo.LabQuerySampleDetail"> <select id="getRegTransitSampleDetail" resultType="com.czlis.transitPF.pojo.RegTransitSampleDetail">
select * from lab_QuerySample_detail select * from Reg_TransitSample_detail
<where> <where>
<if test="Barcode != null and Barcode !=''">and Barcode = #{Barcode}</if> <if test="Barcode != null and Barcode !=''">and Barcode = #{Barcode}</if>
</where> </where>