wangyizhe/his
3
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

base: wangyizhe:V1.3
Branches Tags
wangyizhe:develop wangyizhe:1212 wangyizhe:test wangyizhe:merge_1.3 wangyizhe:master wangyizhe:wangjunping
wangyizhe:V1.3 wangyizhe:V1.2 wangyizhe:v1.1
..
compare: wangyizhe:V1.2
Branches Tags
wangyizhe:develop wangyizhe:1212 wangyizhe:test wangyizhe:merge_1.3 wangyizhe:master wangyizhe:wangjunping
wangyizhe:V1.3 wangyizhe:V1.2 wangyizhe:v1.1

1 Commits
V1.3 ... V1.2

Author SHA1 Message Date
Ubuntu_925
5bac178c64 !10 Merge branch 'develop' of <a href="https://gitee.com/Ubuntu_925/openhis-itai">https://gitee.com/Ubuntu_925/openhis-itai</a> into develop 
Merge pull request !10 from Ubuntu_925/develop
 2025-11-12 09:48:19 +00:00
1223 changed files with 91327 additions and 203837 deletions
Expand all files Collapse all files

68467
20251224init脚本(使用Navicat Premium 17导入).sql
View File

File diff suppressed because one or more lines are too long

6
openhis-server-new/core-admin/pom.xml
View File

@@ -36,13 +36,11 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
<version>1.6.2</version>
</dependency>
<!-- Mysql驱动包 -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
<!-- 核心模块-->

5
openhis-server-new/core-common/pom.xml
View File

@@ -77,6 +77,10 @@
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
<!-- io常用工具类 -->
<dependency>
@@ -136,7 +140,6 @@
<dependency>
<groupId>com.belerweb</groupId>
<artifactId>pinyin4j</artifactId>
<version>2.5.1</version>
</dependency>
<dependency>

38
openhis-server-new/core-common/src/main/java/com/core/common/annotation/ExcelExtra.java
View File

@@ -1,38 +0,0 @@
package com.core.common.annotation;
import java.lang.annotation.*;
/**
* Excel额外表头信息注解
*
* @author swb
*/
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface ExcelExtra {
/**
* 表头名称
*/
String name();
/**
* 日期格式，如：yyyy-MM-dd HH:mm:ss
*/
String dateFormat() default "";
/**
* 排序（越小越靠前）
*/
int sort() default 0;
/**
* 默认值
*/
String defaultValue() default "";
/**
* 是否导出
*/
boolean isExport() default true;
}

26
openhis-server-new/core-common/src/main/java/com/core/common/enums/DeleteFlag.java Normal file
View File

@@ -0,0 +1,26 @@
package com.core.common.enums;
/**
* 删除标志
*
* @author system
*/
public enum DeleteFlag {
NOT_DELETED("0", "未删除"), DELETED("1", "已删除");
private final String code;
private final String info;
DeleteFlag(String code, String info) {
this.code = code;
this.info = info;
}
public String getCode() {
return code;
}
public String getInfo() {
return info;
}
}

146
openhis-server-new/core-common/src/main/java/com/core/common/enums/TenantOptionDict.java
View File

@@ -118,11 +118,11 @@ public enum TenantOptionDict {
*/
PACS_APP_SECRET("pacsAppSecret", "PACSAppSecret", 45),
/**
* 电子发票-中转服务的路径
* PACSAppSecret
*/
INVOICE_FORWARD_URL("invoiceUrl", "电子发票-中转服务的路径", 46),
/**
* 电子发票-中转服务开关
* PACSAppSecret
*/
FORWARD_SWITCH("forwardSwitch", "电子发票-中转服务开关", 47),
/**
@@ -160,7 +160,7 @@ public enum TenantOptionDict {
/**
* 电子发票开关
*/
INVOICE_SWITCH("invoiceSwitch", "电子发票开关", 56),
INVOICE_SWITCH("invoiceSwitch", "电子发票开关 (0:关闭 1:开启)", 56),
/**
* 医嘱定价来源
@@ -170,163 +170,41 @@ public enum TenantOptionDict {
/**
* 三方支付（签到）
*/
THREE_PART_SIGN_URL("threePartSignUrl", "三方支付【签到】请求路径", 58),
/**
* 三方支付（签到）
*/
THREE_PART_SIGN_STATIC_PARAM("threePartSignStaticParam", "三方支付【签到】固定参数", 59),
/**
* 三方支付（签到）
*/
THREE_PART_SIGN_ACTIVE_PARAM("threePartSignActiveParam", "三方支付【签到】可变参数", 60),
/**
* 三方支付（签到）
*/
THREE_PART_SIGN_MAPPING_METHOD("threePartSignMappingMethod", "三方支付【签到】请求方式", 61),
THREE_PART_SIGN_URL("threePartSignUrl", "三方支付GET请求", 58),
/**
* 三方支付（消费）
*/
THREE_PART_PAY_URL("threePartPayUrl", "三方支付【消费】请求路径", 62),
/**
* 三方支付（消费）
*/
THREE_PART_PAY_STATIC_PARAM("threePartPayStaticParam", "三方支付【消费】固定参数", 63),
/**
* 三方支付（消费）
*/
THREE_PART_PAY_ACTIVE_PARAM("threePartPayActiveParam", "三方支付【消费】可变参数", 64),
/**
* 三方支付（消费）
*/
THREE_PART_PAY_MAPPING_METHOD("threePartPayMappingMethod", "三方支付【消费】请求方式", 65),
THREE_PART_PAY_URL("threePartPayUrl", "三方支付GET请求", 59),
/**
* 三方支付（退费）
*/
THREE_PART_RETURN_URL("threePartReturnUrl", "三方支付【退费】请求路径", 66),
/**
* 三方支付（退费）
*/
THREE_PART_RETURN_STATIC_PARAM("threePartReturnStaticParam", "三方支付【退费】固定参数", 67),
/**
* 三方支付（退费）
*/
THREE_PART_RETURN_ACTIVE_PARAM("threePartReturnActiveParam", "三方支付【退费】可变参数", 68),
/**
* 三方支付（退费）
*/
THREE_PART_RETURN_MAPPING_METHOD("threePartReturnMappingMethod", "三方支付【退费】请求方式", 69),
THREE_PART_RETURN_URL("threePartReturnUrl", "三方支付GET请求", 60),
/**
* 三方支付（隔天退费）
*/
THREE_PART_NEXT_DAY_RETURN_URL("threePartNextDayReturnUrl", "三方支付【隔天退费】请求路径", 70),
/**
* 三方支付（隔天退费）
*/
THREE_PART_NEXT_DAY_RETURN_STATIC_PARAM("threePartNextDayReturnStaticParam", "三方支付【隔天退费】固定参数", 71),
/**
* 三方支付（隔天退费）
*/
THREE_PART_NEXT_DAY_RETURN_ACTIVE_PARAM("threePartNextDayReturnActiveParam", "三方支付【隔天退费】可变参数", 72),
/**
* 三方支付（隔天退费）
*/
THREE_PART_NEXT_DAY_RETURN_MAPPING_METHOD("threePartNextDayReturnMappingMethod", "三方支付【隔天退费】请求方式", 73),
THREE_PART_NEXT_DAY_RETURN_URL("threePartNextDayReturnUrl", "三方支付GET请求", 61),
/**
* 三方支付路径（支付结果查询）
*/
THREE_PART_PAY_QUERY_URL("threePartPayQueryUrl", "三方支付【支付结果查询】请求路径", 74),
/**
* 三方支付（支付结果查询）
*/
THREE_PART_PAY_QUERY_STATIC_PARAM("threePartPayQueryStaticParam", "三方支付【支付结果查询】固定参数", 75),
/**
* 三方支付（支付结果查询）
*/
THREE_PART_PAY_QUERY_ACTIVE_PARAM("threePartPayQueryActiveParam", "三方支付【支付结果查询】可变参数", 76),
/**
* 三方支付（支付结果查询）
*/
THREE_PART_PAY_QUERY_MAPPING_METHOD("threePartPayQueryMappingMethod", "三方支付【支付结果查询】请求方式", 77),
THREE_PART_PAY_QUERY_URL("threePartPayQueryUrl", "三方支付GET请求", 62),
/**
* 三方支付路径（退费结果查询）
*/
THREE_PART_RETURN_QUERY_URL("threePartReturnQueryUrl", "三方支付【退费结果查询】请求路径", 78),
/**
* 三方支付（退费结果查询）
*/
THREE_PART_RETURN_QUERY_STATIC_PARAM("threePartReturnQueryStaticParam", "三方支付【退费结果查询】固定参数", 79),
/**
* 三方支付（退费结果查询）
*/
THREE_PART_RETURN_QUERY_ACTIVE_PARAM("threePartReturnQueryActiveParam", "三方支付【退费结果查询】可变参数", 80),
/**
* 三方支付（退费结果查询）
*/
THREE_PART_RETURN_QUERY_MAPPING_METHOD("threePartReturnQueryMappingMethod", "三方支付【退费结果查询】请求方式", 81),
THREE_PART_RETURN_QUERY_URL("threePartReturnQueryUrl", "三方支付GET请求", 63),
/**
* 三方支付路径（隔天退费结果查询）
*/
THREE_PART_NEXT_DAY_RETURN_QUERY_URL("threePartNextDayReturnQueryUrl", "三方支付【隔天退费结果查询】请求路径", 82),
/**
* 三方支付（隔天退费结果查询）
*/
THREE_PART_NEXT_DAY_RETURN_QUERY_STATIC_PARAM("threePartNextDayReturnQueryStaticParam", "三方支付【隔天退费结果查询】固定参数", 83),
/**
* 三方支付（隔天退费结果查询）
*/
THREE_PART_NEXT_DAY_RETURN_QUERY_ACTIVE_PARAM("threePartNextDayReturnQueryActiveParam", "三方支付【隔天退费结果查询】可变参数", 84),
/**
* 三方支付（隔天退费结果查询）
*/
THREE_PART_NEXT_DAY_RETURN_QUERY_MAPPING_METHOD("threePartNextDayReturnQueryMappingMethod", "三方支付【隔天退费结果查询】请求方式",
85),
THREE_PART_NEXT_DAY_RETURN_QUERY_URL("threePartNextDayReturnQueryUrl", "三方支付GET请求", 64),
/**
* 三方支付（签出）
* 三方支付参数
*/
THREE_PART_SIGN_OUT_URL("threePartSignOutUrl", "三方支付【签出】请求路径", 86),
/**
* 三方支付（签出）
*/
THREE_PART_SIGN_OUT_STATIC_PARAM("threePartSignOutStaticParam", "三方支付【签出】固定参数", 87),
/**
* 三方支付（签出）
*/
THREE_PART_SIGN_OUT_ACTIVE_PARAM("threePartSignOutActiveParam", "三方支付【签出】可变参数", 88),
/**
* 三方支付（签出）
*/
THREE_PART_SIGN_OUT_MAPPING_METHOD("threePartSignOutMappingMethod", "三方支付【签出】请求方式", 89),
/**
* 三方支付（签出）
*/
YB_INPATIENT_SETTLEMENT_UP_URL("ybInpatientSetlUp", "选填4101或4101A", 90),
/**
* PACS查看报告地址
*/
PACS_REPORT_URL("pacsReportUrl", "PACS查看报告地址", 91),
/**
* LIS查看报告地址
*/
LIS_REPORT_URL("lisReportUrl", "LIS查看报告地址", 92),
/**
* 开药时药房允许多选开关
*/
PHARMACY_MULTIPLE_CHOICE_SWITCH("pharmacyMultipleChoiceSwitch", "开药时药房允许多选开关", 93),
/**
* PEIS服务地址
*/
PEIS_SERVER_URL("peisServerUrl", "PEIS服务地址", 94);
THREE_PART_PARAM("threePartParam", "三方支付GET请求", 65);
private final String code;
private final String name;

1837
openhis-server-new/core-common/src/main/java/com/core/common/utils/NewExcelUtil.java
View File

File diff suppressed because it is too large Load Diff

1
openhis-server-new/core-flowable/pom.xml
View File

@@ -80,7 +80,6 @@
<dependency>
<groupId>com.googlecode.aviator</groupId>
<artifactId>aviator</artifactId>
<version>5.3.3</version>
</dependency>
</dependencies>

2
openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java
View File

@@ -99,7 +99,7 @@ public class MybatisPlusConfig {
"med_medication_definition", "med_medication_dispense", "med_medication_request",
"wor_activity_definition", "wor_device_dispense", "wor_device_request", "wor_inventory_item",
"wor_service_request", "wor_service_request_detail", "wor_supply_delivery", "wor_supply_request",
"sys_operation_record","doc_inventory_item_static"));
"sys_operation_record"));
@Override
public boolean ignoreTable(String tableName) {

79
openhis-server-new/core-framework/src/main/java/com/core/framework/config/SecurityConfig.java
View File

@@ -1,5 +1,9 @@
package com.core.framework.config;
import com.core.framework.config.properties.PermitAllUrlProperties;
import com.core.framework.security.filter.JwtAuthenticationTokenFilter;
import com.core.framework.security.handle.AuthenticationEntryPointImpl;
import com.core.framework.security.handle.LogoutSuccessHandlerImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -7,7 +11,7 @@ import org.springframework.http.HttpMethod;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.ProviderManager;
import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.core.userdetails.UserDetailsService;
@@ -17,17 +21,12 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic
import org.springframework.security.web.authentication.logout.LogoutFilter;
import org.springframework.web.filter.CorsFilter;
import com.core.framework.config.properties.PermitAllUrlProperties;
import com.core.framework.security.filter.JwtAuthenticationTokenFilter;
import com.core.framework.security.handle.AuthenticationEntryPointImpl;
import com.core.framework.security.handle.LogoutSuccessHandlerImpl;
/**
* spring security配置
*
*
* @author system
*/
@EnableMethodSecurity(prePostEnabled = true, securedEnabled = true)
@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
@Configuration
public class SecurityConfig {
/**
@@ -86,38 +85,38 @@ public class SecurityConfig {
@Bean
protected SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
return httpSecurity
// CSRF禁用，因为不使用session
.csrf(csrf -> csrf.disable())
// 禁用HTTP响应标头
.headers((headersCustomizer) -> {
headersCustomizer.cacheControl(cache -> cache.disable()).frameOptions(options -> options.sameOrigin());
})
// 认证失败处理类
.exceptionHandling(exception -> exception.authenticationEntryPoint(unauthorizedHandler))
// 基于token，所以不需要session
.sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
// 注解标记允许匿名访问的url
.authorizeHttpRequests((requests) -> {
permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
// 对于登录login 注册register 验证码captchaImage 允许匿名访问
requests.antMatchers("/login", "/register", "/captchaImage").permitAll()
// 静态资源，可匿名访问
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**")
.permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**")
.permitAll()
.antMatchers("/patientmanage/information/**")
.permitAll()
// 除上面外的所有请求全部需要鉴权认证
.anyRequest().authenticated();
})
// 添加Logout filter
.logout(logout -> logout.logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler))
// 添加JWT filter
.addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class)
// 添加CORS filter
.addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class)
.addFilterBefore(corsFilter, LogoutFilter.class).build();
// CSRF禁用，因为不使用session
.csrf(csrf -> csrf.disable())
// 禁用HTTP响应标头
.headers((headersCustomizer) -> {
headersCustomizer.cacheControl(cache -> cache.disable()).frameOptions(options -> options.sameOrigin());
})
// 认证失败处理类
.exceptionHandling(exception -> exception.authenticationEntryPoint(unauthorizedHandler))
// 基于token，所以不需要session
.sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
// 注解标记允许匿名访问的url
.authorizeHttpRequests((requests) -> {
permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
// 对于登录login 注册register 验证码captchaImage 允许匿名访问
requests.antMatchers("/login", "/register", "/captchaImage").permitAll()
// 静态资源，可匿名访问
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**")
.permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**")
.permitAll()
.antMatchers("/patientmanage/information/**")
.permitAll()
// 除上面外的所有请求全部需要鉴权认证
.anyRequest().authenticated();
})
// 添加Logout filter
.logout(logout -> logout.logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler))
// 添加JWT filter
.addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class)
// 添加CORS filter
.addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class)
.addFilterBefore(corsFilter, LogoutFilter.class).build();
}
/**

4
openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java
View File

@@ -6,7 +6,6 @@ import java.util.Optional;
import javax.annotation.Resource;
import com.core.common.enums.DelFlag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
@@ -24,6 +23,7 @@ import com.core.common.core.domain.entity.SysUser;
import com.core.common.core.domain.model.LoginUser;
import com.core.common.core.domain.model.LoginUserExtend;
import com.core.common.core.redis.RedisCache;
import com.core.common.enums.DeleteFlag;
import com.core.common.enums.TenantStatus;
import com.core.common.exception.ServiceException;
import com.core.common.exception.user.*;
@@ -281,7 +281,7 @@ public class SysLoginService {
throw new ServiceException("所属医院停用");
}
// 租户删除状态校验
if (DelFlag.YES.getCode().equals(currentTenant.getDeleteFlag())) {
if (DeleteFlag.DELETED.getCode().equals(currentTenant.getDeleteFlag())) {
throw new ServiceException("所属医院不存在");
}

3
openhis-server-new/core-generator/src/main/java/com/core/generator/util/GenUtils.java
View File

@@ -52,9 +52,6 @@ public class GenUtils {
case "yb":
genTable.setPackageName(GenConfig.getPackageName() + ".ybcatalog");
break;
case "lab":
genTable.setPackageName(GenConfig.getPackageName() + ".lab");
break;
default:
genTable.setPackageName(GenConfig.getPackageName() + ".errortable");
}

2
openhis-server-new/core-generator/src/main/resources/generator.yml
View File

@@ -7,4 +7,4 @@ gen:
# 自动去除表前缀，默认是false
autoRemovePre: true
# 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
tablePrefix: cod_,adm_,cli_,dia_,med_,wor_,fin_,def_,doc_,yb_,lab_
tablePrefix: cod_,adm_,cli_,dia_,med_,wor_,fin_,def_,doc_,yb_

11
openhis-server-new/core-generator/src/main/resources/mapper/generator/GenTableMapper.xml
View File

@@ -99,15 +99,14 @@
<select id="selectDbTableList" parameterType="map" resultMap="GenTableResult">
SELECT
T1.table_name
--,
--T2.description AS table_comment
T1.table_name,
T2.description AS table_comment
-- 移除 create_time，因为它在 information_schema.tables 中通常不存在
-- 移除 update_time，因为它在 information_schema.tables 中通常不存在
FROM information_schema.tables T1
-- LEFT JOIN pg_description T2
-- ON T2.objsubid = 0
--AND T2.objoid = T1.table_name::regclass::oid
LEFT JOIN pg_description T2
ON T2.objsubid = 0
AND T2.objoid = T1.table_name::regclass::oid
WHERE table_schema = current_schema()
AND table_name NOT LIKE 'qrtz\_%'
AND table_name NOT LIKE 'gen\_%'

8
openhis-server-new/core-system/pom.xml
View File

@@ -23,15 +23,11 @@
<groupId>com.core</groupId>
<artifactId>core-common</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<scope>compile</scope>
</dependency>
<!-- postgresql -->

8
openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysTenantServiceImpl.java
View File

@@ -19,7 +19,7 @@ import com.core.common.core.domain.R;
import com.core.common.core.domain.entity.SysUser;
import com.core.common.core.domain.model.LoginUser;
import com.core.common.core.redis.RedisCache;
import com.core.common.enums.DelFlag;
import com.core.common.enums.DeleteFlag;
import com.core.common.enums.TenantStatus;
import com.core.common.utils.SecurityUtils;
import com.core.common.utils.StringUtils;
@@ -76,7 +76,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
lambdaQueryWrapper.eq(SysTenant::getStatus, status);
}
// 未删除
lambdaQueryWrapper.eq(SysTenant::getDeleteFlag, DelFlag.NO.getCode());
lambdaQueryWrapper.eq(SysTenant::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode());
lambdaQueryWrapper.orderByDesc(SysTenant::getId);
return R.ok(baseMapper.selectPage(new Page<>(pageNum, pageSize), lambdaQueryWrapper));
}
@@ -140,7 +140,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
return R.fail("该租户还存在绑定的用户，请确认");
}
baseMapper.update(new SysTenant(), new LambdaUpdateWrapper<SysTenant>()
.set(SysTenant::getDeleteFlag, DelFlag.YES.getCode()).in(SysTenant::getId, tenantIdList));
.set(SysTenant::getDeleteFlag, DeleteFlag.DELETED.getCode()).in(SysTenant::getId, tenantIdList));
}
return R.ok();
}
@@ -209,7 +209,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
if (StringUtils.isNotEmpty(userName)) {
lambdaQueryWrapper.like(SysUser::getUserName, userName);
}
lambdaQueryWrapper.eq(SysUser::getDeleteFlag, DelFlag.NO.getCode());
lambdaQueryWrapper.eq(SysUser::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode());
lambdaQueryWrapper.orderByDesc(SysUser::getUserId);
return R.ok(sysUserMapper.selectPage(new Page<>(pageNum, pageSize), lambdaQueryWrapper));
}

25
openhis-server-new/openhis-application/pom.xml
View File

@@ -23,18 +23,21 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
</dependency>
<!-- 领域-->
<dependency>
<groupId>com.openhis</groupId>
<artifactId>openhis-domain</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<!-- liteflow-->
<dependency>
<groupId>com.yomahub</groupId>
<artifactId>liteflow-spring-boot-starter</artifactId>
<version>2.12.4.1</version>
</dependency>
<!-- junit-->
@@ -43,11 +46,10 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>2.0.43</version>
<scope>compile</scope>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -66,7 +68,6 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.5.15</version>
<configuration>
<fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
</configuration>
@@ -81,20 +82,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.1.0</version>
<version>${maven-war-plugin.version}</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
<warName>${project.artifactId}</warName>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>17</source>
<target>17</target>
</configuration>
</plugin>
</plugins>
<finalName>${project.artifactId}</finalName>
</build>

50
openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/AutoRollTask.java
View File

@@ -1,50 +0,0 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.quartz.task;
import javax.annotation.Resource;
import org.springframework.stereotype.Component;
import com.core.framework.config.TenantContext;
import com.openhis.web.inhospitalnursestation.appservice.IEncounterAutoRollAppService;
import lombok.extern.slf4j.Slf4j;
/**
* 自动滚方定时任务（每日执行）
*/
@Slf4j
@Component("AutoRollTask")
public class AutoRollTask {
@Resource
private IEncounterAutoRollAppService encounterAutoRollAppService;
/**
* 护理费
*
* @param tenantId 租户id
* @param orderPricing 医嘱定价来源 | 定时任务调用时传参
*/
public void autoRollNursingFee(Integer tenantId, String orderPricing) {
// 设置当前线程的租户ID
TenantContext.setCurrentTenant(tenantId);
// 滚护理费
encounterAutoRollAppService.autoRollNursingFee(tenantId, orderPricing);
}
/**
* 基础服务费 | 取暖费,床位费 等
*
* @param tenantId 租户id
* @param orderPricing 医嘱定价来源 | 定时任务调用时传参
*/
public void autoRollBasicService(Integer tenantId, String orderPricing) {
// 设置当前线程的租户ID
TenantContext.setCurrentTenant(tenantId);
// 滚基础服务费
encounterAutoRollAppService.autoRollBasicService(tenantId, orderPricing);
}
}

183
openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/InventoryBackupTask.java
View File

@@ -1,183 +0,0 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.quartz.task;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.annotation.Resource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.enums.DelFlag;
import com.core.common.utils.AssignSeqUtil;
import com.core.common.utils.DateUtils;
import com.core.framework.config.TenantContext;
import com.openhis.common.enums.AssignSeqEnum;
import com.openhis.document.domain.DocInventoryItemStatic;
import com.openhis.document.service.IDocInventoryItemStaticService;
import com.openhis.web.inventorymanage.appservice.IProductDetailAppService;
import com.openhis.web.inventorymanage.dto.ProductDetailPageDto;
import com.openhis.web.inventorymanage.dto.ProductDetailSearchParam;
import lombok.extern.slf4j.Slf4j;
/**
* 库存备份定时任务（每日执行）
*
* @author zwh
* @date 2025-11-12
*/
@Slf4j
@Component("InventoryBackupTask")
public class InventoryBackupTask {
Logger logger = LoggerFactory.getLogger(InventoryBackupTask.class);
@Resource
private IProductDetailAppService productDetailAppService;
@Resource
private IDocInventoryItemStaticService docInventoryItemStaticService;
@Resource
private AssignSeqUtil assignSeqUtil;
private static final AtomicBoolean isRunning = new AtomicBoolean(false);
/**
* 库存备份
*
* @param tenantId 租户id
*/
public void inventoryBackup(Integer tenantId) {
// 添加执行锁，防止重复执行
if (!isRunning.compareAndSet(false, true)) {
logger.warn("库存备份任务正在执行中，跳过本次执行");
return;
}
// 定时任务指定租户id
try {
logger.info("库存备份START：{}", DateUtils.getNowDate());
// 设置当前线程的租户ID
TenantContext.setCurrentTenant(tenantId);
String now = DateUtils.dateTime();
// 查询当天是否已经执行过一次库存备份
List<DocInventoryItemStatic> hisDocInventoryItemStaticList = docInventoryItemStaticService
.list(new LambdaQueryWrapper<DocInventoryItemStatic>()
.eq(DocInventoryItemStatic::getDeleteFlag, DelFlag.NO.getCode())
.eq(DocInventoryItemStatic::getTenantId, tenantId))
.stream().filter(item -> item.getBusNo() != null && item.getBusNo().length() >= 11
&& now.equals(item.getBusNo().substring(3, 11)))
.toList();
if (!hisDocInventoryItemStaticList.isEmpty()) {
logger.warn("库存备份任务已执行过，跳过本次执行");
return;
}
// 生成备份编号
String busNo = assignSeqUtil.getSeqByDay(AssignSeqEnum.AUTO_BACKUP_NO.getPrefix(), 2);
// 获取库存商品明细
Page<ProductDetailPageDto> productDetailPage = productDetailAppService
.getProductDetailPage(new ProductDetailSearchParam(), 1, 9999, null, null).getData();
List<DocInventoryItemStatic> docInventoryItemStaticList = new ArrayList<>();
if (productDetailPage != null && productDetailPage.getTotal() > 0) {
List<ProductDetailPageDto> productDetailList = productDetailPage.getRecords();
for (ProductDetailPageDto productDetail : productDetailList) {
DocInventoryItemStatic docInventoryItemStatic = new DocInventoryItemStatic();
docInventoryItemStatic
// 库存状态枚举
.setInventoryStatusEnum(productDetail.getInventoryStatusEnum())
// 备份编号
.setBusNo(busNo)
// 库存id
.setInventoryId(productDetail.getInventoryId())
// 医保等级
.setChrgitmLv(productDetail.getChrgitmLv())
// 耗材类型
.setDevCategoryCode(productDetail.getDevCategoryCode())
// 项目id
.setItemId(productDetail.getItemId())
// 项目名称
.setName(productDetail.getItemName())
// 项目编号
.setItemNo(productDetail.getBusNo())
// 药品类别
.setMedCategoryCode(productDetail.getMedCategoryCode())
// 项目所在表
.setItemTable(productDetail.getItemTable())
// 所在位置
.setLocationId(productDetail.getLocationId())
// 位置名称
.setLocationName(productDetail.getLocationName())
// 所在货位
.setLocationStoreId(productDetail.getLocationStoreId())
// 货位名称
.setLocationStoreName(productDetail.getLocationStoreName())
// 厂家
.setManufacturerText(productDetail.getManufacturerText())
// 最小单位
.setMinUnitCode(productDetail.getMinUnitCode())
// 拆零比
.setPartPercent(productDetail.getPartPercent())
// 采购价
.setPrice(productDetail.getPurchasePrice())
// 生产日期
.setProductionDate(productDetail.getProductionDate())
// 到期日期
.setExpirationDate(productDetail.getExpirationDate())
// 库存数量
.setQuantity(productDetail.getQuantity())
// 销售价
.setSalePrice(productDetail.getSalePrice())
// 采购总价
.setTotalPrice(productDetail.getTotalPurchasePrice())
// 销售总价
.setTotalSalePrice(productDetail.getTotalSalePrice())
// 规格
.setTotalVolume(productDetail.getTotalVolume())
// 单位
.setUnitCode(productDetail.getUnitCode())
// 五笔码
.setWbStr(productDetail.getWbStr())
// 拼音码
.setPyStr(productDetail.getPyStr())
// 供应商id
.setSupplierId(productDetail.getSupplierId())
// 供应商名称
.setSupplierName(productDetail.getSupplierName())
// 剩余过期天数
.setRemainingDays(productDetail.getRemainingDays())
// 包装数量（整数）
.setNumber(productDetail.getNumber())
// 包装数量（小数）
.setRemainder(productDetail.getRemainder())
// 医保码
.setYbNo(productDetail.getYbNo())
// 批准文号
.setApprovalNumber(productDetail.getApprovalNumber())
// 批次号
.setLotNumber(productDetail.getLotNumber());
docInventoryItemStatic.setTenantId(tenantId);
docInventoryItemStaticList.add(docInventoryItemStatic);
}
docInventoryItemStaticService.saveBatch(docInventoryItemStaticList);
}
} catch (Exception e) {
logger.error("库存备份失败：", e);
} finally {
// 清除线程局部变量，防止内存泄漏
TenantContext.clear();
// 释放执行锁
isRunning.set(false);
logger.info("库存备份END：{}", DateUtils.getNowDate());
}
}
}

54
openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/StocktakingBatchTask.java Normal file
View File

@@ -0,0 +1,54 @@
package com.openhis.quartz.task;
import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
import com.alibaba.fastjson2.JSONObject;
import com.core.common.core.domain.R;
import com.core.common.utils.DateUtils;
import com.openhis.web.inventorymanage.appservice.IProductStocktakingAppService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import com.core.common.utils.StringUtils;
import com.core.framework.config.TenantContext;
import com.openhis.administration.domain.Location;
import com.openhis.administration.service.ILocationService;
/**
* 批量盘点定时任务
*
* @author yuxj
*/
@Component("stocktakingBatchTask")
public class StocktakingBatchTask {
Logger logger = LoggerFactory.getLogger(StocktakingBatchTask.class);
@Resource
IProductStocktakingAppService productStocktakingAppService;
public void autoStocktakingBatch(Integer tenantId) {
// 定时任务指定租户id,示例
try {
// 在控制台打印当前时间加执行的功能名
System.out.println("执行自动批量盘点START：" + DateUtils.getNowDate());
logger.info("执行自动批量盘点START：" + DateUtils.getNowDate());
// 设置当前线程的租户ID
TenantContext.setCurrentTenant(tenantId);
//执行自动盘点
productStocktakingAppService.autoStocktakingBatch();
logger.info("执行自动批量盘点END：" + DateUtils.getNowDate());
// 在控制台打印当前时间加执行的功能名
System.out.println("执行自动批量盘点END：" + DateUtils.getNowDate());
} finally {
// 清除线程局部变量，防止内存泄漏
TenantContext.clear();
}
}
}

33
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/IInstrumentManageAppService.java
View File

@@ -1,33 +0,0 @@
package com.openhis.web.Inspection.appservice;
import com.core.common.core.domain.R;
import com.openhis.administration.domain.Device;
import com.openhis.administration.domain.Instrument;
import com.openhis.web.Inspection.dto.InstrumentSelParam;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* @Description TODO
* @Author
* @Date 2025/9/18 15:38
*/
public interface IInstrumentManageAppService {
R<?> getManageInit();
R<?> getInstrumentPage(InstrumentSelParam InstrumentSelParam, String searchKey, Integer pageNo, Integer pageSize,
HttpServletRequest request);
R<?> updateOrAddInstrument(Instrument instrument);
R<?> getInstrumentOne(Long id);
R<?> editInstrumentStatus(List<Long> ids, Integer status);
}

21
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ILaboratoryManageAppService.java
View File

@@ -1,21 +0,0 @@
package com.openhis.web.Inspection.appservice;
import com.core.common.core.domain.R;
import com.openhis.web.Inspection.dto.ReportResultManageDto;
import com.openhis.web.Inspection.dto.SampleCollectManageDto;
import com.openhis.web.Inspection.dto.SampleCollectStatusRequest;
import javax.servlet.http.HttpServletRequest;
/**
* @Description TODO
* @Author
* @Date 2025/10/16 15:36
*/
public interface ILaboratoryManageAppService {
R<?> getReportResultList(ReportResultManageDto reportResultManageDto, Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request);
R<?> getReportById(Long id);
}

34
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ILisConfigManageAppService.java
View File

@@ -1,34 +0,0 @@
package com.openhis.web.Inspection.appservice;
import com.core.common.core.domain.R;
import com.openhis.web.Inspection.dto.LisConfigManageDto;
import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
import javax.servlet.http.HttpServletRequest;
/**
* @Description TODO
* @Author
* @Date 2025/9/29 16:00
*/
public interface ILisConfigManageAppService {
R<?> getDiseaseTreatmentPage(DiagnosisTreatmentSelParam DiagnosisTreatmentSelParam, String searchKey,
Integer pageNo, Integer pageSize, HttpServletRequest request);
R<?> getInfoList(String searchKey,String type);
R<?> getInfoDetail(Long id);
R<?> saveAll(LisConfigManageDto manageDto);
/**
*
* @param patientId 患者id
* @param ServiceId 服务id
* @param itemId 检验项目id
* @return
*/
R<?>createAll(Long patientId,Long ServiceId, Long itemId);
}

29
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/IObservationManageAppService.java
View File

@@ -1,29 +0,0 @@
package com.openhis.web.Inspection.appservice;
import com.core.common.core.domain.R;
import com.openhis.administration.domain.ObservationDefinition;
import com.openhis.web.Inspection.dto.ObservationDefSelParam;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* @Description TODO
* @Author
* @Date 2025/9/23 16:32
*/
public interface IObservationManageAppService {
R<?> getManageInit();
R<?> getObservationDefPage(ObservationDefSelParam ObservationDefSelParam, String searchKey, Integer pageNo, Integer pageSize,
HttpServletRequest request);
R<?> updateOrAddObservationDef(ObservationDefinition Observation);
R<?> getObservationDefOne(Long id);
R<?> editObservationDefStatus(List<Long> ids, Integer status);
}

20
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ISampleCollectAppManageAppService.java
View File

@@ -1,20 +0,0 @@
package com.openhis.web.Inspection.appservice;
import com.core.common.core.domain.R;
import com.openhis.web.Inspection.dto.SampleCollectManageDto;
import com.openhis.web.Inspection.dto.SampleCollectStatusRequest;
import javax.servlet.http.HttpServletRequest;
/**
* @Description TODO
* @Author
* @Date 2025/10/16 15:36
*/
public interface ISampleCollectAppManageAppService {
R<?> getSampleCollectList(SampleCollectManageDto sampleCollectManageDto, Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request);
R<?>updateSampleStatus(SampleCollectStatusRequest statusRequest);
}

33
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ISpecimenManageAppService.java
View File

@@ -1,33 +0,0 @@
package com.openhis.web.Inspection.appservice;
import com.core.common.core.domain.R;
import com.openhis.administration.domain.SpecimenDefinition;
import com.openhis.web.Inspection.dto.SpecimenDefSelParam;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* @Description TODO
* @Author
* @Date 2025/9/9 16:46
*/
public interface ISpecimenManageAppService {
R<?> getManageInit();
R<?> getSpecimenPage(SpecimenDefSelParam specimenDefSelParam, String searchKey, Integer pageNo, Integer pageSize,
HttpServletRequest request);
R<?> updateOrAddSpecimen(SpecimenDefinition specimenDefinition);
R<?> getSpecimenOne(Long id);
R<?> editSpecimenStatus(List<Long> ids,Integer status);
}

107
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/InstrumentManageAppServiceImpl.java
View File

@@ -1,107 +0,0 @@
package com.openhis.web.Inspection.appservice.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.utils.MessageUtils;
import com.openhis.administration.domain.Instrument;
import com.openhis.administration.mapper.InstrumentMapper;
import com.openhis.administration.service.IInstrumentService;
import com.openhis.common.constant.PromptMsgConstant;
import com.openhis.common.enums.InstrumentCategory;
import com.openhis.common.enums.PublicationStatus;
import com.openhis.common.utils.EnumUtils;
import com.openhis.common.utils.HisPageUtils;
import com.openhis.common.utils.HisQueryUtils;
import com.openhis.web.Inspection.appservice.IInstrumentManageAppService;
import com.openhis.web.Inspection.dto.InstrumentManageDto;
import com.openhis.web.Inspection.dto.InstrumentManageInitDto;
import com.openhis.web.Inspection.dto.InstrumentSelParam;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* @Description 仪器信息
* @Author
* @Date 2025/9/18
*/
@Service
@RequiredArgsConstructor
public class InstrumentManageAppServiceImpl implements IInstrumentManageAppService {
private final IInstrumentService instrumentService ;
private final InstrumentMapper instrumentMapper ;
@Override
public R<?> getManageInit() {
InstrumentManageInitDto instrumentManageInitDto = new InstrumentManageInitDto();
// 获取状态
List<InstrumentManageInitDto.statusEnumOption> statusEnumOptions = Stream.of(PublicationStatus.values())
.map(status -> new InstrumentManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
instrumentManageInitDto.setStatusFlagOptions(statusEnumOptions);
// 获取仪器种类
List<InstrumentManageInitDto.InstrumentType> typeList = Stream.of(com.openhis.common.enums.InstrumentCategory.values())
.map(status -> new InstrumentManageInitDto.InstrumentType(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
instrumentManageInitDto.setInstrumentTypeList(typeList);
// 获取仪器状态
List<InstrumentManageInitDto.InstrumentStatusEnumOption> InstrumentStatusEnumOptions = Stream.of(com.openhis.common.enums.InstrumentStatus.values())
.map(status -> new InstrumentManageInitDto.InstrumentStatusEnumOption(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
instrumentManageInitDto.setInstrumentStatusEnumList(InstrumentStatusEnumOptions);
return R.ok(instrumentManageInitDto);
}
@Override
public R<?> getInstrumentPage(InstrumentSelParam InstrumentSelParam, String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request) {
QueryWrapper<Instrument> queryWrapper = HisQueryUtils.buildQueryWrapper(InstrumentSelParam,
searchKey, new HashSet<>(Arrays.asList( "instrument_name", "instrument_name")), request);
Page<InstrumentManageDto> instrumentPage = HisPageUtils.selectPage(instrumentMapper, queryWrapper, pageNo, pageSize,InstrumentManageDto.class);
instrumentPage.getRecords().forEach(instrumentManageDto -> {
instrumentManageDto.setInstrumentTypeEnumText(EnumUtils.getInfoByValue(InstrumentCategory.class, instrumentManageDto.getInstrumentTypeEnum())) ;
});
return R.ok(instrumentPage);
}
@Override
public R<?> updateOrAddInstrument(Instrument instrument) {
instrumentService.saveOrUpdate( instrument);
return R.ok();
}
@Override
public R<?> getInstrumentOne(Long id)
{
Instrument byId = instrumentService.getById(id);
InstrumentManageDto dto = new InstrumentManageDto();
BeanUtils.copyProperties(byId,dto);
return R.ok(dto);
}
@Override
public R<?> editInstrumentStatus(List<Long> ids, Integer status) {
List<Instrument> instrumentList = new CopyOnWriteArrayList<>();
for (Long detail : ids) {
Instrument instrument = new Instrument();
instrument.setId(detail);
instrument.setUsageStatusEnum(status);
instrumentList.add(instrument);
}
return instrumentService.updateBatchById(instrumentList) ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[]{"仪器信息"})) : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
}
}

58
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/LaboratoryManageAppService.java
View File

@@ -1,58 +0,0 @@
package com.openhis.web.Inspection.appservice.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.openhis.common.enums.AdministrativeGender;
import com.openhis.common.utils.EnumUtils;
import com.openhis.common.utils.HisQueryUtils;
import com.openhis.web.Inspection.appservice.ILaboratoryManageAppService;
import com.openhis.web.Inspection.dto.ReportResultManageDto;
import com.openhis.web.Inspection.mapper.LisReportMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
/**
* @Description 样本采集
* @Author
* @Date 2025/10/16
*/
@RequiredArgsConstructor
@Service
public class LaboratoryManageAppService implements ILaboratoryManageAppService {
private final LisReportMapper reportMapper;
@Override
public R<?> getReportResultList(ReportResultManageDto reportResultManageDto, Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request) {
QueryWrapper<ReportResultManageDto> queryWrapper =
HisQueryUtils.buildQueryWrapper(reportResultManageDto,
searchKey, new HashSet<>(Arrays.asList( "patient_name", "charge_name")), request);
IPage<ReportResultManageDto> reportResultList = reportMapper.getReportResultList(new Page<>(pageNo, pageSize), queryWrapper);
Long total = reportMapper.getReportResultListTotal(new Page<>(pageNo, pageSize), queryWrapper);
reportResultList.getRecords().forEach(e -> {
// 性别
e.setGenderEnumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
});
if(total == null){
//总条数为null
total = 0L;
}
reportResultList.setTotal(total);
return R.ok(reportResultList);
}
@Override
public R<?> getReportById(Long id) {
//根据id查询所有观测值
List<ReportResultManageDto> list = reportMapper.getReportListById(new QueryWrapper<ReportResultManageDto>().eq("id", id));
//打印组件配置
return null;
}
}

188
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/LisConfigManageAppServiceImpl.java
View File

@@ -1,188 +0,0 @@
package com.openhis.web.Inspection.appservice.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.utils.SecurityUtils;
import com.openhis.administration.domain.Device;
import com.openhis.administration.domain.DeviceDefinition;
import com.openhis.administration.domain.ObservationDefinition;
import com.openhis.administration.domain.SpecimenDefinition;
import com.openhis.administration.service.IDeviceDefinitionService;
import com.openhis.administration.service.IDeviceService;
import com.openhis.administration.service.IObservationDefinitionService;
import com.openhis.administration.service.ISpecimenDefinitionService;
import com.openhis.common.enums.SpecCollectStatus;
import com.openhis.common.utils.HisQueryUtils;
import com.openhis.lab.domain.*;
import com.openhis.lab.mapper.ActivityDefDeviceDefMapper;
import com.openhis.lab.mapper.ActivityDefObservationDefMapper;
import com.openhis.lab.mapper.ActivityDefSpecimenDefMapper;
import com.openhis.lab.service.IObservationService;
import com.openhis.lab.service.ISpecimenService;
import com.openhis.web.Inspection.appservice.ILisConfigManageAppService;
import com.openhis.web.Inspection.dto.LisConfigManageDto;
import com.openhis.web.Inspection.dto.LisConfigManageInitDto;
import com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto;
import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
import com.openhis.web.datadictionary.mapper.ActivityDefinitionManageMapper;
import lombok.RequiredArgsConstructor;
import lombok.val;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
/**
* @Description TODO
* @Author
* @Date 2025/9/29
*/
@RequiredArgsConstructor
@Service
public class LisConfigManageAppServiceImpl implements ILisConfigManageAppService {
@Resource
private ActivityDefinitionManageMapper activityDefinitionManageMapper;
@Resource
private ActivityDefDeviceDefMapper activityDefDeviceDefMapper;
@Resource
private ActivityDefObservationDefMapper activityDefObservationDefMapper;
@Resource
private ActivityDefSpecimenDefMapper activityDefSpecimenDefMapper;
@Resource
private IDeviceDefinitionService deviceDefinitionService;
@Resource
private ISpecimenDefinitionService specimenDefinitionService;
@Resource
private IObservationDefinitionService observationDefinitionService;
@Resource
private IObservationService observationService;
@Resource
private ISpecimenService specimenService;
@Resource
private IDeviceService deviceService;
@Override
public R<?> getDiseaseTreatmentPage(DiagnosisTreatmentSelParam DiagnosisTreatmentSelParam, String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request) {
// 构建查询条件
QueryWrapper<DiagnosisTreatmentDto> queryWrapper = HisQueryUtils.buildQueryWrapper(DiagnosisTreatmentSelParam,
searchKey, new HashSet<>(Arrays.asList("bus_no", "name", "py_str", "wb_str")), request);
// 分页查询
IPage<DiagnosisTreatmentDto> diseaseTreatmentPage =
activityDefinitionManageMapper.getDiseaseTreatmentPage(new Page<>(pageNo, pageSize), queryWrapper);
return R.ok(diseaseTreatmentPage);
}
public R<?> getInfoList(String searchKey, String type) {
LisConfigManageInitDto initDto = new LisConfigManageInitDto();
initDto.setDeviceDefs(deviceDefinitionService.list());
initDto.setObservationDefs(observationDefinitionService.list());
initDto.setSpecimenDefs(specimenDefinitionService.list());
if (searchKey == null || searchKey.isEmpty()) {
// 如果searchKey为空，则查询所有
return switch (type) {
case "device" -> R.ok(deviceDefinitionService.list(new QueryWrapper<DeviceDefinition>().eq("status_enum",2)));
case "observation" -> R.ok(observationDefinitionService.list(new QueryWrapper<ObservationDefinition>().eq("status_enum",2) ));
case "specimen" -> R.ok(specimenDefinitionService.list(new QueryWrapper<SpecimenDefinition>().eq("status_enum",2)));
default -> R.ok(initDto);
};
} else {
// 如果searchKey不为空，则根据name模糊查询
return switch (type) {
case "device" ->
R.ok(deviceDefinitionService.list((new QueryWrapper<DeviceDefinition>().like("name", searchKey).eq("status_enum",2))));
case "observation" ->
R.ok(observationDefinitionService.list((new QueryWrapper<ObservationDefinition>().like("name", searchKey).eq("status_enum",2))));
case "specimen" ->
R.ok(specimenDefinitionService.list((new QueryWrapper<SpecimenDefinition>().like("name", searchKey).eq("status_enum",2))));
default -> R.ok();
};
}
}
@Override
public R<?> getInfoDetail(Long id) {
LisConfigManageDto manageDto = new LisConfigManageDto();
manageDto.setActivityDefDeviceDefs(activityDefDeviceDefMapper.selectList(new QueryWrapper<ActivityDefDeviceDef>().eq("activity_definition_id", id)));
manageDto.setActivityDefObservationDefs(activityDefObservationDefMapper.selectList(new QueryWrapper<ActivityDefObservationDef>().eq("activity_definition_id", id)));
manageDto.setActivityDefSpecimenDefs(activityDefSpecimenDefMapper.selectList(new QueryWrapper<ActivityDefSpecimenDef>().eq("activity_definition_id", id)));
return R.ok(manageDto);
}
@Override
public R<?> saveAll(LisConfigManageDto manageDto) {
//先全部删除项目下详情
activityDefDeviceDefMapper.delete(new QueryWrapper<ActivityDefDeviceDef>().eq("activity_definition_id", manageDto.getId()));
activityDefObservationDefMapper.delete(new QueryWrapper<ActivityDefObservationDef>().eq("activity_definition_id", manageDto.getId()));
activityDefSpecimenDefMapper.delete(new QueryWrapper<ActivityDefSpecimenDef>().eq("activity_definition_id", manageDto.getId()));
Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
// 根据ID查询【诊疗目录】详情
DiagnosisTreatmentDto diseaseTreatmentOne = activityDefinitionManageMapper.getDiseaseTreatmentOne(manageDto.getId(), tenantId);
manageDto.getActivityDefDeviceDefs().forEach(activityDefDeviceDef -> {
activityDefDeviceDef.setActivityDefinitionId(manageDto.getId());
activityDefDeviceDef.setActivityDefinitionName(diseaseTreatmentOne.getName());
activityDefDeviceDefMapper.insert(activityDefDeviceDef);
});
manageDto.getActivityDefObservationDefs().forEach(activityDefObservationDef -> {
activityDefObservationDef.setActivityDefinitionId(manageDto.getId());
activityDefObservationDef.setActivityDefinitionName(diseaseTreatmentOne.getName());
activityDefObservationDefMapper.insert(activityDefObservationDef);
});
manageDto.getActivityDefSpecimenDefs().forEach(activityDefSpecimenDef -> {
activityDefSpecimenDef.setActivityDefinitionId(manageDto.getId());
activityDefSpecimenDef.setActivityDefinitionName(diseaseTreatmentOne.getName());
activityDefSpecimenDefMapper.insert(activityDefSpecimenDef);
});
return R.ok();
}
@Override
public R<?> createAll(Long patientId,Long ServiceId, Long itemId) {
// 根据ID查询检查项目详情
List<ActivityDefDeviceDef> devices = activityDefDeviceDefMapper.selectList(new QueryWrapper<ActivityDefDeviceDef>().eq("activity_definition_id", itemId));
List<ActivityDefObservationDef> observations= activityDefObservationDefMapper.selectList(new QueryWrapper<ActivityDefObservationDef>().eq("activity_definition_id", itemId));
List<ActivityDefSpecimenDef> specimens = activityDefSpecimenDefMapper.selectList(new QueryWrapper<ActivityDefSpecimenDef>().eq("activity_definition_id", itemId));
devices.forEach(activityDefDeviceDef -> {
Device device = new Device();
device.setDeviceDefId(activityDefDeviceDef.getDeviceDefinitionId());
device.setName(activityDefDeviceDef.getDeviceDefinitionName());
//TODO 器材实体待完善，生成器材请求
});
observations.forEach(activityDefObservationDef -> {
Observation observation = new Observation();
//TODO 初始字段具体观测定义字段待完善
observation.setPatientId(patientId);
observation.setObservationDefinitionId(activityDefObservationDef.getObservationDefinitionId());
observationService.save(observation);
});
specimens.forEach(activityDefSpecimenDef -> {
Specimen specimen = new Specimen();
//TODO 初始字段具体标本定义字段待完善
specimen.setServiceId(ServiceId);
specimen.setSpecimenDefinitionId(activityDefSpecimenDef.getSpecimenDefinitionId());
specimen.setPatientId(patientId);
specimen.setCollectionStatusEnum(SpecCollectStatus.PENDING.getValue());
specimen.setSpecimenUnit(activityDefSpecimenDef.getSpecimenUnit());
specimen.setSpecimenVolume(activityDefSpecimenDef.getSpecimenVolume());
specimenService.save(specimen);
});
return R.ok();
}
}

122
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/ObservationManageAppServiceImpl.java
View File

@@ -1,122 +0,0 @@
package com.openhis.web.Inspection.appservice.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.utils.MessageUtils;
import com.core.common.utils.bean.BeanUtils;
import com.openhis.administration.domain.ObservationDefinition;
import com.openhis.administration.mapper.ObservationDefinitionMapper;
import com.openhis.administration.service.IInstrumentService;
import com.openhis.administration.service.IObservationDefinitionService;
import com.openhis.common.constant.PromptMsgConstant;
import com.core.common.enums.DelFlag;
import com.openhis.common.enums.ObservationType;
import com.openhis.common.enums.PublicationStatus;
import com.openhis.common.utils.EnumUtils;
import com.openhis.common.utils.HisPageUtils;
import com.openhis.common.utils.HisQueryUtils;
import com.openhis.web.Inspection.appservice.IObservationManageAppService;
import com.openhis.web.Inspection.dto.ObservationDefManageDto;
import com.openhis.web.Inspection.dto.ObservationDefManageInitDto;
import com.openhis.web.Inspection.dto.ObservationDefSelParam;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* @Description TODO
* @Author
* @Date 2025/9/23
*/
@Service
@RequiredArgsConstructor
public class ObservationManageAppServiceImpl implements IObservationManageAppService
{
private final ObservationDefinitionMapper observationDefinitionMapper;
private final IObservationDefinitionService observationDefinitionService;
private final IInstrumentService instrumentService;
@Override
public R<?> getManageInit() {
ObservationDefManageInitDto observationDefManageInitDto = new ObservationDefManageInitDto();
// 获取状态
List<ObservationDefManageInitDto.statusEnumOption> statusEnumOptions = Stream.of(PublicationStatus.values())
.map(status -> new ObservationDefManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
observationDefManageInitDto.setStatusFlagOptions(statusEnumOptions);
//观测类型
List<ObservationDefManageInitDto.ObservationTypeEnumOption> ObservationTypeEnumOptions = Stream.of(com.openhis.common.enums.ObservationType.values())
.map(status -> new ObservationDefManageInitDto.ObservationTypeEnumOption(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
observationDefManageInitDto.setObservationTypeList(ObservationTypeEnumOptions);
//仪器列表
List<ObservationDefManageInitDto.InstrumentEnumOption> InstrumentEnumOptions = instrumentService.list().stream()
.map(status -> new ObservationDefManageInitDto.InstrumentEnumOption(status.getId(), status.getInstrumentName()))
.collect(Collectors.toList());
observationDefManageInitDto.setInstrumentEnumOptionList(InstrumentEnumOptions);
return R.ok(observationDefManageInitDto);
}
@Override
public R<?> getObservationDefPage(ObservationDefSelParam ObservationDefSelParam, String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request) {
QueryWrapper<ObservationDefinition> queryWrapper = HisQueryUtils.buildQueryWrapper(ObservationDefSelParam,
searchKey, new HashSet<>(Arrays.asList( "name", "code")), request);
Page<ObservationDefManageDto> ObservationPage = HisPageUtils.selectPage(observationDefinitionMapper, queryWrapper, pageNo, pageSize, ObservationDefManageDto.class);
ObservationPage.getRecords().forEach(item -> {
item.setInstrumentId_dictText(instrumentService.getById(item.getInstrumentId()).getInstrumentName());
item.setStatusEnumText(EnumUtils.getInfoByValue(PublicationStatus.class, item.getStatusEnum()));
item.setObservationTypeEnumText(EnumUtils.getInfoByValue(ObservationType.class, item.getObservationTypeEnum()));
});
return R.ok(ObservationPage);
}
@Override
public R<?> updateOrAddObservationDef(ObservationDefinition Observation) {
Observation.setDeleteFlag(DelFlag.NO.getCode());
observationDefinitionService.saveOrUpdate(Observation);
return R.ok(" 添加成功");
}
@Override
public R<?> getObservationDefOne(Long id) {
ObservationDefinition observationDefinition = observationDefinitionService.getById(id);
ObservationDefManageDto dto = new ObservationDefManageDto();
BeanUtils.copyProperties(observationDefinition,dto);
return R.ok(dto);
}
@Override
public R<?> editObservationDefStatus(List<Long> ids, Integer status) {
List<ObservationDefinition> observationDefinitionList = new CopyOnWriteArrayList<>();
for (Long detail : ids) {
ObservationDefinition observationDefinition = new ObservationDefinition();
observationDefinition.setId(detail);
observationDefinition.setStatusEnum(status);
observationDefinitionList.add(observationDefinition);
}
return observationDefinitionService.updateBatchById(observationDefinitionList) ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[]{"观测信息"}))
: R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
}
}

105
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/SampleCollectManageAppService.java
View File

@@ -1,105 +0,0 @@
package com.openhis.web.Inspection.appservice.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.openhis.common.enums.AdministrativeGender;
import com.openhis.common.enums.SpecCollectStatus;
import com.openhis.common.utils.EnumUtils;
import com.openhis.common.utils.HisQueryUtils;
import com.openhis.lab.domain.Specimen;
import com.openhis.lab.service.ISpecimenService;
import com.openhis.web.Inspection.appservice.ISampleCollectAppManageAppService;
import com.openhis.web.Inspection.dto.SampleCollectManageDto;
import com.openhis.web.Inspection.dto.SampleCollectStatusRequest;
import com.openhis.web.Inspection.mapper.SampleCollectMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.Date;
import java.util.HashSet;
import java.util.Objects;
/**
* @Description 样本采集
* @Author
* @Date 2025/10/16
*/
@RequiredArgsConstructor
@Service
public class SampleCollectManageAppService implements ISampleCollectAppManageAppService {
private final SampleCollectMapper sampleCollectMapper;
private final ISpecimenService specimenService;
@Override
public R<?> getSampleCollectList(SampleCollectManageDto sampleCollectManageDto, Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request) {
QueryWrapper<SampleCollectManageDto> queryWrapper =
HisQueryUtils.buildQueryWrapper(sampleCollectManageDto,
searchKey, new HashSet<>(Arrays.asList( "patient_name", "charge_name")), request);
IPage<SampleCollectManageDto> sampleCollectList = sampleCollectMapper.getSampleCollectList(new Page<>(pageNo, pageSize), queryWrapper);
Long total = sampleCollectMapper.getSampleCollectListTotal(new Page<>(pageNo, pageSize), queryWrapper);
sampleCollectList.getRecords().forEach(e -> {
// 性别
e.setGenderEnumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
// 采集状态
e.setCollectionStatusEnumText(EnumUtils.getInfoByValue(SpecCollectStatus.class, e.getCollectionStatusEnum()));
});
if(total == null){
//总条数为null
total = 0L;
}
sampleCollectList.setTotal(total);
return R.ok(sampleCollectList);
}
@Override
public R<?> updateSampleStatus(SampleCollectStatusRequest statusRequest) {
// 根据状态类型设置对应的状态值
Integer status = switch (statusRequest.getType()) {
case "待采集" -> SpecCollectStatus.PENDING.getValue();
case "已采集" -> SpecCollectStatus.COLLECTED.getValue();
case "已接收" -> SpecCollectStatus.RECEIVED.getValue();
default -> 0;
};
// 批量更新样本状态
specimenService.listByIds(statusRequest.getIds()).forEach(specimen -> {
Integer currentStatus = specimen.getCollectionStatusEnum(); // 获取当前样本状态
// 如果传入状态是已接收，但当前状态是待采集，跳过更新
if (Objects.equals(status, SpecCollectStatus.RECEIVED.getValue()) && Objects.equals(currentStatus, SpecCollectStatus.PENDING.getValue())) {
return;
}
// 构建更新条件
UpdateWrapper<Specimen> updateWrapper = new UpdateWrapper<>();
updateWrapper.in("id", statusRequest.getIds()) // 设置批量更新的条件
.set("collection_status_enum", status); // 设置更新的状态字段
// 如果状态为已采集，且采集日期不为空，跳过采集日期的更新，仅更新状态
if (Objects.equals(status, SpecCollectStatus.COLLECTED.getValue())) {
if (specimen.getCollectionDate() == null) {
// 如果采集日期为空，则设置当前日期
updateWrapper.set("collection_date", new Date());
}
updateWrapper.set("received_date", null);
} else if (Objects.equals(status, SpecCollectStatus.PENDING.getValue())) {
updateWrapper.set("collection_date", null); // 清空采集日期
} else if (Objects.equals(status, SpecCollectStatus.RECEIVED.getValue())) {
updateWrapper.set("received_date", new Date());
}
// 执行更新
specimenService.update(updateWrapper);
});
if (Objects.equals(status, SpecCollectStatus.RECEIVED.getValue())) {
// TODO 接收样本后续逻辑
System.err.println("接收样本后!!");
}
return R.ok();
}
}

110
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/SpecimenManageAppServiceImpl.java
View File

@@ -1,110 +0,0 @@
package com.openhis.web.Inspection.appservice.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.utils.MessageUtils;
import com.openhis.administration.domain.SpecimenDefinition;
import com.openhis.administration.mapper.SpecimenDefinitionMapper;
import com.openhis.administration.service.ISpecimenDefinitionService;
import com.openhis.common.constant.PromptMsgConstant;
import com.openhis.common.enums.PublicationStatus;
import com.openhis.common.enums.SpecimenType;
import com.openhis.common.utils.EnumUtils;
import com.openhis.common.utils.HisPageUtils;
import com.openhis.common.utils.HisQueryUtils;
import com.openhis.web.Inspection.appservice.ISpecimenManageAppService;
import com.openhis.web.Inspection.dto.SpecimenDefManageDto;
import com.openhis.web.Inspection.dto.SpecimenDefManageInitDto;
import com.openhis.web.Inspection.dto.SpecimenDefSelParam;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* @Description
* @Author
* @Date 2025/9/9
*/
@Service
@RequiredArgsConstructor
public class SpecimenManageAppServiceImpl implements ISpecimenManageAppService {
private final SpecimenDefinitionMapper specimenDefinitionMapper;
private final ISpecimenDefinitionService specimenDefinitionService;
@Override
public R<?> getManageInit() {
SpecimenDefManageInitDto specimenDefManageInitDto = new SpecimenDefManageInitDto();
// 获取状态
List<SpecimenDefManageInitDto.statusEnumOption> statusEnumOptions = Stream.of(PublicationStatus.values())
.map(status -> new SpecimenDefManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
specimenDefManageInitDto.setStatusFlagOptions(statusEnumOptions);
// 获取录种类
List<SpecimenDefManageInitDto.SpecimenType> typeList = Stream.of(SpecimenType.values())
.map(status -> new SpecimenDefManageInitDto.SpecimenType(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
specimenDefManageInitDto.setSpecimenTypeList(typeList);
return R.ok(specimenDefManageInitDto);
}
/**
* 样本目录查询
* @param SpecimenDefSelParam 查询条件
* @param searchKey 查询条件-模糊查询
* @param pageNo 查询条件
* @param pageSize 查询条件
* @param request
* @return
*/
@Override
public R<?> getSpecimenPage(SpecimenDefSelParam SpecimenDefSelParam, String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request) {
QueryWrapper<SpecimenDefinition> queryWrapper = HisQueryUtils.buildQueryWrapper(SpecimenDefSelParam,
searchKey, new HashSet<>(Arrays.asList("custom_code", "specimen_name", "py_str", "wb_str")), request);
Page<SpecimenDefManageDto> specimenPage = HisPageUtils.selectPage(specimenDefinitionMapper, queryWrapper, pageNo, pageSize, SpecimenDefManageDto.class);
specimenPage.getRecords().forEach(specimenDefManageDto -> {
specimenDefManageDto.setSpecimenTypeEnumText(EnumUtils.getInfoByValue(SpecimenType.class, specimenDefManageDto.getSpecimenTypeEnum())) ;
specimenDefManageDto.setStatusEnumText(EnumUtils.getInfoByValue(PublicationStatus.class, specimenDefManageDto.getStatusEnum()));
});
return R.ok(specimenPage);
}
@Override
public R<?> updateOrAddSpecimen(SpecimenDefinition specimenDefinition) {
specimenDefinitionService.saveOrUpdate(specimenDefinition);
return R.ok(" 添加成功");
}
@Override
public R<?> getSpecimenOne(Long id) {
SpecimenDefinition specimenDefinition = specimenDefinitionService.getById(id);
return R.ok(specimenDefinition);
}
@Override
public R<?> editSpecimenStatus(List<Long> ids, Integer status) {
List<SpecimenDefinition> specimenDefinitionList = new CopyOnWriteArrayList<>();
for (Long detail : ids) {
SpecimenDefinition specimenDefinition = new SpecimenDefinition();
specimenDefinition.setId(detail);
specimenDefinition.setStatusEnum(status);
specimenDefinitionList.add(specimenDefinition);
}
return specimenDefinitionService.updateBatchById(specimenDefinitionList) ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[]{"样本信息"}))
: R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
}
}

78
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/InstrumentController.java
View File

@@ -1,78 +0,0 @@
package com.openhis.web.Inspection.controller;
import com.core.common.core.domain.R;
import com.openhis.administration.domain.Instrument;
import com.core.common.enums.DelFlag;
import com.openhis.common.enums.PublicationStatus;
import com.openhis.web.Inspection.appservice.IInstrumentManageAppService;
import com.openhis.web.Inspection.dto.InstrumentSelParam;
import com.openhis.web.Inspection.dto.InstrumentStatusRequest;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
/**
* @Description 仪器器材信息
* @Author
* @Date 2025/9/18
*/
@RestController
@RequestMapping("/inspection/instrument")
@Slf4j
@AllArgsConstructor
public class InstrumentController {
private final IInstrumentManageAppService appService;
@GetMapping("/init")
public R<?> getDiseaseTreatmentInit() {
return appService.getManageInit();
}
/**
* 查询样本类型分页列表
*
* @param pageNo 当前页码
* @param pageSize 查询条数
* @return
*/
@GetMapping("/information-page")
public R<?> getInstrumentPage(InstrumentSelParam InstrumentSelParam,
@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
return appService.getInstrumentPage(InstrumentSelParam,searchKey, pageNo, pageSize, request);
}
@PostMapping("/information")
public R<?> editInstrument(@Validated @RequestBody Instrument instrument) {
instrument.setDeleteFlag(DelFlag.NO.getCode());
return appService.updateOrAddInstrument(instrument);
}
@GetMapping("/information-one")
public R<?> getInstrument(@RequestParam Long id) {
return appService.getInstrumentOne(id);
}
@PostMapping("/information-status")
public R<?> updateInstrumentStatus( @RequestBody InstrumentStatusRequest InstrumentStatusRequest ) {
//默认停用
Integer status = PublicationStatus.RETIRED.getValue();
if("启用".equals( InstrumentStatusRequest.getType())){
status = PublicationStatus.ACTIVE.getValue();
}
return appService.editInstrumentStatus(InstrumentStatusRequest.getIds(),status);
}
}

40
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/LaboratoryController.java
View File

@@ -1,40 +0,0 @@
package com.openhis.web.Inspection.controller;
import com.core.common.core.domain.R;
import com.openhis.web.Inspection.appservice.ILaboratoryManageAppService;
import com.openhis.web.Inspection.dto.ReportResultManageDto;
import com.openhis.web.Inspection.dto.SampleCollectManageDto;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
/**
* @Description 检测中心相关
* @Author
* @Date 2025/10/24
*/
@RestController
@RequestMapping("/inspection/laboratory")
@Slf4j
@AllArgsConstructor
public class LaboratoryController {
private final ILaboratoryManageAppService appService;
@GetMapping("/information-page")
public R<?> getReportResultPage(ReportResultManageDto reportResultManageDto, @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
@RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
return appService.getReportResultList( reportResultManageDto, pageNo, pageSize, searchKey, request);
}
@GetMapping("/{id}")
public R<?> getReportById(@PathVariable Long id) {
// 调用 ReportService 获取报告数据
return appService.getReportById(id);
}
}

67
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/LisConfigController.java
View File

@@ -1,67 +0,0 @@
package com.openhis.web.Inspection.controller;
import com.core.common.core.domain.R;
import com.openhis.web.Inspection.appservice.ILisConfigManageAppService;
import com.openhis.web.Inspection.dto.LisConfigManageDto;
import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
/**
* @Description 检验定义配置
* @Author
* @Date 2025/9/29
*/
@RestController
@RequestMapping("/inspection/lisConfig")
@Slf4j
@AllArgsConstructor
public class LisConfigController {
private ILisConfigManageAppService lisConfigManageAppService;
/**
* @Description 获取检验项目列表
* @Author
* @Date 2025/9/29
*/
@RequestMapping("/init-page")
public R<?> getDiseaseTreatmentList(DiagnosisTreatmentSelParam DiagnosisTreatmentSelParam, String searchKey,
Integer pageNo, Integer pageSize, HttpServletRequest request) {
return lisConfigManageAppService.getDiseaseTreatmentPage(DiagnosisTreatmentSelParam, searchKey, pageNo, pageSize, request);
}
/**
* 根据项目id获取详细
* @return
*/
@GetMapping ("/info-detail")
public R<?> getInfoDetail(Long id) {
return lisConfigManageAppService.getInfoDetail(id);
}
@GetMapping ("/init-list")
public R<?> getInfoList(String searchKey,String type) {
return lisConfigManageAppService.getInfoList(searchKey, type);
}
/**
* 修改检验配置
* @param
* @param manageDto
* @return
*/
@PostMapping("/saveAll")
public R<?> saveInfo(@RequestBody LisConfigManageDto manageDto) {
return lisConfigManageAppService.saveAll(manageDto);
}
}

77
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/ObservationDefController.java
View File

@@ -1,77 +0,0 @@
package com.openhis.web.Inspection.controller;
import com.core.common.core.domain.R;
import com.openhis.administration.domain.ObservationDefinition;
import com.core.common.enums.DelFlag;
import com.openhis.common.enums.PublicationStatus;
import com.openhis.web.Inspection.appservice.IObservationManageAppService;
import com.openhis.web.Inspection.dto.ObservationDefSelParam;
import com.openhis.web.Inspection.dto.ObservationDefStatusRequest;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
/**
* @Description 仪器器材信息
* @Author
* @Date 2025/9/18
*/
@RestController
@RequestMapping("/inspection/observation")
@Slf4j
@AllArgsConstructor
public class ObservationDefController {
private final IObservationManageAppService appService;
@GetMapping("/init")
public R<?> getTreatmentInit() {
return appService.getManageInit();
}
/**
* 查询样本类型分页列表
*
* @param pageNo 当前页码
* @param pageSize 查询条数
* @return
*/
@GetMapping("/information-page")
public R<?> getObservationPage(ObservationDefSelParam observationDefSelParam,
@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
return appService.getObservationDefPage(observationDefSelParam,searchKey, pageNo, pageSize, request);
}
@PostMapping("/information")
public R<?> editObservation(@Validated @RequestBody ObservationDefinition observation) {
observation.setDeleteFlag(DelFlag.NO.getCode());
return appService.updateOrAddObservationDef(observation);
}
@GetMapping("/information-one")
public R<?> getObservation(@RequestParam Long id) {
return appService.getObservationDefOne(id);
}
@PostMapping("/information-status")
public R<?> updateObservationStatus( @RequestBody ObservationDefStatusRequest observationDefStatusRequest) {
//默认停用
Integer status = PublicationStatus.RETIRED.getValue();
if("启用".equals( observationDefStatusRequest.getType())){
status = PublicationStatus.ACTIVE.getValue();
}
return appService.editObservationDefStatus(observationDefStatusRequest.getIds(),status);
}
}

40
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/SampleCollectController.java
View File

@@ -1,40 +0,0 @@
package com.openhis.web.Inspection.controller;
import com.core.common.core.domain.R;
import com.openhis.common.enums.PublicationStatus;
import com.openhis.web.Inspection.appservice.ISampleCollectAppManageAppService;
import com.openhis.web.Inspection.dto.SampleCollectManageDto;
import com.openhis.web.Inspection.dto.SampleCollectStatusRequest;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
/**
* @Description 样本采集
* @Author
* @Date 2025/10/16
*/
@RestController
@RequestMapping("/inspection/collection")
@Slf4j
@AllArgsConstructor
public class SampleCollectController {
private final ISampleCollectAppManageAppService appService;
@GetMapping("/information-page")
public R<?> getSampleCollectPage(SampleCollectManageDto sampleCollectManageDto,@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
@RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
return appService.getSampleCollectList( sampleCollectManageDto, pageNo, pageSize, searchKey, request);
}
@PostMapping("/information-status")
public R<?> editSampleCollectStatus(@RequestBody SampleCollectStatusRequest statusRequest) {
return appService.updateSampleStatus(statusRequest);
}
}

76
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/SpecimenDefController.java
View File

@@ -1,76 +0,0 @@
package com.openhis.web.Inspection.controller;
import com.core.common.core.domain.R;
import com.openhis.administration.domain.SpecimenDefinition;
import com.core.common.enums.DelFlag;
import com.openhis.common.enums.PublicationStatus;
import com.openhis.web.Inspection.appservice.ISpecimenManageAppService;
import com.openhis.web.Inspection.dto.SpecimenDefSelParam;
import com.openhis.web.Inspection.dto.SpecimenDefStatusRequest;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
/**
* @Description 样本定义相关
* @Author
* @Date 2025/9/9
*/
@RestController
@RequestMapping("/inspection/specimen")
@Slf4j
@AllArgsConstructor
public class SpecimenDefController {
private final ISpecimenManageAppService specimenManageAppService;
@GetMapping("/init")
public R<?> getDiseaseTreatmentInit() {
return specimenManageAppService.getManageInit();
}
/**
* 查询样本类型分页列表
*
* @param pageNo 当前页码
* @param pageSize 查询条数
* @return
*/
@GetMapping("/information-page")
public R<?> getSpecimenPage(SpecimenDefSelParam specimenDefSelParam,
@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
return specimenManageAppService.getSpecimenPage(specimenDefSelParam,searchKey, pageNo, pageSize, request);
}
@PostMapping("/information")
public R<?> editSpecimen(@Validated @RequestBody SpecimenDefinition specimenDefinition) {
specimenDefinition.setStatusEnum( PublicationStatus.ACTIVE.getValue());
specimenDefinition.setDeleteFlag(DelFlag.NO.getCode());
return specimenManageAppService.updateOrAddSpecimen(specimenDefinition);
}
@GetMapping("/information-one")
public R<?> getSpecimen(@RequestParam Long id) {
return specimenManageAppService.getSpecimenOne(id);
}
@PostMapping("/information-status")
public R<?> updateSpecimenStatus( @RequestBody SpecimenDefStatusRequest specimenDefStatusRequest) {
//默认停用
Integer status = PublicationStatus.RETIRED.getValue();
if("启用".equals( specimenDefStatusRequest.getType())){
status = PublicationStatus.ACTIVE.getValue();
}
return specimenManageAppService.editSpecimenStatus(specimenDefStatusRequest.getIds(),status);
}
}

108
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageDto.java
View File

@@ -1,108 +0,0 @@
package com.openhis.web.Inspection.dto;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.common.annotation.Dict;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* @Description 分页返回
* @Author
* @Date 2025/9/17
*/
@Data
@Accessors(chain = true)
public class InstrumentManageDto {
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/** 仪器编号，唯一且不能为空 */
private String instrumentCode;
/** 仪器名称，必填项 */
private String instrumentName;
/** 仪器主编号 */
private String instrumentMainCode;
/** 仪器类型，选择项 */
private Integer instrumentTypeEnum;
private String instrumentTypeEnumText;
/** 仪器型号 */
private String instrumentModel;
/** 生产厂家 */
private String manufacturer;
/** 仪器序列号 */
private String serialNumber;
/** 购买公司 */
private String purchasingCompany;
/** 联系人员 */
private String contactPerson;
/** 购买日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date purchaseDate;
/** 原价格 */
private BigDecimal originalPrice;
/** 成交价格 */
private BigDecimal transactionPrice;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
/** 安装日期 */
private Date installationDate;
/** 安装人员 */
private String installationPerson;
/** 维护人员 */
private String maintenancePerson;
/** 所属科室 */
@Dict(dictTable = "adm_organization", dictCode = "id", dictText = "name")
@JsonSerialize(using = ToStringSerializer.class)
private Long orgId;
private String orgId_dictText;
/** 鉴定人员 */
private String identificationPerson;
/** 记录温度 */
private String recordedTemperature;
/** 仪器附件 */
private String accessories;
/** 仪器状态 */
private Integer instrumentStatusEnum;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
/** 报损日期 */
private Date damageReportDate;
/** 可复查仪器 是否 */
private Integer recheckableInstrumentEnum;
/** 使用状态，是否 */
private Integer usageStatusEnum;
/** 停用原因 */
private String decommissionReason;
/** 备注 */
private String remarks;
}

56
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageInitDto.java
View File

@@ -1,56 +0,0 @@
package com.openhis.web.Inspection.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.ArrayList;
import java.util.List;
/**
*
*
* @author
* @date
*/
@Data
@Accessors(chain = true)
public class InstrumentManageInitDto {
private List<statusEnumOption> statusFlagOptions;
private List<InstrumentType> InstrumentTypeList;
private List<InstrumentStatusEnumOption> InstrumentStatusEnumList;
/**
* 状态
*/
@Data
public static class statusEnumOption {
private Integer value;
private String info;
public statusEnumOption(Integer value, String info) {
this.value = value;
this.info = info;
}
}
@Data
public static class InstrumentStatusEnumOption {
private Integer value;
private String info;
public InstrumentStatusEnumOption(Integer value, String info) {
this.value = value;
this.info = info;
}
}
@Data
public static class InstrumentType {
private Integer value;
private String info;
public InstrumentType(Integer value, String info) {
this.value = value;
this.info = info;
}
}
}

22
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentSelParam.java
View File

@@ -1,22 +0,0 @@
package com.openhis.web.Inspection.dto;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 样本定义分页检索条件
*
* @author lpt
* @date 2025-02-25
*/
@Data
@Accessors(chain = true)
public class InstrumentSelParam {
/** 仪器类型 */
private Integer instrumentTypeEnum;
/** 状态 */
private Integer statusEnum;
}

16
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentStatusRequest.java
View File

@@ -1,16 +0,0 @@
package com.openhis.web.Inspection.dto;
import lombok.Data;
import java.util.List;
/**
* @Description TODO
* @Author
* @Date 2025/9/18
*/
@Data
public class InstrumentStatusRequest {
private List<Long> ids;
private String type;
}

31
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/LisConfigManageDto.java
View File

@@ -1,31 +0,0 @@
package com.openhis.web.Inspection.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.lab.domain.ActivityDefDeviceDef;
import com.openhis.lab.domain.ActivityDefObservationDef;
import com.openhis.lab.domain.ActivityDefSpecimenDef;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List;
/**
* @Description TODO
* @Author
* @Date 2025/9/30
*/
@Data
@Accessors(chain = true)
public class LisConfigManageDto {
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
private List<ActivityDefDeviceDef> activityDefDeviceDefs;
private List<ActivityDefObservationDef> activityDefObservationDefs;
private List<ActivityDefSpecimenDef> activityDefSpecimenDefs;
}

29
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/LisConfigManageInitDto.java
View File

@@ -1,29 +0,0 @@
package com.openhis.web.Inspection.dto;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.openhis.administration.domain.DeviceDefinition;
import com.openhis.administration.domain.ObservationDefinition;
import com.openhis.administration.domain.SpecimenDefinition;
import com.openhis.web.datadictionary.dto.DeviceManageDto;
import com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List;
/**
* @Description TODO
* @Author
* @Date 2025/10/10
*/
@Data
@Accessors(chain = true)
public class LisConfigManageInitDto {
private List <DeviceDefinition> deviceDefs;
private List<ObservationDefinition> observationDefs;
private List<SpecimenDefinition> specimenDefs;
}

50
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ObservationDefManageDto.java
View File

@@ -1,50 +0,0 @@
package com.openhis.web.Inspection.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.common.annotation.Dict;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* @Description 分页返回
* @Author
* @Date 2025/9/17
*/
@Data
@Accessors(chain = true)
public class ObservationDefManageDto {
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/** 观测名称，用于标识观测的具体名称 */
private String name;
/** 观测代码，用于唯一标识一个观测项 */
private String code;
/** 观测类型，例如：实验室、临床症状等 */
private Integer observationTypeEnum;
private String observationTypeEnumText;
/** 参考范围，例如：3.0-6.0 mg/dL，用于指示正常范围 */
private String referenceRange;
@Dict(dictTable = "adm_instrument", dictCode = "id", dictText = "instrument_name")
/** 观测仪器id */
private Long instrumentId;
private String instrumentId_dictText;
/** 状态 */
private Integer statusEnum;
private String statusEnumText;
/** 删除状态） */
private String deleteFlag;
}

53
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ObservationDefManageInitDto.java
View File

@@ -1,53 +0,0 @@
package com.openhis.web.Inspection.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List;
/**
*
*
* @author
* @date
*/
@Data
@Accessors(chain = true)
public class ObservationDefManageInitDto {
private List<statusEnumOption> statusFlagOptions;
private List<ObservationTypeEnumOption> ObservationTypeList;
private List<InstrumentEnumOption> instrumentEnumOptionList;
/**
* 状态
*/
@Data
public static class statusEnumOption {
private Integer value;
private String info;
public statusEnumOption(Integer value, String info) {
this.value = value;
this.info = info;
}
}
@Data
public static class ObservationTypeEnumOption {
private Integer value;
private String info;
public ObservationTypeEnumOption(Integer value, String info) {
this.value = value;
this.info = info;
}
}
@Data
public static class InstrumentEnumOption {
private Long value;
private String info;
public InstrumentEnumOption(Long value, String info) {
this.value = value;
this.info = info;
}
}
}

22
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ObservationDefSelParam.java
View File

@@ -1,22 +0,0 @@
package com.openhis.web.Inspection.dto;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 样本定义分页检索条件
*
* @author lpt
* @date 2025-02-25
*/
@Data
@Accessors(chain = true)
public class ObservationDefSelParam {
/** 类型 */
private Integer observationTypeEnum;
/** 状态 */
private Integer statusEnum;
}

16
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ObservationDefStatusRequest.java
View File

@@ -1,16 +0,0 @@
package com.openhis.web.Inspection.dto;
import lombok.Data;
import java.util.List;
/**
* @Description TODO
* @Author
* @Date 2025/9/18
*/
@Data
public class ObservationDefStatusRequest {
private List<Long> ids;
private String type;
}

37
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ReportResultManageDto.java
View File

@@ -1,37 +0,0 @@
package com.openhis.web.Inspection.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.util.Date;
/**
* @Description TODO
* @Author
* @Date 2025/10/17
*/
@Data
public class ReportResultManageDto {
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
private String patientName; // 患者名称
private String chargeName; // 项目名称
private String specimenName; // 样本名称
private String doctorName; // 开单医生
private String observationName;//观测定义名称
private String observationResult; // 观测结果
private String referenceRange; // 参考范围
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String observationDate;//观测时间
private Integer genderEnum; // 性别
private String genderEnumText;// 性别文本
private String technicianName;// 检查人员
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String authoredTime; // 开单时间
}

46
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SampleCollectManageDto.java
View File

@@ -1,46 +0,0 @@
package com.openhis.web.Inspection.dto;
import com.core.common.core.domain.entity.SysMenu;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* @Description TODO
* @Author
* @Date 2025/10/17
*/
@Data
public class SampleCollectManageDto {
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
private String patientName; // 患者名称
private String chargeName; // 项目名称
private String specimenName; // 样本名称
private String doctorName; // 开单医生
private Integer specimenVolume; //样本量
private String specimenUnit; //样本单位
private Integer genderEnum; // 性别
private String genderEnumText;// 性别文本
private Integer collectionStatusEnum;//采集状态
private String collectionStatusEnumText; // 采集状态文本
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date collectionDate; // 采集时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date receivedDate; // 接收时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String authoredTime; // 开单时间
}

16
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SampleCollectStatusRequest.java
View File

@@ -1,16 +0,0 @@
package com.openhis.web.Inspection.dto;
import lombok.Data;
import java.util.List;
/**
* @Description TODO
* @Author
* @Date 2025/10/23
*/
@Data
public class SampleCollectStatusRequest {
private List<Long> ids;
private String type;
}

62
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SpecimenDefManageDto.java
View File

@@ -1,62 +0,0 @@
package com.openhis.web.Inspection.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* @Description 分页返回
* @Author
* @Date 2025/9/17
*/
@Data
@Accessors(chain = true)
public class SpecimenDefManageDto {
/** $column.columnComment */
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/** 样本类型 */
private Integer specimenTypeEnum;
private String specimenTypeEnumText;
/** 样本名称 */
private String specimenName;
/** 自定义码 */
private String customCode;
/** 类型顺序 */
private Integer typeOrder;
/** 外部代码 */
private String externalCode;
/** 序号 */
private Integer serialNumber;
/** 全网型 */
private String globalType;
/** 拼音 */
private String pyStr;
/** 五笔 */
private String wbStr;
/** 样本类 */
private String specimenClass;
/** 扩展类型 */
private String extendedType;
/** WHONET代码 */
private String whonetCode;
/** 状态 */
private Integer statusEnum;
private String statusEnumText;
}

45
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SpecimenDefManageInitDto.java
View File

@@ -1,45 +0,0 @@
package com.openhis.web.Inspection.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.ArrayList;
import java.util.List;
/**
*
*
* @author
* @date
*/
@Data
@Accessors(chain = true)
public class SpecimenDefManageInitDto {
private List<statusEnumOption> statusFlagOptions;
private List<SpecimenType> SpecimenTypeList;
/**
* 状态
*/
@Data
public static class statusEnumOption {
private Integer value;
private String info;
public statusEnumOption(Integer value, String info) {
this.value = value;
this.info = info;
}
}
@Data
public static class SpecimenType {
private Integer value;
private String info;
List<SpecimenType> children = new ArrayList<>();
public SpecimenType(Integer value, String info) {
this.value = value;
this.info = info;
}
}
}

22
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SpecimenDefSelParam.java
View File

@@ -1,22 +0,0 @@
package com.openhis.web.Inspection.dto;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 样本定义分页检索条件
*
* @author lpt
* @date 2025-02-25
*/
@Data
@Accessors(chain = true)
public class SpecimenDefSelParam {
/** 样本类型 */
private Integer specimenTypeEnum;
/** 状态 */
private Integer statusEnum;
}

16
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SpecimenDefStatusRequest.java
View File

@@ -1,16 +0,0 @@
package com.openhis.web.Inspection.dto;
import lombok.Data;
import java.util.List;
/**
* @Description TODO
* @Author
* @Date 2025/9/18
*/
@Data
public class SpecimenDefStatusRequest {
private List<Long> ids;
private String type;
}

11
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/mapper/GroupRecMapper.java
View File

@@ -1,11 +0,0 @@
package com.openhis.web.Inspection.mapper;
/**
* @Description TODO
* @Author
* @Date 2025/10/24 16:40
*/
public interface GroupRecMapper {
}

26
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/mapper/LisReportMapper.java
View File

@@ -1,26 +0,0 @@
package com.openhis.web.Inspection.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.openhis.web.Inspection.dto.ReportResultManageDto;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Description TODO
* @Author
* @Date 2025/11/5 9:36
*/
@Mapper
public interface LisReportMapper {
IPage<ReportResultManageDto> getReportResultList(@Param("page") Page<ReportResultManageDto> page, @Param(Constants.WRAPPER) QueryWrapper<ReportResultManageDto> queryWrapper);
Long getReportResultListTotal (@Param("page")Page<ReportResultManageDto> page, @Param(Constants.WRAPPER) QueryWrapper<ReportResultManageDto> queryWrapper);
List<ReportResultManageDto> getReportListById(@Param(Constants.WRAPPER) QueryWrapper<ReportResultManageDto> queryWrapper);
}

23
openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/mapper/SampleCollectMapper.java
View File

@@ -1,23 +0,0 @@
package com.openhis.web.Inspection.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.openhis.web.Inspection.dto.SampleCollectManageDto;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* @Description TODO
* @Author
* @Date 2025/10/17 11:27
*/
@Mapper
public interface SampleCollectMapper {
IPage<SampleCollectManageDto> getSampleCollectList(@Param("page")Page<SampleCollectManageDto> page, @Param(Constants.WRAPPER) QueryWrapper<SampleCollectManageDto> queryWrapper);
Long getSampleCollectListTotal (@Param("page")Page<SampleCollectManageDto> page, @Param(Constants.WRAPPER) QueryWrapper<SampleCollectManageDto> queryWrapper);
}

3
openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationAppService.java
View File

@@ -18,8 +18,7 @@ public interface IOrganizationAppService {
* @param request 请求数据
* @return 机构树分页列表
*/
Page<OrganizationDto> getOrganizationTree(Integer pageNo, Integer pageSize, String sortField, String sortOrder,
HttpServletRequest request);
Page<OrganizationDto> getOrganizationTree(Integer pageNo, Integer pageSize, HttpServletRequest request);
/**
* 机构信息详情

48
openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java
View File

@@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.enums.DelFlag;
import com.core.common.utils.*;
import com.openhis.administration.domain.EncounterLocation;
import com.openhis.administration.domain.Location;
@@ -78,9 +77,7 @@ public class LocationAppServiceImpl implements ILocationAppService {
*/
@Override
public R<?> enableLocation(List<Long> locationIdList) {
// 根据ID查询停用状态的
List<Location> locationList = locationService.getLocationList(locationIdList,
Collections.singletonList(LocationStatus.INACTIVE.getValue()));
List<Location> locationList = locationService.getLocationList(locationIdList);
if (locationIdList != null && !locationIdList.isEmpty()) {
for (Location location : locationList) {
if (LocationForm.HOUSE.getValue().equals(location.getFormEnum())
@@ -120,8 +117,7 @@ public class LocationAppServiceImpl implements ILocationAppService {
*/
@Override
public R<?> deactivateLocation(List<Long> locationIdList) {
List<Location> locationList = locationService.getLocationList(locationIdList,
Arrays.asList(LocationStatus.ACTIVE.getValue(), LocationStatus.IDLE.getValue()));
List<Location> locationList = locationService.getLocationList(locationIdList);
if (locationIdList != null && !locationIdList.isEmpty()) {
for (Location location : locationList) {
if (LocationForm.BED.getValue().equals(location.getFormEnum())) {
@@ -235,23 +231,6 @@ public class LocationAppServiceImpl implements ILocationAppService {
// 启用停用
e.setStatusEnum_enumText(EnumUtils.getInfoByValue(LocationStatus.class, e.getStatusEnum()));
});
// 如果是查询病房
if (LocationForm.HOUSE.getValue().equals(locationPageParam.getFormEnum())) {
// 查询疗区
LambdaQueryWrapper<Location> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Location::getFormEnum, LocationForm.WARD.getValue()).eq(Location::getDeleteFlag,
DelFlag.NO.getCode());
List<Location> list = locationService.list(wrapper);
// 根据busNo拼接疗区
HashMap<String, String> map = list.stream().collect(Collectors.toMap(Location::getBusNo, Location::getName,
(oldValue, newValue) -> newValue, HashMap::new));
locationPage.getRecords().forEach(e -> {
String[] split = e.getBusNo().split("\\.");
if (split.length == 2) {
e.setParentName(map.get(split[0]));
}
});
}
return R.ok(locationPage);
}
@@ -263,16 +242,7 @@ public class LocationAppServiceImpl implements ILocationAppService {
*/
@Override
public R<?> addLocation(LocationAddOrEditDto locationAddOrEditDto) {
// 不能为空
if (StringUtils.isEmpty(locationAddOrEditDto.getName())) {
return R.fail(false, "名称不能为空");
}
// 去除空格
String name = locationAddOrEditDto.getName().replaceAll("[ 　]", "");
// 判断是否存在同名
if (locationService.isExistName(name, locationAddOrEditDto.getBusNo(), locationAddOrEditDto.getId())) {
return R.fail(false, "【" + name + "】已存在");
}
Location location = new Location();
BeanUtils.copyProperties(locationAddOrEditDto, location);
location.setFormEnum(Integer.valueOf(locationAddOrEditDto.getFormEnum()));
@@ -308,16 +278,6 @@ public class LocationAppServiceImpl implements ILocationAppService {
*/
@Override
public R<?> editLocation(LocationAddOrEditDto locationAddOrEditDto) {
// 不能为空
if (StringUtils.isEmpty(locationAddOrEditDto.getName())) {
return R.fail(false, "名称不能为空");
}
// 去除空格
String name = locationAddOrEditDto.getName().replaceAll("[ 　]", "");
// 判断是否存在同名
if (locationService.isExistName(name, locationAddOrEditDto.getBusNo(), locationAddOrEditDto.getId())) {
return R.fail(false, "【" + name + "】已存在");
}
Location location = new Location();
BeanUtils.copyProperties(locationAddOrEditDto, location);
// 拼音码
@@ -417,4 +377,4 @@ public class LocationAppServiceImpl implements ILocationAppService {
}
return tree;
}
}
}

41
openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationAppServiceImpl.java
View File

@@ -1,6 +1,5 @@
package com.openhis.web.basedatamanage.appservice.impl;
import java.lang.reflect.Field;
import java.util.*;
import java.util.stream.Collectors;
@@ -10,7 +9,6 @@ import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.utils.AssignSeqUtil;
@@ -28,8 +26,6 @@ import com.openhis.common.utils.EnumUtils;
import com.openhis.web.basedatamanage.appservice.IOrganizationAppService;
import com.openhis.web.basedatamanage.dto.OrganizationDto;
import static com.baomidou.mybatisplus.core.toolkit.StringUtils.camelToUnderline;
@Service
public class OrganizationAppServiceImpl implements IOrganizationAppService {
@@ -40,25 +36,9 @@ public class OrganizationAppServiceImpl implements IOrganizationAppService {
private AssignSeqUtil assignSeqUtil;
@Override
public Page<OrganizationDto> getOrganizationTree(Integer pageNo, Integer pageSize, String sortField,
String sortOrder, HttpServletRequest request) {
public Page<OrganizationDto> getOrganizationTree(Integer pageNo, Integer pageSize, HttpServletRequest request) {
// 查询机构列表
// 创建Page对象
Page<Organization> page = new Page<>(pageNo, pageSize);
// 处理动态排序（仅当排序字段有效时才添加排序条件）
if (sortField != null && !sortField.isEmpty()) {
// 校验排序字段是否为Organization实体中的有效字段（防止非法字段）
if (isValidField(Organization.class, sortField)) {
// 驼峰转下划线处理
String underlineField = camelToUnderline(sortField);
// 默认为升序，若指定desc则按降序
boolean isAsc = sortOrder == null || "asc".equalsIgnoreCase(sortOrder);
page.addOrder(isAsc ? OrderItem.asc(underlineField) : OrderItem.desc(underlineField));
}
}
// 执行分页查询（此时排序条件会被应用）
page = organizationService.page(page);
Page<Organization> page = organizationService.page(new Page<>(pageNo, pageSize));
List<Organization> organizationList = page.getRecords();
// 将机构列表转为树结构
List<OrganizationDto> orgTree = buildTree(organizationList);
@@ -208,21 +188,4 @@ public class OrganizationAppServiceImpl implements IOrganizationAppService {
: R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, new Object[] {"机构信息停用"}));
}
/**
* 校验字段是否为指定类中的有效属性
*/
private boolean isValidField(Class<?> clazz, String fieldName) {
if (clazz == null || fieldName == null || fieldName.isEmpty()) {
return false;
}
try {
// 获取类中所有声明的字段（包括私有）
Field field = clazz.getDeclaredField(fieldName);
return field != null;
} catch (NoSuchFieldException e) {
// 字段不存在
return false;
}
}
}

3
openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java
View File

@@ -406,8 +406,7 @@ public class PractitionerAppServiceImpl implements IPractitionerAppService {
if (1L == userId) {
return R.fail(null, "admin不允许删除");
}
// iBizUserService.remove(new LambdaQueryWrapper<BizUser>().eq(BizUser::getUserId, userId));
practitionerAppAppMapper.delUser(userId);
iBizUserService.remove(new LambdaQueryWrapper<BizUser>().eq(BizUser::getUserId, userId));
practitionerAppAppMapper.delUserRole(userId);
Practitioner one =
iPractitionerService.getOne(new LambdaQueryWrapper<Practitioner>().eq(Practitioner::getUserId, userId));

7
openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java
View File

@@ -47,11 +47,8 @@ public class OrganizationController {
*/
@GetMapping(value = "/organization")
public R<?> getOrganizationPage(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize", defaultValue = "100") Integer pageSize,
@RequestParam(value = "sortField", required = false) String sortField,
@RequestParam(value = "sortOrder", required = false) String sortOrder, HttpServletRequest request) {
Page<OrganizationDto> organizationTree =
iOrganizationAppService.getOrganizationTree(pageNo, pageSize, sortField, sortOrder, request);
@RequestParam(value = "pageSize", defaultValue = "100") Integer pageSize, HttpServletRequest request) {
Page<OrganizationDto> organizationTree = iOrganizationAppService.getOrganizationTree(pageNo, pageSize, request);
return R.ok(organizationTree,
MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"机构信息"}));
}

8
openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInfoDto.java
View File

@@ -3,10 +3,11 @@
*/
package com.openhis.web.basedatamanage.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.common.annotation.Dict;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -30,9 +31,6 @@ public class LocationInfoDto {
/** 名称 */
private String name;
/** 父名称 */
private String parentName;
/** 状态编码 */
private Integer statusEnum;
private String statusEnum_enumText;
@@ -46,7 +44,7 @@ public class LocationInfoDto {
private String formEnum_enumText;
/** 机构编码 */
@Dict(dictCode = "id", dictText = "name", dictTable = "adm_organization")
@Dict(dictCode = "id",dictText = "name",dictTable = "adm_organization")
@JsonSerialize(using = ToStringSerializer.class)
private Long organizationId;
private String organizationId_dictText;

5
openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryDto.java
View File

@@ -63,9 +63,4 @@ public class OrgLocQueryDto {
/** 显示顺序 */
private Integer displayOrder;
/**
* 项目编码 | 药品:1 耗材:2
*/
private String itemCode;
}

7
openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/mapper/PractitionerAppAppMapper.java
View File

@@ -47,13 +47,6 @@ public interface PractitionerAppAppMapper {
List<PractitionerOrgAndLocationDto>
getOrgAndLocationDtoList(@Param("practitionerIdList") List<Long> practitionerIdList);
/**
* 逻辑删除系统用户
*
* @param userId 系统用户id
*/
void delUser(@Param("userId") Long userId);
/**
* 物理删除系统用户与角色的关系
*

5
openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceFormData.java
View File

@@ -85,9 +85,4 @@ public class HealthcareServiceFormData {
/** 医保编码 */
private String ybNo;
/**
* 编码
*/
private String busNo;
}

25
openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IInpatientChargeAppService.java
View File

@@ -20,32 +20,26 @@ import com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto;
public interface IInpatientChargeAppService {
/**
* 门诊收费页面初始化
*
* @return 初始化信息
*/
R<?> inpatientChargeInit();
/**
* 查询住院患者分页列表
* 查询就诊患者分页列表
*
* @param encounterPatientPageParam 查询条件
* @param searchKey 模糊查询关键字
* @param pageNo 当前页
* @param pageSize 每页多少条
* @param request 请求
* @return 住院患者分页列表
* @return 就诊患者分页列表
*/
R<?> getEncounterPatientPage(EncounterPatientPageParam encounterPatientPageParam, String searchKey, Integer pageNo,
Integer pageSize, HttpServletRequest request);
/**
* 根据就诊id查询患者待结算信息
* 根据就诊id查询患者处方列表
*
* @param encounterId 就诊id
* @return 患者待结算信息
* @return 患者处方列表
*/
List<EncounterPatientPrescriptionDto> getEncounterPatientPrescription(Long encounterId);
List<EncounterPatientPrescriptionDto> getEncounterPatientPrescription(Long encounterId, String startTime,
String endTime);
/**
* 医保转自费
@@ -62,4 +56,11 @@ public interface IInpatientChargeAppService {
* @return 操作结果
*/
R<?> changeToMedicalInsurance(Long encounterId);
/**
* 门诊收费页面初始化
*
* @return 初始化信息
*/
R<?> outpatientChargeInit();
}

8
openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientChargeAppService.java
View File

@@ -40,14 +40,6 @@ public interface IOutpatientChargeAppService {
*/
List<EncounterPatientPrescriptionDto> getEncounterPatientPrescription(Long encounterId);
/**
* 根据就诊id查询患者处方列表并新增字段：实收金额、应收金额、优惠金额、折扣率
*
* @param encounterId 就诊id
* @return 患者处方列表
*/
List<EncounterPatientPrescriptionDto> getEncounterPatientPrescriptionWithPrice(Long encounterId);
/**
* 医保转自费
*

70
openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/InpatientChargeAppServiceImpl.java
View File

@@ -3,10 +3,9 @@
*/
package com.openhis.web.chargemanage.appservice.impl;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import javax.servlet.http.HttpServletRequest;
@@ -22,7 +21,10 @@ import com.openhis.administration.service.IAccountService;
import com.openhis.administration.service.IChargeItemService;
import com.openhis.common.constant.CommonConstants;
import com.openhis.common.constant.PromptMsgConstant;
import com.openhis.common.enums.*;
import com.openhis.common.enums.AdministrativeGender;
import com.openhis.common.enums.ChargeItemContext;
import com.openhis.common.enums.ChargeItemStatus;
import com.openhis.common.enums.EncounterClass;
import com.openhis.common.utils.EnumUtils;
import com.openhis.common.utils.HisQueryUtils;
import com.openhis.web.chargemanage.appservice.IInpatientChargeAppService;
@@ -49,32 +51,33 @@ public class InpatientChargeAppServiceImpl implements IInpatientChargeAppService
private IAccountService accountService;
/**
* 住院结算页面初始化
* 门诊收费页面初始化
*
* @return 初始化信息
*/
@Override
public R<?> inpatientChargeInit() {
public R<?> outpatientChargeInit() {
OutpatientInitDto initDto = new OutpatientInitDto();
List<OutpatientInitDto.encounterStatusOption> encounterStatusOptions = new ArrayList<>();
encounterStatusOptions
.add(new OutpatientInitDto.encounterStatusOption(EncounterZyStatus.DISCHARGED_FROM_HOSPITAL.getValue(),
EncounterZyStatus.DISCHARGED_FROM_HOSPITAL.getInfo()));
encounterStatusOptions.add(new OutpatientInitDto.encounterStatusOption(
EncounterZyStatus.ALREADY_SETTLED.getValue(), EncounterZyStatus.ALREADY_SETTLED.getInfo()));
initDto.setEncounterStatusOptions(encounterStatusOptions);
List<OutpatientInitDto.chargeItemStatusOption> chargeItemStatusOptions = new ArrayList<>();
chargeItemStatusOptions.add(new OutpatientInitDto.chargeItemStatusOption(ChargeItemStatus.PLANNED.getValue(),
ChargeItemStatus.PLANNED.getInfo()));
chargeItemStatusOptions.add(new OutpatientInitDto.chargeItemStatusOption(ChargeItemStatus.BILLABLE.getValue(),
ChargeItemStatus.BILLABLE.getInfo()));
chargeItemStatusOptions.add(new OutpatientInitDto.chargeItemStatusOption(ChargeItemStatus.BILLED.getValue(),
ChargeItemStatus.BILLED.getInfo()));
initDto.setChargeItemStatusOptions(chargeItemStatusOptions);
return R.ok(initDto);
}
/**
* 查询住院患者分页列表
* 查询就诊患者分页列表
*
* @param encounterPatientPageParam 查询条件
* @param searchKey 模糊查询关键字
* @param pageNo 当前页
* @param pageSize 每页多少条
* @param request 请求
* @return 住院患者分页列表
* @return 就诊患者分页列表
*/
@Override
public R<?> getEncounterPatientPage(EncounterPatientPageParam encounterPatientPageParam, String searchKey,
@@ -87,17 +90,14 @@ public class InpatientChargeAppServiceImpl implements IInpatientChargeAppService
CommonConstants.FieldName.EncounterBusNo, CommonConstants.FieldName.IdCard)),
request);
// 就诊患者分页列表
Page<EncounterPatientPageDto> encounterPatientPage = inpatientChargeAppMapper.selectEncounterPatientPage(
EncounterClass.IMP.getValue(), EncounterZyStatus.DISCHARGED_FROM_HOSPITAL.getValue(),
EncounterZyStatus.ALREADY_SETTLED.getValue(), ChargeItemStatus.BILLABLE.getValue(),
ChargeItemStatus.BILLED.getValue(), ChargeItemStatus.REFUNDED.getValue(),
AccountType.PERSONAL_CASH_ACCOUNT.getCode(), new Page<>(pageNo, pageSize), queryWrapper);
Page<EncounterPatientPageDto> encounterPatientPage = inpatientChargeAppMapper
.selectEncounterPatientPage(EncounterClass.IMP.getValue(), new Page<>(pageNo, pageSize), queryWrapper);
encounterPatientPage.getRecords().forEach(e -> {
// 性别枚举
e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
// 住院状态
e.setEncounterStatus_enumText(EnumUtils.getInfoByValue(EncounterZyStatus.class, e.getEncounterStatus()));
// 收费状态枚举
e.setStatusEnum_enumText(EnumUtils.getInfoByValue(ChargeItemStatus.class, e.getStatusEnum()));
// 计算年龄
e.setAge(e.getBirthDate() != null ? AgeCalculatorUtil.getAge(e.getBirthDate()) : "");
});
@@ -105,20 +105,36 @@ public class InpatientChargeAppServiceImpl implements IInpatientChargeAppService
}
/**
* 根据就诊id查询患者待结算信息
* 根据就诊id查询患者处方列表
*
* @param encounterId 就诊id
* @return 患者待结算信息
* @return 患者处方列表
*/
@Override
public List<EncounterPatientPrescriptionDto> getEncounterPatientPrescription(Long encounterId) {
public List<EncounterPatientPrescriptionDto> getEncounterPatientPrescription(Long encounterId, String startTime,
String endTime) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
startTime = startTime + "000000";
endTime = endTime + "235959";
Date startDate = null;
Date endDate = null;
try {
startDate = sdf.parse(startTime);
endDate = sdf.parse(endTime);
} catch (ParseException e) {
e.printStackTrace();
}
List<EncounterPatientPrescriptionDto> prescriptionDtoList =
inpatientChargeAppMapper.selectEncounterPatientPrescription(encounterId,
ChargeItemContext.ACTIVITY.getValue(), ChargeItemContext.MEDICATION.getValue(),
ChargeItemContext.DEVICE.getValue(), ChargeItemContext.REGISTER.getValue(),
ChargeItemStatus.PLANNED.getValue(), ChargeItemStatus.BILLABLE.getValue(),
ChargeItemStatus.BILLED.getValue(), ChargeItemStatus.REFUNDING.getValue(),
ChargeItemStatus.REFUNDED.getValue(), ChargeItemStatus.PART_REFUND.getValue());
ChargeItemStatus.REFUNDED.getValue(), ChargeItemStatus.PART_REFUND.getValue(), startDate, endDate);
prescriptionDtoList.forEach(e -> {
// 收费状态枚举
e.setStatusEnum_enumText(EnumUtils.getInfoByValue(ChargeItemStatus.class, e.getStatusEnum()));

66
openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java
View File

@@ -3,9 +3,6 @@
*/
package com.openhis.web.chargemanage.appservice.impl;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
@@ -29,7 +26,6 @@ import com.openhis.common.enums.AdministrativeGender;
import com.openhis.common.enums.ChargeItemContext;
import com.openhis.common.enums.ChargeItemStatus;
import com.openhis.common.enums.EncounterClass;
import com.openhis.common.enums.ybenums.YbPayment;
import com.openhis.common.utils.EnumUtils;
import com.openhis.common.utils.HisQueryUtils;
import com.openhis.web.chargemanage.appservice.IOutpatientChargeAppService;
@@ -214,66 +210,4 @@ public class OutpatientChargeAppServiceImpl implements IOutpatientChargeAppServi
}
return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
}
/**
* 根据就诊id查询患者处方列表并新增字段：应收金额，实收金额，优惠金额，折扣率
*
* @param encounterId 就诊id
* @return 患者处方列表
*/
@Override
public List<EncounterPatientPrescriptionDto> getEncounterPatientPrescriptionWithPrice(Long encounterId) {
List<EncounterPatientPrescriptionDto> prescriptionDtoList = outpatientChargeAppMapper
.selectEncounterPatientPrescriptionWithPrice(encounterId, ChargeItemContext.ACTIVITY.getValue(),
ChargeItemContext.MEDICATION.getValue(), ChargeItemContext.DEVICE.getValue(),
ChargeItemContext.REGISTER.getValue(), ChargeItemStatus.PLANNED.getValue(),
ChargeItemStatus.BILLABLE.getValue(), ChargeItemStatus.BILLED.getValue(),
ChargeItemStatus.REFUNDING.getValue(), ChargeItemStatus.REFUNDED.getValue(),
ChargeItemStatus.PART_REFUND.getValue(), YbPayment.DISCOUNT_PAY.getValue(),
YbPayment.SELF_CASH_VALUE.getValue(), YbPayment.SELF_CASH_VX_VALUE.getValue(),
YbPayment.SELF_CASH_ALI_VALUE.getValue(), YbPayment.SELF_CASH_UNION_VALUE.getValue());
prescriptionDtoList.forEach(e -> {
// 应收金额
BigDecimal receivableAmount = e.getReceivableAmount();
// 实收金额
BigDecimal receivedAmount = e.getReceivedAmount();
// 计算折扣率
BigDecimal discountRate = BigDecimal.ONE;
if (receivableAmount.compareTo(BigDecimal.ZERO) > 0 && receivedAmount.compareTo(BigDecimal.ZERO) > 0
&& receivableAmount.compareTo(receivedAmount) > 0) {
discountRate = receivedAmount.divide(receivableAmount, 2, RoundingMode.HALF_UP);
}
e.setDiscountRate(this.returnDiscountRate(discountRate));
// 收费状态枚举
e.setStatusEnum_enumText(EnumUtils.getInfoByValue(ChargeItemStatus.class, e.getStatusEnum()));
});
return prescriptionDtoList;
}
/**
* 调整折扣率
*
* @param discountRate 折扣率
* @return 调整后的折扣率（0.05的倍数）
**/
private String returnDiscountRate(BigDecimal discountRate) {
BigDecimal compareValue = BigDecimal.valueOf(0.05);
BigDecimal remainder = discountRate.remainder(compareValue);
DecimalFormat df = new DecimalFormat();
df.setMinimumFractionDigits(0);
df.setMaximumFractionDigits(2);
// 比较余数，若为0则数据为0.05倍数，否则需要再次四舍五入
if (remainder.compareTo(BigDecimal.ZERO) == 0) {
return df.format(discountRate);
} else {
// 再次四舍五入
BigDecimal reActuarial = BigDecimal.ZERO;
if (remainder.compareTo(BigDecimal.valueOf(CommonConstants.UtilMethodConstant.THRESHOLD_VALUE)) > 0) {
reActuarial = discountRate.add(compareValue.subtract(remainder));
} else {
reActuarial = discountRate.subtract(remainder);
}
return df.format(reActuarial);
}
}
}

2
openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java
View File

@@ -68,7 +68,7 @@ public class OutpatientPricingAppServiceImpl implements IOutpatientPricingAppSer
public IPage<AdviceBaseDto> getAdviceBaseInfo(AdviceBaseDto adviceBaseDto, String searchKey, Long locationId,
Long organizationId, Integer pageNo, Integer pageSize) {
return iDoctorStationAdviceAppService.getAdviceBaseInfo(adviceBaseDto, searchKey, locationId, null,
organizationId, pageNo, pageSize, Whether.YES.getValue(), List.of(1, 2, 3), null);
organizationId, pageNo, pageSize, Whether.YES.getValue(), List.of(1, 2, 3));
}
}

292
openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java
View File

@@ -21,7 +21,6 @@ import com.core.common.utils.AgeCalculatorUtil;
import com.core.common.utils.AssignSeqUtil;
import com.core.common.utils.MessageUtils;
import com.core.common.utils.SecurityUtils;
import com.core.common.utils.bean.BeanUtils;
import com.openhis.administration.domain.ChargeItem;
import com.openhis.administration.service.IChargeItemService;
import com.openhis.common.constant.CommonConstants;
@@ -81,9 +80,8 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
public R<?> outpatientRefundInit() {
OutpatientInitDto initDto = new OutpatientInitDto();
List<OutpatientInitDto.chargeItemStatusOption> chargeItemStatusOptions = new ArrayList<>();
// 门诊退费页面去掉已收费状态筛选
// chargeItemStatusOptions.add(new OutpatientInitDto.chargeItemStatusOption(ChargeItemStatus.BILLED.getValue(),
// ChargeItemStatus.BILLED.getInfo()));
chargeItemStatusOptions.add(new OutpatientInitDto.chargeItemStatusOption(ChargeItemStatus.BILLED.getValue(),
ChargeItemStatus.BILLED.getInfo()));
chargeItemStatusOptions.add(new OutpatientInitDto.chargeItemStatusOption(ChargeItemStatus.REFUNDING.getValue(),
ChargeItemStatus.REFUNDING.getInfo()));
chargeItemStatusOptions.add(new OutpatientInitDto.chargeItemStatusOption(ChargeItemStatus.REFUNDED.getValue(),
@@ -124,6 +122,11 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
refundItemList.forEach(e -> {
// 退费状态
e.setRefundStatus_enumText(EnumUtils.getInfoByValue(ChargeItemStatus.class, e.getRefundStatus()));
// 发放状态
e.setDispenseStatus_enumText(EnumUtils.getInfoByValue(DispenseStatus.class, e.getDispenseStatus()));
// 执行状态
e.setServiceStatus_enumText(EnumUtils.getInfoByValue(RequestStatus.class, e.getServiceStatus()));
});
refundItemList.sort(Comparator.comparing(RefundItemDto::getPaymentId));
return R.ok(refundItemList);
@@ -137,6 +140,7 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
*/
@Override
public R<?> refundPayment(List<RefundItemParam> refundItemList) {
// 未退费用项,生成新的请求发放费用项
List<RefundItemParam> creatList = new ArrayList<>();
for (RefundItemParam param : refundItemList) {
@@ -145,7 +149,7 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
creatList.add(param);
}
}
// todo 半退逻辑需修改
if (!creatList.isEmpty()) {
// 未退费费用项id集合
List<Long> creatChargeItemIdList =
@@ -241,232 +245,108 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
// 退费费用项id集合
List<Long> chargeItemIdList =
refundItemList.stream().map(RefundItemParam::getChargeItemId).collect(Collectors.toList());
// 服务请求id集合
List<Long> medReqIdList = new ArrayList<>();
List<Long> devReqIdList = new ArrayList<>();
List<Long> serReqIdList = new ArrayList<>();
// 查询退费项目信息
List<ChargeItem> chargeItemList = chargeItemService.listByIds(chargeItemIdList);
if (chargeItemList != null && !chargeItemList.isEmpty()) {
chargeItemList.forEach(item -> {
switch (item.getServiceTable()) {
case CommonConstants.TableName.MED_MEDICATION_REQUEST -> medReqIdList.add(item.getServiceId());
case CommonConstants.TableName.WOR_DEVICE_REQUEST -> devReqIdList.add(item.getServiceId());
case CommonConstants.TableName.WOR_SERVICE_REQUEST -> serReqIdList.add(item.getServiceId());
}
});
}
// 处理退药申请
if (!medReqIdList.isEmpty()) {
// 药品请求查询
List<MedicationRequest> medicationRequests = medicationRequestService.listByIds(medReqIdList);
// 药品发放查询
List<MedicationDispense> medicationDispenses =
medicationDispenseService.selectByRequestIdList(medReqIdList);
// 根据请求id做map
Map<Long, List<MedicationDispense>> medicationDispenseMap =
medicationDispenses.stream().collect(Collectors.groupingBy(MedicationDispense::getMedReqId));
for (MedicationRequest medicationRequest : medicationRequests) {
// 根据请求匹配发放
List<MedicationDispense> medicationDispenseList = medicationDispenseMap.get(medicationRequest.getId());
// 判断是否是退药流程
boolean isRefundFlow = false;
if (medicationDispenseList != null) {
for (MedicationDispense dispense : medicationDispenseList) {
// 先判断是否包含“已完成/部分完成”的药品，这决定了是走“退药流程”还是“取消流程”
if (DispenseStatus.COMPLETED.getValue().equals(dispense.getStatusEnum())
|| DispenseStatus.PART_COMPLETED.getValue().equals(dispense.getStatusEnum())) {
isRefundFlow = true;
break; // 只要有一条是完成状态，整个单子即视为走退药流程
}
}
}
if (isRefundFlow) {
// ==================== 走退药流程 (生成新单据) ====================
// 校验是否重复申请
// 根据费用项id查询费用项请求发放信息
List<RefundItemDto> chargeItemList = outpatientRefundAppMapper.selectRefundItem(chargeItemIdList,
CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_SERVICE_REQUEST,
CommonConstants.TableName.WOR_DEVICE_REQUEST, CommonConstants.Common.THREE);
List<Long> medDisIdList = new ArrayList<>();
List<Long> devDisIdList = new ArrayList<>();
List<Long> serReqIdList = new ArrayList<>();
for (RefundItemDto dto : chargeItemList) {
if (CommonConstants.TableName.MED_MEDICATION_REQUEST.equals(dto.getServiceTable())) {
// 药品需要先退药
if (DispenseStatus.COMPLETED.getValue().equals(dto.getDispenseStatus())
|| DispenseStatus.PART_COMPLETED.getValue().equals(dto.getDispenseStatus())) {
// 药品请求查询
MedicationRequest medicationRequest = medicationRequestService.getById(dto.getRequestId());
if (medicationRequest.getRefundMedicineId() != null) {
throw new ServiceException("已申请退药，请勿重复申请");
}
MedicationRequest newRefundRequest = new MedicationRequest();
BeanUtils.copyProperties(medicationRequest, newRefundRequest);
newRefundRequest.setId(null); // 清空ID以新增
newRefundRequest
.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 4));
newRefundRequest.setQuantity(medicationRequest.getQuantity().multiply(new BigDecimal("-1"))); // 数量取反
newRefundRequest.setStatusEnum(RequestStatus.CANCELLED.getValue());
newRefundRequest.setRefundMedicineId(medicationRequest.getId()); // 关联原ID
newRefundRequest.setPrescriptionNo("T" + medicationRequest.getPrescriptionNo());
medicationRequestService.save(newRefundRequest);
Long newRequestId = newRefundRequest.getId();
// 生成药品请求(退药)
medicationRequest.setId(null); // 药品请求id
medicationRequest
.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 4)); // 药品请求编码
medicationRequest.setQuantity(dto.getQuantity().multiply(new BigDecimal("-1"))); // 请求数量
medicationRequest.setUnitCode(dto.getUnitCode()); // 请求单位编码
medicationRequest.setStatusEnum(RequestStatus.CANCELLED.getValue()); // 请求状态
medicationRequest.setRefundMedicineId(dto.getRequestId()); // 退药id
medicationRequest.setPrescriptionNo(String.valueOf("T" + dto.getPrescriptionNo()));
medicationRequestService.save(medicationRequest);
// 再生成对应的负向发药记录，并关联退药请求
List<MedicationDispense> newDispensesToSave = new ArrayList<>();
for (MedicationDispense originDispense : medicationDispenseList) {
// 只处理已完成或部分完成的记录
if (DispenseStatus.COMPLETED.getValue().equals(originDispense.getStatusEnum())
|| DispenseStatus.PART_COMPLETED.getValue().equals(originDispense.getStatusEnum())) {
MedicationDispense refundDispense = new MedicationDispense();
BeanUtils.copyProperties(originDispense, refundDispense);
refundDispense.setId(null); // ID置空
refundDispense.setDispenseQuantity(BigDecimal.ZERO); // 已退数量
refundDispense.setMedReqId(newRequestId); // 关联退药请求id
refundDispense
.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_DIS_NO.getPrefix(), 4));
// 退药状态
refundDispense.setStatusEnum(DispenseStatus.PENDING_REFUND.getValue());
newDispensesToSave.add(refundDispense);
}
}
// 批量保存新的发药记录
if (!newDispensesToSave.isEmpty()) {
medicationDispenseService.saveBatch(newDispensesToSave);
}
} else {
// ==================== 走直接取消流程 (修改原单据状态) ====================
if (medicationDispenseList != null) {
List<MedicationDispense> dispensesToUpdate = new ArrayList<>();
for (MedicationDispense medicationDispense : medicationDispenseList) {
// 检查是否已经是退药状态
if (DispenseStatus.STOPPED.getValue().equals(medicationDispense.getStatusEnum())
&& NotPerformedReason.REFUND.getValue().equals(medicationDispense.getStatusEnum())) {
throw new ServiceException("已申请退药，请勿重复申请");
}
// 修改状态
medicationDispense.setStatusEnum(DispenseStatus.STOPPED.getValue())
.setNotPerformedReasonEnum(NotPerformedReason.REFUND.getValue());
dispensesToUpdate.add(medicationDispense);
}
// 批量更新
if (!dispensesToUpdate.isEmpty()) {
medicationDispenseService.updateBatchById(dispensesToUpdate);
}
}
}
}
}
// 处理退耗材申请
if (!devReqIdList.isEmpty()) {
// 耗材请求查询
List<DeviceRequest> deviceRequests = deviceRequestService.listByIds(devReqIdList);
// 耗材发放查询
List<DeviceDispense> deviceDispenses = deviceDispenseService.selectByRequestIdList(devReqIdList);
// 根据请求id做map
Map<Long, List<DeviceDispense>> deviceDispenseMap =
deviceDispenses.stream().collect(Collectors.groupingBy(DeviceDispense::getDeviceReqId));
for (DeviceRequest deviceRequest : deviceRequests) {
// 根据请求匹配发放
List<DeviceDispense> deviceDispenseList = deviceDispenseMap.get(deviceRequest.getId());
// 判断是否是退耗材流程
boolean isRefundFlow = false;
if (deviceDispenseList != null) {
for (DeviceDispense dispense : deviceDispenseList) {
// 先判断是否包含“已完成/部分完成”的耗材，这决定了是走“退耗材流程”还是“取消流程”
if (DispenseStatus.COMPLETED.getValue().equals(dispense.getStatusEnum())
|| DispenseStatus.PART_COMPLETED.getValue().equals(dispense.getStatusEnum())) {
isRefundFlow = true;
break; // 只要有一条是完成状态，整个单子即视为走退耗材流程
}
if (DispenseStatus.STOPPED.getValue().equals(dto.getDispenseStatus())
&& NotPerformedReason.REFUND.getValue().equals(dto.getNotPerformedReason())) {
throw new ServiceException("已申请退药，请勿重复申请");
}
medDisIdList.add(dto.getDispenseId());
}
if (isRefundFlow) {
// ==================== 走退耗材流程 (生成新单据) ====================
// 校验是否重复申请
if (deviceRequest.getRefundDeviceId() != null) {
throw new ServiceException("已申请退耗材，请勿重复申请");
}
DeviceRequest newRefundRequest = new DeviceRequest();
BeanUtils.copyProperties(deviceRequest, newRefundRequest);
newRefundRequest.setId(null); // 清空ID以新增
newRefundRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 4));
newRefundRequest.setQuantity(deviceRequest.getQuantity().multiply(new BigDecimal("-1"))); // 数量取反
newRefundRequest.setStatusEnum(RequestStatus.CANCELLED.getValue());
newRefundRequest.setRefundDeviceId(deviceRequest.getId()); // 关联原ID
newRefundRequest.setPrescriptionNo("T" + deviceRequest.getPrescriptionNo());
deviceRequestService.save(newRefundRequest);
Long newRequestId = newRefundRequest.getId();
// 再生成对应的负向发耗材记录，并关联退耗材请求
List<DeviceDispense> newDispensesToSave = new ArrayList<>();
for (DeviceDispense originDispense : deviceDispenseList) {
// 只处理已完成或部分完成的记录
if (DispenseStatus.COMPLETED.getValue().equals(originDispense.getStatusEnum())
|| DispenseStatus.PART_COMPLETED.getValue().equals(originDispense.getStatusEnum())) {
DeviceDispense refundDispense = new DeviceDispense();
BeanUtils.copyProperties(originDispense, refundDispense);
refundDispense.setId(null); // ID置空
refundDispense.setDispenseQuantity(BigDecimal.ZERO); // 已退数量
refundDispense.setDeviceReqId(newRequestId); // 关联退耗材请求id
refundDispense
.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_DIS_NO.getPrefix(), 4));
// 退耗材状态
refundDispense.setStatusEnum(DispenseStatus.PENDING_REFUND.getValue());
newDispensesToSave.add(refundDispense);
}
}
// 批量保存新的发耗材记录
if (!newDispensesToSave.isEmpty()) {
deviceDispenseService.saveBatch(newDispensesToSave);
}
} else {
// ==================== 走直接取消流程 (修改原单据状态) ====================
if (deviceDispenseList != null) {
List<DeviceDispense> dispensesToUpdate = new ArrayList<>();
for (DeviceDispense deviceDispense : deviceDispenseList) {
// 检查是否已经是退耗材状态
if (DispenseStatus.STOPPED.getValue().equals(deviceDispense.getStatusEnum())
&& NotPerformedReason.REFUND.getValue().equals(deviceDispense.getStatusEnum())) {
throw new ServiceException("已申请退耗材，请勿重复申请");
}
// 修改状态
deviceDispense.setStatusEnum(DispenseStatus.STOPPED.getValue())
.setNotPerformedReasonEnum(NotPerformedReason.REFUND.getValue());
dispensesToUpdate.add(deviceDispense);
}
// 批量更新
if (!dispensesToUpdate.isEmpty()) {
deviceDispenseService.updateBatchById(dispensesToUpdate);
}
}
}
}
}
// 处理退诊疗项目申请
// 诊疗申请待更新id列表
List<Long> serReqUpdateList = new ArrayList<>();
if (!serReqIdList.isEmpty()) {
// 查询诊疗申请
List<ServiceRequest> serviceRequestList = serviceRequestService.listByIds(serReqIdList);
for (ServiceRequest serviceRequest : serviceRequestList) {
} else if (CommonConstants.TableName.WOR_SERVICE_REQUEST.equals(dto.getServiceTable())) {
// 诊疗项目需医技科室同意退费
if (RequestStatus.COMPLETED.getValue().equals(serviceRequest.getStatusEnum())) {
if (RequestStatus.COMPLETED.getValue().equals(dto.getServiceStatus())) {
// 服务请求查询
ServiceRequest serviceRequest = serviceRequestService.getById(dto.getRequestId());
if (serviceRequest.getRefundServiceId() != null) {
throw new ServiceException("已申请退费，请勿重复申请");
}
// 生成服务请求(取消服务)
serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4)); // 服务请求编码
serviceRequest.setQuantity(serviceRequest.getQuantity().multiply(new BigDecimal("-1"))); // 请求数量
serviceRequest.setStatusEnum(RequestStatus.CANCELLED.getValue()); // 请求状态
serviceRequest.setRefundServiceId(serviceRequest.getId());// 退id
serviceRequest.setId(null); // 服务请求id
serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4)); // 服务请求编码
serviceRequest.setQuantity(dto.getQuantity().multiply(new BigDecimal("-1"))); // 请求数量
serviceRequest.setUnitCode(dto.getUnitCode()); // 请求单位编码
serviceRequest.setStatusEnum(RequestStatus.CANCELLED.getValue()); // 请求状态
serviceRequest.setRefundServiceId(dto.getRequestId()); // 退药id
serviceRequestService.save(serviceRequest);
} else {
if (RequestStatus.STOPPED.getValue().equals(serviceRequest.getStatusEnum())) {
if (RequestStatus.STOPPED.getValue().equals(dto.getServiceStatus())) {
throw new ServiceException("已申请退费，请勿重复申请");
}
serReqUpdateList.add(serviceRequest.getId());
serReqIdList.add(dto.getServiceId());
}
} else if (CommonConstants.TableName.WOR_DEVICE_REQUEST.equals(dto.getServiceTable())) {
// 耗材需要先退药
if (DispenseStatus.COMPLETED.getValue().equals(dto.getDispenseStatus())
|| DispenseStatus.PART_COMPLETED.getValue().equals(dto.getDispenseStatus())) {
// 耗材请求查询
DeviceRequest deviceRequest = deviceRequestService.getById(dto.getRequestId());
if (deviceRequest.getRefundDeviceId() == null) {
// 生成耗材请求(退耗材)
deviceRequest.setId(null); // 耗材请求id
deviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 4)); // 耗材请求编码
deviceRequest.setQuantity(dto.getQuantity().multiply(new BigDecimal("-1"))); // 请求数量
deviceRequest.setUnitCode(dto.getUnitCode()); // 请求单位编码
deviceRequest.setStatusEnum(RequestStatus.CANCELLED.getValue()); // 请求状态
deviceRequest.setRefundDeviceId(dto.getRequestId()); // 退药id
deviceRequestService.save(deviceRequest);
}
} else if (!DispenseStatus.STOPPED.getValue().equals(dto.getDispenseStatus())) {
devDisIdList.add(dto.getDispenseId());
}
}
}
// 更新收费状态：退费中
chargeItemService.updateRefundChargeStatus(chargeItemIdList);
// 更新未执行诊疗状态：停止
if (!serReqUpdateList.isEmpty()) {
serviceRequestService.updateStopRequestStatus(serReqUpdateList);
if (!medDisIdList.isEmpty()) {
// 更新未发放药品状态：停止发放，停止原因：退费
medicationDispenseService.updateStopDispenseStatus(medDisIdList, NotPerformedReason.REFUND.getValue());
}
if (!devDisIdList.isEmpty()) {
// 更新未发放耗材状态：停止发放，停止原因：退费
deviceDispenseService.updateStopDispenseStatus(devDisIdList, NotPerformedReason.REFUND.getValue());
}
if (!serReqIdList.isEmpty()) {
// 更新未执行诊疗状态：停止
serviceRequestService.updateStopRequestStatus(serReqIdList);
}
// 返回退费成功信息
return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"门诊退费"}));
}

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java
View File

@@ -9,7 +9,6 @@ import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import com.core.common.core.domain.model.LoginUser;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -212,8 +211,7 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
CancelPaymentDto cancelPaymentDto = new CancelPaymentDto();
BeanUtils.copyProperties(cancelRegPaymentDto, cancelPaymentDto);
//LoginUser loginUser = SecurityUtils.getLoginUser();
//String string1 = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH);
// 开通医保的处理
if ("1".equals(SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH))
&& account != null && !CommonConstants.BusinessName.DEFAULT_CONTRACT_NO.equals(account.getContractNo())) {

29
openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/InpatientChargeController.java
View File

@@ -3,9 +3,9 @@
*/
package com.openhis.web.chargemanage.controller;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.core.common.core.domain.R;
@@ -16,18 +16,18 @@ import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
/**
* 住院收费 controller
* 门诊收费 controller
*
* @author zwh
* @date 2025-03-12
*/
@RestController
@RequestMapping("/charge-manage/inpatient-charge")
@RequestMapping("/charge-manage/inpa-charge")
@Slf4j
@AllArgsConstructor
public class InpatientChargeController {
@Resource
@Autowired
private IInpatientChargeAppService inpatientChargeAppService;
/**
@@ -36,38 +36,39 @@ public class InpatientChargeController {
* @return 初始化信息
*/
@GetMapping(value = "/init")
public R<?> inpatientChargeInit() {
return inpatientChargeAppService.inpatientChargeInit();
public R<?> outpatientChargeInit() {
return inpatientChargeAppService.outpatientChargeInit();
}
/**
* 查询住院患者分页列表
* 查询就诊患者分页列表
*
* @param encounterPatientPageParam 查询条件
* @param searchKey 模糊查询关键字
* @param pageNo 当前页
* @param pageSize 每页多少条
* @param request 请求
* @return 住院患者分页列表
* @return 就诊患者分页列表
*/
@GetMapping(value = "/encounter-patient-page")
public R<?> getEncounterPatientPage(EncounterPatientPageParam encounterPatientPageParam,
@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
return inpatientChargeAppService.getEncounterPatientPage(encounterPatientPageParam, searchKey, pageNo, pageSize,
request);
return R.ok(inpatientChargeAppService.getEncounterPatientPage(encounterPatientPageParam, searchKey, pageNo,
pageSize, request));
}
/**
* 根据就诊id查询患者待结算信息
* 根据就诊id查询患者处方列表
*
* @param encounterId 就诊id
* @return 患者待结算信息
* @return 患者处方列表
*/
@GetMapping(value = "/patient-prescription")
public R<?> getEncounterPatientPrescription(Long encounterId) {
return R.ok(inpatientChargeAppService.getEncounterPatientPrescription(encounterId));
public R<?> getEncounterPatientPrescription(@RequestParam Long encounterId, @RequestParam String startTime,
@RequestParam String endTime) {
return R.ok(inpatientChargeAppService.getEncounterPatientPrescription(encounterId, startTime, endTime));
}
/**

12
openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientChargeController.java
View File

@@ -6,6 +6,7 @@ package com.openhis.web.chargemanage.controller;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.core.common.core.domain.R;
@@ -70,17 +71,6 @@ public class OutpatientChargeController {
return R.ok(outpatientChargeAppService.getEncounterPatientPrescription(encounterId));
}
/**
* 根据就诊id查询患者处方列表并新增字段：实收金额、应收金额、优惠金额、折扣率
*
* @param encounterId 就诊id
* @return 患者处方列表
*/
@GetMapping(value = "/patient-prescription-with-price")
public R<?> getEncounterPatientPrescriptionWithPrice(@RequestParam Long encounterId) {
return R.ok(outpatientChargeAppService.getEncounterPatientPrescriptionWithPrice(encounterId));
}
/**
* 医保转自费
*

5
openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java
View File

@@ -11,6 +11,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.common.annotation.Dict;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -31,10 +32,6 @@ public class EncounterPatientPageDto {
@JsonSerialize(using = ToStringSerializer.class)
private Long encounterId;
/** 住院状态 */
private Integer encounterStatus;
private String encounterStatus_enumText;
/**
* 患者
*/

5
openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java
View File

@@ -67,9 +67,4 @@ public class EncounterPatientPageParam {
* 收费状态
*/
private Integer statusEnum;
/**
* 患者状态
*/
private Integer encounterStatus;
}

24
openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java
View File

@@ -51,9 +51,7 @@ public class EncounterPatientPrescriptionDto {
private Long quantityValue;
/** 单位 */
@Dict(dictCode = "unit_code")
private String quantityUnit;
private String quantityUnit_dictText;
/** 单价 */
private BigDecimal unitPrice;
@@ -94,23 +92,17 @@ public class EncounterPatientPrescriptionDto {
@Dict(dictCode = "med_type")
private String medTypeCode;
private String medTypeCode_dictText;
/** 用法 */
@Dict(dictCode = "method_code")
private String methodCode;
private String methodCode_dictText;
/** 剂量 */
private String dose;
/** 剂量单位 */
@Dict(dictCode = "unit_code")
private String doseUnitCode;
/** 单次剂量单位 */
private String doseUnitCode_dictText;
/** 频次 */
private String rateCode;
/** 合同编码 */
private String contractNo;
@@ -131,18 +123,4 @@ public class EncounterPatientPrescriptionDto {
@JsonSerialize(using = ToStringSerializer.class)
private Long paymentId;
/** 实收金额 */
private BigDecimal receivedAmount = BigDecimal.ZERO;
/** 优惠金额 */
private BigDecimal discountAmount = BigDecimal.ZERO;
/** 应收金额 */
private BigDecimal receivableAmount = BigDecimal.ZERO;
/** 折扣率 */
@Dict(dictCode = "charge_discount")
private String discountRate = "0";
private String discountRate_dictText;
}

16
openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientInitDto.java
View File

@@ -20,8 +20,6 @@ public class OutpatientInitDto {
private List<OutpatientInitDto.chargeItemStatusOption> chargeItemStatusOptions;
private List<OutpatientInitDto.encounterStatusOption> encounterStatusOptions;
/**
* 收费状态
*/
@@ -35,18 +33,4 @@ public class OutpatientInitDto {
this.label = label;
}
}
/**
* 住院状态
*/
@Data
public static class encounterStatusOption {
private Integer value;
private String label;
public encounterStatusOption(Integer value, String label) {
this.value = value;
this.label = label;
}
}
}

3
openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PractitionerMetadata.java
View File

@@ -33,7 +33,4 @@ public class PractitionerMetadata {
/** 五笔码 */
private String wbStr;
/** 医生职称 */
private String drProfttlCode;
}

5
openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java
View File

@@ -3,15 +3,14 @@
*/
package com.openhis.web.chargemanage.dto;
import java.math.BigDecimal;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.common.annotation.Dict;
import lombok.Data;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* 退款项目 dto
*

11
openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/InpatientChargeAppMapper.java
View File

@@ -3,6 +3,7 @@
*/
package com.openhis.web.chargemanage.mapper;
import java.util.Date;
import java.util.List;
import org.apache.ibatis.annotations.Param;
@@ -27,18 +28,12 @@ public interface InpatientChargeAppMapper {
/**
* 查询就诊患者分页列表
*
* @param classEnum 住院患者类型：住院
* @param dischargedFromHospital 住院状态：已出院
* @param alreadySettled 住院状态：已结算出院
* @param page 分页
* @param queryWrapper 查询条件
* @return 就诊患者分页列表
*/
Page<EncounterPatientPageDto> selectEncounterPatientPage(@Param("classEnum") Integer classEnum,
@Param("dischargedFromHospital") Integer dischargedFromHospital,
@Param("alreadySettled") Integer alreadySettled, @Param("billable") Integer billable,
@Param("billed") Integer billed, @Param("refunded") Integer refunded,
@Param("personalCashAccount") String personalCashAccount, @Param("page") Page<EncounterPatientPageDto> page,
@Param("page") Page<EncounterPatientPageDto> page,
@Param(Constants.WRAPPER) QueryWrapper<EncounterPatientPageParam> queryWrapper);
/**
@@ -61,5 +56,5 @@ public interface InpatientChargeAppMapper {
@Param("activity") Integer activity, @Param("medication") Integer medication, @Param("device") Integer device,
@Param("register") Integer register, @Param("planned") Integer planned, @Param("billable") Integer billable,
@Param("billed") Integer billed, @Param("refunding") Integer refunding, @Param("refunded") Integer refunded,
@Param("partRefund") Integer partRefund);
@Param("partRefund") Integer partRefund, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
}

29
openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientChargeAppMapper.java
View File

@@ -57,33 +57,4 @@ public interface OutpatientChargeAppMapper {
@Param("billed") Integer billed, @Param("refunding") Integer refunding, @Param("refunded") Integer refunded,
@Param("partRefund") Integer partRefund);
/**
* 根据就诊id查询患者处方列表并新增字段：应收金额，实收金额，优惠金额，折扣率
*
* @param encounterId 就诊id
* @param activity 项目
* @param medication 药品
* @param device 耗材
* @param register 挂号费
* @param planned 收费状态：待收费
* @param billable 收费状态：待结算
* @param billed 收费状态：已结算
* @param refunding 收费状态：退费中
* @param refunded 收费状态：全部退费
* @param partRefund 收费状态：部分退费
* @param discountCode 优惠枚举码
* @param selfCode 现金枚举码
* @param selfVxCode 微信枚举码
* @param selfAliCode 支付宝枚举码
* @param selfUnionCode 银联枚举码
* @return 患者处方列表
*/
List<EncounterPatientPrescriptionDto> selectEncounterPatientPrescriptionWithPrice(
@Param("encounterId") Long encounterId, @Param("activity") Integer activity,
@Param("medication") Integer medication, @Param("device") Integer device, @Param("register") Integer register,
@Param("planned") Integer planned, @Param("billable") Integer billable, @Param("billed") Integer billed,
@Param("refunding") Integer refunding, @Param("refunded") Integer refunded,
@Param("partRefund") Integer partRefund, @Param("discountCode") Integer discountCode,
@Param("self") Integer selfCode, @Param("selfVx") Integer selfVxCode, @Param("selfAli") Integer selfAliCode,
@Param("selfUnion") Integer selfUnionCode);
}

15
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/ICommonService.java
View File

@@ -188,19 +188,4 @@ public interface ICommonService {
* @return 诊疗项目
*/
R<?> getActivityDefinition();
/**
* 查询备份单号
*
* @return 备份单号列表
*/
R<?> getBackupNoList();
/**
* 批号匹配
*
* @param encounterIdList 就诊id列表
* @return 处理结果
*/
R<?> lotNumberMatch(List<Long> encounterIdList);
}

290
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/impl/CommonServiceImpl.java
View File

@@ -3,8 +3,6 @@
*/
package com.openhis.web.common.appservice.impl;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
@@ -17,9 +15,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.enums.DelFlag;
import com.core.common.utils.AgeCalculatorUtil;
import com.core.common.utils.AssignSeqUtil;
import com.core.common.utils.SecurityUtils;
import com.core.common.utils.StringUtils;
import com.core.common.utils.bean.BeanUtils;
@@ -36,20 +32,13 @@ import com.openhis.common.constant.CommonConstants;
import com.openhis.common.enums.*;
import com.openhis.common.utils.EnumUtils;
import com.openhis.common.utils.HisQueryUtils;
import com.openhis.document.domain.DocInventoryItemStatic;
import com.openhis.document.service.IDocInventoryItemStaticService;
import com.openhis.financial.domain.Contract;
import com.openhis.financial.mapper.ContractMapper;
import com.openhis.medication.domain.MedicationDispense;
import com.openhis.medication.service.IMedicationDispenseService;
import com.openhis.web.chargemanage.dto.ContractMetadata;
import com.openhis.web.common.appservice.ICommonService;
import com.openhis.web.common.dto.*;
import com.openhis.web.common.mapper.CommonAppMapper;
import com.openhis.web.pharmacymanage.dto.InventoryDetailDto;
import com.openhis.workflow.domain.DeviceDispense;
import com.openhis.workflow.domain.InventoryItem;
import com.openhis.workflow.service.IDeviceDispenseService;
import com.openhis.workflow.service.IInventoryItemService;
/**
@@ -61,9 +50,6 @@ import com.openhis.workflow.service.IInventoryItemService;
@Service
public class CommonServiceImpl implements ICommonService {
@Resource
private AssignSeqUtil assignSeqUtil;
@Resource
private TraceNoManageMapper traceNoManageMapper;
@@ -88,15 +74,6 @@ public class CommonServiceImpl implements ICommonService {
@Resource
private ISupplierService supplierService;
@Resource
private IDocInventoryItemStaticService iDocInventoryItemStaticService;
@Resource
private IMedicationDispenseService medicationDispenseService;
@Resource
private IDeviceDispenseService deviceDispenseService;
/**
* 获取药房列表
*
@@ -463,8 +440,7 @@ public class CommonServiceImpl implements ICommonService {
// 查询当前登录者管理的病区
Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
List<Long> locationIds = practitionerRoleService.getLocationIdsByPractitionerId(practitionerId);
List<Location> locationList =
locationService.getLocationList(locationIds, Collections.singletonList(LocationStatus.ACTIVE.getValue()));
List<Location> locationList = locationService.getLocationList(locationIds);
List<Location> wardList = new ArrayList<>();
for (Location ward : locationList) {
if (LocationForm.WARD.getValue().equals(ward.getFormEnum())) {
@@ -516,10 +492,6 @@ public class CommonServiceImpl implements ICommonService {
EnumUtils.getInfoByValue(AdministrativeGender.class, advicePrintInfoDto.getGenderEnum()))
.setEncounterYbClass_enumText(
EnumUtils.getInfoByValue(EncounterYbClass.class, advicePrintInfoDto.getEncounterYbClass()));
if (advicePrintInfoDto.getChrgitmLv() != null) {
advicePrintInfoDto
.setChrgitmLv_enumText(EnumUtils.getInfoByValue(InsuranceLevel.class, advicePrintInfoDto.getChrgitmLv()));
}
return R.ok(advicePrintInfoDto);
}
@@ -556,264 +528,4 @@ public class CommonServiceImpl implements ICommonService {
return R.ok(commonAppMapper.getActivityDefinition(PublicationStatus.ACTIVE.getValue()));
}
/**
* 查询备份单号
*
* @return 备份单号列表
*/
@Override
public R<?> getBackupNoList() {
List<DocInventoryItemStatic> docInventoryItemStaticList =
iDocInventoryItemStaticService.list(new LambdaQueryWrapper<DocInventoryItemStatic>()
.eq(DocInventoryItemStatic::getDeleteFlag, DelFlag.NO.getCode())
.eq(DocInventoryItemStatic::getTenantId, SecurityUtils.getLoginUser().getTenantId()));
if (docInventoryItemStaticList.isEmpty()) {
return null;
}
// 直接去重并按BusNo倒序排序
List<String> busNoList = docInventoryItemStaticList.stream().map(DocInventoryItemStatic::getBusNo).distinct() // 去重
.sorted(Comparator.reverseOrder()).collect(Collectors.toList());
return R.ok(busNoList);
}
/**
* 批号匹配
*
* @param encounterIdList 就诊id列表
* @return 处理结果
*/
@Override
public R<?> lotNumberMatch(List<Long> encounterIdList) {
// 查询患者待发放的药品信息
List<MedicationDispense> medicationDispenseList = medicationDispenseService
.list(new LambdaQueryWrapper<MedicationDispense>().in(MedicationDispense::getEncounterId, encounterIdList)
.eq(MedicationDispense::getStatusEnum, DispenseStatus.PREPARATION.getValue())
.eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()));
// 药品批号匹配
if (medicationDispenseList != null && !medicationDispenseList.isEmpty()) {
// 获取待发放的药品id
List<Long> medicationIdList =
medicationDispenseList.stream().map(MedicationDispense::getMedicationId).distinct().toList();
// 获取发药药房
List<Long> locationIdList =
medicationDispenseList.stream().map(MedicationDispense::getLocationId).distinct().toList();
// 查询待发放药品的库存明细
List<InventoryDetailDto> inventoryDetailList = commonAppMapper
.selectMedicineInventoryDetail(medicationIdList, locationIdList, PublicationStatus.ACTIVE.getValue());
if (inventoryDetailList == null || inventoryDetailList.isEmpty()) {
return R.fail("发药单生成失败，请检查药品库存");
}
// 将库存信息根据药品id和库房id进行分组
Map<String, List<InventoryDetailDto>> inventoryDetailMap = inventoryDetailList.stream()
.collect(Collectors.groupingBy(x -> x.getItemId() + CommonConstants.Common.DASH + x.getLocationId()));
// 按照效期排序（先进先出）
for (List<InventoryDetailDto> inventoryList : inventoryDetailMap.values()) {
inventoryList.sort(Comparator.comparing(InventoryDetailDto::getExpirationDate));
}
// 使用索引循环，以便处理后续添加的拆分单
int currentIndex = 0;
while (currentIndex < medicationDispenseList.size()) {
MedicationDispense medicationDispense = medicationDispenseList.get(currentIndex);
currentIndex++;
// 根据发放药品和发放药房做key
String inventoryKey = medicationDispense.getMedicationId() + CommonConstants.Common.DASH
+ medicationDispense.getLocationId();
// 查询对应的库存信息
if (!inventoryDetailMap.containsKey(inventoryKey)) {
return R.fail("药品库存不存在，药品ID: " + medicationDispense.getMedicationId());
}
List<InventoryDetailDto> inventoryList = inventoryDetailMap.get(inventoryKey);
// 获取发药数量
BigDecimal dispenseQuantity = medicationDispense.getQuantity();
// 循环库存信息
for (InventoryDetailDto inventoryDetailDto : inventoryList) {
// 发药数量不能小于等于0
if (dispenseQuantity.compareTo(BigDecimal.ZERO) <= 0) {
break;
}
// 库存剩余数量不能小于等于0
if (inventoryDetailDto.getInventoryQuantity().compareTo(BigDecimal.ZERO) <= 0) {
continue;
}
// 发药数量单位转换
if (!inventoryDetailDto.getInventoryUnitCode().equals(medicationDispense.getUnitCode())) {
dispenseQuantity = dispenseQuantity.multiply(inventoryDetailDto.getPartPercent());
}
// 获取库存剩余数量
BigDecimal remainingInventoryQuantity =
inventoryDetailDto.getInventoryQuantity().subtract(dispenseQuantity);
// 如果剩余库存数量大于等于0，则说明当前批号库存充足
if (remainingInventoryQuantity.compareTo(BigDecimal.ZERO) >= 0) {
medicationDispense.setLotNumber(inventoryDetailDto.getInventoryLotNumber());
// 将该批号的库存数量重置为剩余数量
inventoryDetailDto.setInventoryQuantity(remainingInventoryQuantity);
} else {
// 发药数量单位转换
if (!inventoryDetailDto.getInventoryUnitCode().equals(medicationDispense.getUnitCode())) {
// 发药数量取库存大单位数量
dispenseQuantity = inventoryDetailDto.getInventoryQuantity()
.divide(inventoryDetailDto.getPartPercent(), 0, RoundingMode.HALF_UP);
// 大单位数量不足则跳出循环
if (dispenseQuantity.compareTo(BigDecimal.ZERO) == 0) {
continue;
}
} else {
// 发药数量取该批号剩余数量
dispenseQuantity = inventoryDetailDto.getInventoryQuantity();
}
// 如果剩余数量不足则进行拆分
MedicationDispense splitMedicationDispense = new MedicationDispense();
BeanUtils.copyProperties(medicationDispense, splitMedicationDispense);
// 数量拆分
splitMedicationDispense.setQuantity(medicationDispense.getQuantity().subtract(dispenseQuantity))
// 重置id与批号
.setId(null).setLotNumber(null)
// 重新生成发药单编码
.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_DIS_NO.getPrefix(), 4));
// 将拆分出来的发药单添加到原发药单列表中
medicationDispenseList.add(splitMedicationDispense);
// 更新原发药单
medicationDispense.setLotNumber(inventoryDetailDto.getInventoryLotNumber());
medicationDispense.setQuantity(dispenseQuantity);
// 将该批号的库存数量重置为0
inventoryDetailDto.setInventoryQuantity(BigDecimal.ZERO);
}
break;
}
}
// 校验药品库存
for (MedicationDispense medicationDispense : medicationDispenseList) {
if (medicationDispense.getLotNumber() == null) {
return R.fail("药品:" + medicationDispense.getMedicationId() + "库存不足，请检查药品库存");
}
}
// 新增或更新发药单
boolean result = medicationDispenseService.saveOrUpdateBatch(medicationDispenseList);
if (!result) {
return R.fail("发药单生成失败，请联系管理员");
}
}
// 查询患者待发放的耗材信息
List<DeviceDispense> deviceDispenseList = deviceDispenseService
.list(new LambdaQueryWrapper<DeviceDispense>().in(DeviceDispense::getEncounterId, encounterIdList)
.eq(DeviceDispense::getStatusEnum, DispenseStatus.PREPARATION.getValue())
.eq(DeviceDispense::getDeleteFlag, DelFlag.NO.getCode()));
// 耗材批号匹配
if (deviceDispenseList != null && !deviceDispenseList.isEmpty()) {
// 获取待发放的耗材id
List<Long> deviceIdList =
deviceDispenseList.stream().map(DeviceDispense::getDeviceDefId).distinct().toList();
// 获取发耗材房
List<Long> locationIdList =
deviceDispenseList.stream().map(DeviceDispense::getLocationId).distinct().toList();
// 查询待发放耗材的库存明细
List<InventoryDetailDto> inventoryDetailList = commonAppMapper.selectDeviceInventoryDetail(deviceIdList,
locationIdList, PublicationStatus.ACTIVE.getValue());
if (inventoryDetailList == null || inventoryDetailList.isEmpty()) {
return R.fail("发耗材单生成失败，请检查耗材库存");
}
// 将库存信息根据耗材id和库房id进行分组
Map<String, List<InventoryDetailDto>> inventoryDetailMap = inventoryDetailList.stream()
.collect(Collectors.groupingBy(x -> x.getItemId() + CommonConstants.Common.DASH + x.getLocationId()));
// 按照效期排序（先进先出）
for (List<InventoryDetailDto> inventoryList : inventoryDetailMap.values()) {
inventoryList.sort(Comparator.comparing(InventoryDetailDto::getExpirationDate));
}
// 使用索引循环，以便处理后续添加的拆分单
int currentIndex = 0;
while (currentIndex < deviceDispenseList.size()) {
DeviceDispense deviceDispense = deviceDispenseList.get(currentIndex);
currentIndex++;
// 根据发放耗材和发放耗材房做key
String inventoryKey =
deviceDispense.getDeviceDefId() + CommonConstants.Common.DASH + deviceDispense.getLocationId();
// 查询对应的库存信息
if (!inventoryDetailMap.containsKey(inventoryKey)) {
return R.fail("耗材库存不存在，耗材ID: " + deviceDispense.getDeviceDefId());
}
List<InventoryDetailDto> inventoryList = inventoryDetailMap.get(inventoryKey);
// 获取发耗材数量
BigDecimal dispenseQuantity = deviceDispense.getQuantity();
// 循环库存信息
for (InventoryDetailDto inventoryDetailDto : inventoryList) {
// 发耗材数量不能小于等于0
if (dispenseQuantity.compareTo(BigDecimal.ZERO) <= 0) {
break;
}
// 库存剩余数量不能小于等于0
if (inventoryDetailDto.getInventoryQuantity().compareTo(BigDecimal.ZERO) <= 0) {
continue;
}
// 发耗材数量单位转换
if (!inventoryDetailDto.getInventoryUnitCode().equals(deviceDispense.getUnitCode())) {
dispenseQuantity = dispenseQuantity.multiply(inventoryDetailDto.getPartPercent());
}
// 获取库存剩余数量
BigDecimal remainingInventoryQuantity =
inventoryDetailDto.getInventoryQuantity().subtract(dispenseQuantity);
// 如果剩余库存数量大于等于0，则说明当前批号库存充足
if (remainingInventoryQuantity.compareTo(BigDecimal.ZERO) >= 0) {
deviceDispense.setLotNumber(inventoryDetailDto.getInventoryLotNumber());
// 将该批号的库存数量重置为剩余数量
inventoryDetailDto.setInventoryQuantity(remainingInventoryQuantity);
} else {
// 发耗材数量单位转换
if (!inventoryDetailDto.getInventoryUnitCode().equals(deviceDispense.getUnitCode())) {
// 发耗材数量取库存大单位数量
dispenseQuantity = inventoryDetailDto.getInventoryQuantity()
.divide(inventoryDetailDto.getPartPercent(), 0, RoundingMode.HALF_UP);
// 大单位数量不足则跳出循环
if (dispenseQuantity.compareTo(BigDecimal.ZERO) == 0) {
continue;
}
} else {
// 发耗材数量取该批号剩余数量
dispenseQuantity = inventoryDetailDto.getInventoryQuantity();
}
// 如果剩余数量不足则进行拆分
DeviceDispense splitDeviceDispense = new DeviceDispense();
BeanUtils.copyProperties(deviceDispense, splitDeviceDispense);
// 数量拆分
splitDeviceDispense.setQuantity(deviceDispense.getQuantity().subtract(dispenseQuantity))
// 重置id与批号
.setId(null).setLotNumber(null)
// 重新生成发耗材单编码
.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_DIS_NO.getPrefix(), 4));
// 将拆分出来的发耗材单添加到原发耗材单列表中
deviceDispenseList.add(splitDeviceDispense);
// 更新原发耗材单
deviceDispense.setLotNumber(inventoryDetailDto.getInventoryLotNumber());
deviceDispense.setQuantity(dispenseQuantity);
// 将该批号的库存数量重置为0
inventoryDetailDto.setInventoryQuantity(BigDecimal.ZERO);
}
break;
}
}
// 校验耗材库存
for (DeviceDispense deviceDispense : deviceDispenseList) {
if (deviceDispense.getLotNumber() == null) {
return R.fail("耗材:" + deviceDispense.getDeviceDefId() + "库存不足，请检查耗材库存");
}
}
// 新增或更新发耗材单
boolean result = deviceDispenseService.saveOrUpdateBatch(deviceDispenseList);
if (!result) {
return R.fail("发耗材单生成失败，请联系管理员");
}
}
return R.ok();
}
}

20
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/controller/CommonAppController.java
View File

@@ -253,24 +253,4 @@ public class CommonAppController {
return commonService.getActivityDefinition();
}
/**
* 查询备份单号
*
* @return 备份单号列表
*/
@GetMapping(value = "/backup-list")
public R<?> getBackupNoList() {
return commonService.getBackupNoList();
}
/**
* 批号匹配
*
* @param encounterIdList 就诊id列表
* @return 处理结果
*/
@GetMapping("/lot-number-match")
public R<?> lotNumberMatch(@RequestParam(value = "encounterIdList") List<Long> encounterIdList) {
return commonService.lotNumberMatch(encounterIdList);
}
}

15
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/AdviceItemPrintInfoDto.java
View File

@@ -92,19 +92,4 @@ public class AdviceItemPrintInfoDto {
* 排序号
*/
private Integer sortNumber;
/**
* 中药付数
*/
private BigDecimal chineseHerbsDoseQuantity;
/**
* 医保等级甲乙类
*/
private String chrgitmLv;
/**
* 是否基药
*/
private Integer basicFlag;
}

18
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/AdvicePrintInfoDto.java
View File

@@ -7,6 +7,8 @@ import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.common.annotation.Dict;
import lombok.Data;
@@ -91,22 +93,6 @@ public class AdvicePrintInfoDto {
private String unitCode;
private String unitCode_dictText;
/**
* 医保等级
*/
private Integer chrgitmLv;
private String chrgitmLv_enumText;
/**
* 地址
*/
private String address;
/**
* 患者id
*/
private String patientId;
/**
* 医嘱项目打印列表
*/

6
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformRecordDto.java
View File

@@ -30,14 +30,10 @@ public class PerformRecordDto {
private Integer statusEnum;
private String statusEnum_enumText;
/** 预计执行时间 */
/** 执行时间 */
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
private Date occurrenceTime;
/** 实际执行时间 */
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
private Date recordedTime;
/** 执行位置 */
private String locationName;

23
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/mapper/CommonAppMapper.java
View File

@@ -14,7 +14,6 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.openhis.administration.domain.TraceNoManage;
import com.openhis.web.common.dto.*;
import com.openhis.web.pharmacymanage.dto.InventoryDetailDto;
/**
* app常用接口 mapper
@@ -105,26 +104,4 @@ public interface CommonAppMapper {
* @return 诊疗项目
*/
List<ActivityDefinitionDto> getActivityDefinition(@Param("statusEnum") Integer statusEnum);
/**
* 查询药品库存详细信息
*
* @param medicationIdList 药品id列表
* @param locationIdList 库房id列表
* @param active 库存状态：启用
* @return 库存详细信息
*/
List<InventoryDetailDto> selectMedicineInventoryDetail(@Param("medicationIdList") List<Long> medicationIdList,
@Param("locationIdList") List<Long> locationIdList, @Param("active") Integer active);
/**
* 查询耗材库存详细信息
*
* @param deviceIdList 耗材id列表
* @param locationIdList 库房id列表
* @param active 库存状态：启用
* @return 库存详细信息
*/
List<InventoryDetailDto> selectDeviceInventoryDetail(@Param("deviceIdList") List<Long> deviceIdList,
@Param("locationIdList") List<Long> locationIdList, @Param("active") Integer active);
}

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java
View File

@@ -13,7 +13,6 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.core.common.enums.DelFlag;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
@@ -26,6 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.core.domain.entity.SysDictData;
import com.core.common.enums.DeleteFlag;
import com.core.common.utils.*;
import com.core.common.utils.bean.BeanUtils;
import com.core.common.utils.poi.ExcelUtil;
@@ -388,7 +388,7 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
// 查询机构ID、位置信息供后续使用
Long orgId = SecurityUtils.getLoginUser().getOrgId();
List<Location> locationList = locationService.list(new LambdaQueryWrapper<Location>()
.eq(Location::getDeleteFlag, DelFlag.NO.getCode()).orderByAsc(Location::getId));
.eq(Location::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode()).orderByAsc(Location::getId));
Long defaultLocationId = locationList.stream().findFirst().orElse(new Location()).getId();
Map<String, List<Location>> locationNameMap =
locationList.stream().collect(Collectors.groupingBy(Location::getName));

7
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java
View File

@@ -248,7 +248,7 @@ public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
.setTypeCode(diagnosisTreatmentUpDto.getItemTypeCode())
.setInstanceTable(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION)
.setInstanceId(diagnosisTreatmentUpDto.getId()).setPrice(diagnosisTreatmentUpDto.getRetailPrice())
.setPriceCode(diagnosisTreatmentUpDto.getPriceCode()).setChargeName(diagnosisTreatmentUpDto.getName());
.setChargeName(diagnosisTreatmentUpDto.getName());
// 插入操作记录
operationRecordService.addEntityOperationRecord(DbOpType.UPDATE.getCode(),
CommonConstants.TableName.WOR_ACTIVITY_DEFINITION, activityDefinition);
@@ -375,8 +375,7 @@ public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
.setInstanceTable(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION)
.setEffectiveStart(DateUtils.getNowDate()).setStatusEnum(PublicationStatus.ACTIVE.getValue())
.setConditionFlag(Whether.YES.getValue()).setChargeName(diagnosisTreatmentUpDto.getName())
.setInstanceId(activityDefinition.getId()).setPrice(diagnosisTreatmentUpDto.getRetailPrice())
.setPriceCode(diagnosisTreatmentUpDto.getPriceCode());
.setInstanceId(activityDefinition.getId()).setPrice(diagnosisTreatmentUpDto.getRetailPrice());
return itemDefinitionService.addItem(itemUpFromDirectoryDto)
? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊疗目录"}))
@@ -447,7 +446,7 @@ public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
if (!serviceRequestList.isEmpty()) {
if (serviceRequestList.stream().anyMatch(
serviceRequest -> RequestStatus.COMPLETED.getValue().equals(serviceRequest.getStatusEnum()))) {
return R.ok(1, "医生开过该诊疗项目，不可编辑");
return R.ok(1,"医生开过该诊疗项目，不可编辑");
}
}
return R.ok();

1
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java
View File

@@ -109,7 +109,6 @@ public class ItemDefinitionServiceImpl implements IItemDefinitionService {
.set(ChargeItemDefinition::getYbType, chargeItemDefinition.getYbType())
.set(ChargeItemDefinition::getTypeCode, chargeItemDefinition.getTypeCode())
.set(ChargeItemDefinition::getPrice, chargeItemDefinition.getPrice())
.set(ChargeItemDefinition::getPriceCode, chargeItemDefinition.getPriceCode())
.set(ChargeItemDefinition::getChargeName, chargeItemDefinition.getChargeName());
return chargeItemDefinitionService.update(null, updateWrapper);

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
View File

@@ -12,7 +12,6 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.core.common.enums.DelFlag;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
@@ -25,6 +24,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.core.domain.entity.SysDictData;
import com.core.common.enums.DeleteFlag;
import com.core.common.utils.*;
import com.core.common.utils.bean.BeanUtils;
import com.core.common.utils.poi.ExcelUtil;
@@ -479,7 +479,7 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
// 查询机构ID、位置信息供后续使用
Long orgId = SecurityUtils.getLoginUser().getOrgId();
List<Location> locationList = locationService.list(new LambdaQueryWrapper<Location>()
.eq(Location::getDeleteFlag, DelFlag.NO.getCode()).orderByAsc(Location::getId));
.eq(Location::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode()).orderByAsc(Location::getId));
Long defaultLocationId = locationList.stream().findFirst().orElse(new Location()).getId();
Map<String, List<Location>> locationNameMap =
locationList.stream().collect(Collectors.groupingBy(Location::getName));

2
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java
View File

@@ -30,7 +30,7 @@ import com.openhis.administration.service.ISupplierService;
import com.openhis.common.constant.CommonConstants;
import com.openhis.common.constant.PromptMsgConstant;
import com.openhis.common.enums.AssignSeqEnum;
import com.core.common.enums.DelFlag;
import com.openhis.common.enums.DelFlag;
import com.openhis.common.enums.SupplierType;
import com.openhis.common.enums.Whether;
import com.openhis.common.utils.EnumUtils;

10
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ActivityChildJsonDto.java
View File

@@ -24,14 +24,4 @@ public class ActivityChildJsonDto {
*/
private BigDecimal childrenRequestNum;
/**
* 售价
*/
private BigDecimal retailPrice;
/**
* 诊疗名称
*/
private String name;
}

6
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java
View File

@@ -5,10 +5,14 @@ import java.math.BigDecimal;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.common.annotation.Dict;
import com.openhis.common.enums.DeviceCategory;
import com.openhis.common.enums.PublicationStatus;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull;
/**
* 器材目录分页检索
*
@@ -114,7 +118,7 @@ public class DeviceManageDto {
/** 供应商 */
@JsonSerialize(using = ToStringSerializer.class)
@Dict(dictTable = "adm_supplier", dictCode = "id", dictText = "name")
@Dict(dictTable = "adm_supplier",dictCode = "id",dictText = "name")
private Long supplyId;
private String supplyId_dictText;

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java
View File

@@ -3,10 +3,12 @@ package com.openhis.web.datadictionary.dto;
import java.math.BigDecimal;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.common.annotation.Dict;
import com.openhis.common.enums.DeviceCategory;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -134,7 +136,7 @@ public class DeviceManageUpDto {
/** 医保类别 */
private String ybType;
/** 医保等级 */
private Integer chrgitmLv;

16
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java
View File

@@ -1,14 +1,17 @@
package com.openhis.web.datadictionary.dto;
import java.math.BigDecimal;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.common.annotation.Dict;
import com.openhis.common.enums.ActivityDefCategory;
import com.openhis.common.enums.PublicationStatus;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
/**
* 诊疗目录分页检索
*
@@ -102,8 +105,8 @@ public class DiagnosisTreatmentDto {
private String ybType;
private String ybType_dictText;
// /** 购入价 */
// private BigDecimal purchasePrice;
// /** 购入价 */
// private BigDecimal purchasePrice;
/** 零售价 */
private BigDecimal retailPrice;
@@ -121,9 +124,4 @@ public class DiagnosisTreatmentDto {
private Integer pricingFlag;
private String pricingFlag_enumText;
/**
* 物价编码
*/
private String priceCode;
}

Some files were not shown because too many files have changed in this diff Show More