新增查报告接口

master
宇宙皮皮娃 12 months ago
parent 15fd83bd9d
commit 8cabe7d830

@ -87,6 +87,11 @@
<version>3.4.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.3.0</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>

@ -3,7 +3,6 @@ package com.docus.server;
import lombok.extern.slf4j.Slf4j;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.openfeign.EnableFeignClients;
@ -14,7 +13,6 @@ import org.springframework.jms.annotation.EnableJms;
@SpringBootApplication(scanBasePackages ={"com.docus","com.neusoft"})
@EnableJms
@EnableFeignClients
@MapperScan("com.docus.server.**.mapper")
public class AppRunBootstrap {
public static void main(String[] args) {
System.setProperty("javax.xml.parsers.DocumentBuilderFactory","com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl");

@ -0,0 +1,68 @@
package com.docus.server.collection.config;
import com.alibaba.druid.pool.DruidDataSource;
import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
import com.baomidou.mybatisplus.core.MybatisConfiguration;
import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
import org.apache.ibatis.session.SqlSessionFactory;
import org.apache.ibatis.type.JdbcType;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.core.io.support.ResourcePatternResolver;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import javax.sql.DataSource;
@Configuration
@MapperScan(basePackages = com.docus.server.collection.config.DbMysqlConfig.PACKAGE, sqlSessionFactoryRef = "dbmysqlSqlSessionFactory")
@EnableConfigurationProperties(MybatisPlusProperties.class)
public class DbMysqlConfig {
// 这里一定要指定精准 否则后果不堪设想
static final String PACKAGE = "com.docus.server.collection.infrastructure.dao.mapper";
static final String MAPPER_LOCATION = "classpath:mapper/*.xml";
@Bean(name = "dbmysqlDataSource")
@ConfigurationProperties(prefix = "spring.datasource.mysql-docus")
public DataSource secondDataSource(){
return new DruidDataSource();
}
/*注入事务*/
@Bean(name = "dbmysqlTransactionManager")
public DataSourceTransactionManager secondTransactionManager() {
return new DataSourceTransactionManager(secondDataSource());
}
@Bean(name = "dbmysqlSqlSessionFactory")
public SqlSessionFactory secondSqlSessionFactory(@Qualifier("dbmysqlDataSource") DataSource dataSource)
throws Exception {
//配置mybatis-plus源
MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
//添加XML目录
ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
bean.setMapperLocations(resolver.getResources(MAPPER_LOCATION));
// 实体类别名
bean.setTypeAliasesPackage("com.docus.server.collection.infrastructure.dao.entity.*");
MybatisConfiguration configuration = new MybatisConfiguration();
//开启下划线转驼峰
configuration.setMapUnderscoreToCamelCase(true);
configuration.setJdbcTypeForNull(JdbcType.NULL);
bean.setDataSource(dataSource);
bean.setConfiguration(configuration);
return bean.getObject();
//
// final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
// sessionFactory.setDataSource(secondDataSource);
// sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
// .getResources(DbMysqlConfig.MAPPER_LOCATION));
// return sessionFactory.getObject();
}
}

@ -0,0 +1,48 @@
package com.docus.server.collection.config;
import com.alibaba.druid.pool.DruidDataSource;
import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionFactoryBean;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import javax.sql.DataSource;
@Configuration
@MapperScan(basePackages = com.docus.server.collection.config.DbSqlserverConfig.PACKAGE, sqlSessionFactoryRef = "dbsqlserverSqlSessionFactory")
@EnableConfigurationProperties(MybatisPlusProperties.class)
public class DbSqlserverConfig {
// 这里一定要指定精准 否则后果不堪设想
static final String PACKAGE = "com.docus.server.collection.infrastructure.dao.sqlserver";
static final String MAPPER_LOCATION = "classpath:sqlserver/*.xml";
@Bean(name = "dbsqlserverDataSource")
@ConfigurationProperties(prefix = "spring.datasource.sqlserver-docus")
public DataSource secondDataSource(){
return new DruidDataSource();
}
/*注入事务*/
@Bean(name = "dbsqlserverTransactionManager")
public DataSourceTransactionManager secondTransactionManager() {
return new DataSourceTransactionManager(secondDataSource());
}
@Bean(name = "dbsqlserverSqlSessionFactory")
public SqlSessionFactory secondSqlSessionFactory(@Qualifier("dbsqlserverDataSource") DataSource secondDataSource)
throws Exception {
final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
sessionFactory.setDataSource(secondDataSource);
sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
.getResources(com.docus.server.collection.config.DbSqlserverConfig.MAPPER_LOCATION));
return sessionFactory.getObject();
}
}

@ -7,7 +7,10 @@ import com.docus.infrastructure.web.api.ResultCode;
import com.docus.server.collection.converter.FirstPageCheckoutConverter;
import com.docus.server.collection.dto.FirstPageCheckoutInDTO;
import com.docus.server.collection.dto.FirstPageCheckoutRequest;
import com.docus.server.collection.dto.VJsjWzh7addnjreportDto;
import com.docus.server.collection.entity.VJsjWzh7addnjreport;
import com.docus.server.collection.feign.service.MedicalrecordService;
import com.docus.server.collection.infrastructure.dao.sqlserver.VJsjWzh7addnjreportMapper;
import com.docus.server.collection.service.MzZyHisService;
import com.docus.server.collection.util.PersistRequestUtil;
import com.docus.server.collection.validator.RequestValidator;
@ -20,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
@Api("梅州中西HIS相关接口")
@Slf4j
@ -32,6 +36,9 @@ public class MzZyHisController {
@Resource
private MedicalrecordService medicalrecordService;
@Resource
private VJsjWzh7addnjreportMapper vmp;
@ApiOperation("首页签出")
@PostMapping("/firstPageCheckout")
public CommonResult<String> firstPageCheckout(@RequestBody FirstPageCheckoutRequest firstPageCheckoutRequest, HttpServletRequest servletRequest) {
@ -58,10 +65,24 @@ public class MzZyHisController {
return CommonResult.failed("系统出错啦,请稍后再试!");
}
}
@ApiOperation("查询报告")
@PostMapping("/getReport")
public CommonResult<List<VJsjWzh7addnjreport>> getReport(@RequestBody VJsjWzh7addnjreportDto dto) {
List<VJsjWzh7addnjreport> reports = vmp.getReport(dto);
return CommonResult.success(reports);
}
@ApiOperation("测试")
@GetMapping("/test")
public CommonResult<String> test(@RequestParam("pid") String pid) {
medicalrecordService.signOutOrBackRepair(pid);
return CommonResult.success("ok");
public CommonResult<List> test() {
return CommonResult.success(mzZyHisService.getPid());
}
@ApiOperation("测试sql")
@GetMapping("/vmp")
public CommonResult<List> vmp() {
return CommonResult.success(vmp.getList());
}
}

@ -0,0 +1,28 @@
package com.docus.server.collection.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @BelongsProject: docus-mzzy-collector
* @BelongsPackage: com.docus.server.collection.entity
* @Author: chierhao
* @CreateTime: 2024-07-31 15:47
* @Description: TODO
* @Version: 1.0
*/
@Data
public class VJsjWzh7addnjreportDto {
@ApiModelProperty(value = "姓名")
private String name;
@ApiModelProperty(value = "住院号")
private String inpatientNo;
@ApiModelProperty(value = "报告开始时间 格式yyyy-MM-dd")
private String startReportDateTime;
@ApiModelProperty(value = "报告结束时间 格式yyyy-MM-dd")
private String endReportDateTime;
}

@ -0,0 +1,39 @@
package com.docus.server.collection.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @BelongsProject: docus-mzzy-collector
* @BelongsPackage: com.docus.server.collection.entity
* @Author: chierhao
* @CreateTime: 2024-07-31 15:47
* @Description: TODO
* @Version: 1.0
*/
@Data
public class VJsjWzh7addnjreport {
@ApiModelProperty(value = "姓名")
private String name;
@ApiModelProperty(value = "住院号")
private String inpatientNo;
@ApiModelProperty(value = "类型")
private String type;
@ApiModelProperty(value = "申请科室")
private String dept;
@ApiModelProperty(value = "项目")
private String item;
@ApiModelProperty(value = "登记时间")
private Date RegistDateTime;
@ApiModelProperty(value = "报告时间")
private Date ReportDateTime;
}

@ -25,4 +25,6 @@ public interface TBasicMapper{
String getPatientIdByJzh(@Param("jzh") String jzh);
List<String> getPatientIdByMomJzh(@Param("momJzh") String momJzh);
List<String> getPid();
}

@ -0,0 +1,21 @@
package com.docus.server.collection.infrastructure.dao.sqlserver;
import com.docus.server.collection.dto.VJsjWzh7addnjreportDto;
import com.docus.server.collection.entity.VJsjWzh7addnjreport;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @BelongsProject: docus-mzzy-collector
* @BelongsPackage: com.docus.server.collection.infrastructure.dao.mapper.sqlserver
* @Author: chierhao
* @CreateTime: 2024-07-31 14:31
* @Description: TODO
* @Version: 1.0
*/
public interface VJsjWzh7addnjreportMapper {
List<String> getList();
List<VJsjWzh7addnjreport> getReport(@Param("dto") VJsjWzh7addnjreportDto dto);
}

@ -2,6 +2,8 @@ package com.docus.server.collection.service;
import com.docus.server.collection.dto.FirstPageCheckoutInDTO;
import java.util.List;
/**
* @author wyb
*/
@ -12,4 +14,7 @@ public interface MzZyHisService {
* @param checkoutInDTO
*/
void firstPageCheckout(FirstPageCheckoutInDTO checkoutInDTO);
List<String> getPid();
}

@ -68,6 +68,11 @@ public class MzZyHisServiceImpl implements MzZyHisService {
babyTaskCompensate(patientInfo.getInpatientNo(),collectorIds);
}
@Override
public List<String> getPid() {
return tBasicMapper.getPid();
}
/**
*
* @param momJzh

@ -6,27 +6,19 @@ spring:
application:
name: @artifactId@
datasource:
mysql-docus:
url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_archivefile?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username: docus
password: docus702
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
type: com.alibaba.druid.pool.DruidDataSource
# 初始化配置
initial-size: 3
# 最小连接数
min-idle: 3
# 最大连接数
max-active: 15
# 获取连接超 时时间
max-wait: 5000
# 连接有效性检测时间
time-between-eviction-runs-millis: 90000
# 最大空闲时间
min-evictable-idle-time-millis: 1800000
test-while-idle: true
test-on-borrow: false
test-on-return: false
validation-query: select 1
sqlserver-docus:
url: jdbc:sqlserver://192.168.16.103\DOCUS;DatabaseName=zj_power
username: sa
password: docus702
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
type: com.alibaba.druid.pool.DruidDataSource
redis:
host: redis.docus.cn

@ -91,5 +91,7 @@
<select id="getPatientIdByMomJzh" resultType="java.lang.String">
select patient_id from `docus_medicalrecord`.`t_basic` where mother_inpatient_no=#{momJzh}
</select>
<select id="getPid" resultType="java.lang.String">
select patient_id from `docus_medicalrecord`.`t_basic` limit 10
</select>
</mapper>

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.docus.server.collection.infrastructure.dao.sqlserver.VJsjWzh7addnjreportMapper">
<select id="getList" resultType="java.lang.String">
SELECT 姓名
FROM docus.dbo.v_jsj_wzh7addnjreport;
</select>
<select id="getReport" resultType="com.docus.server.collection.entity.VJsjWzh7addnjreport">
SELECT 姓名 name, 住院号 inpatientNo, 类型 type, 申请科室 dept, 项目 item, RegistDateTime, ReportDateTime
FROM docus.dbo.v_jsj_wzh7addnjreport
where
1=1
<if test="dto.startReportDateTime!=null and dto.startReportDateTime!='' and dto.endReportDateTime!=null and dto.endReportDateTime!=''">
and convert(varchar(10),ReportDateTime,120)between
#{dto.startReportDateTime} and #{dto.endReportDateTime}
</if>
<if test="dto.name!=null and dto.name!=''">
and 姓名 like CONCAT('%',#{dto.name},'%')
</if>
<if test="dto.inpatientNo!=null and dto.inpatientNo!=''">
and 住院号 like CONCAT('%',#{dto.inpatientNo},'%')
</if>
</select>
</mapper>
Loading…
Cancel
Save