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

层级优化，方法内容优化，字段修改

Browse Source
This commit is contained in:
Zhang.WH
2025-03-08 16:17:20 +08:00
parent 85d9cd2e31
commit 78ef62b675
22 changed files with 631 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java
View File

@@ -6,9 +6,8 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.core.domain.HisBaseEntity;
import com.openhis.common.enums.ChargeItemStatus;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -75,7 +74,7 @@ public class ChargeItem extends HisBaseEntity {
private Long definitionId;
/** 定价子表主键 */
private Long applicabilityId;
private Long defDetailId;
/** 原价 */
private BigDecimal baseAmount;
@@ -122,5 +121,4 @@ public class ChargeItem extends HisBaseEntity {
/** 机构 */
private Integer orgId;
}

21
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefApp.java → openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefDetail.java
View File

@@ -19,10 +19,10 @@ import lombok.experimental.Accessors;
* @date 2025-02-20
*/
@Data
@TableName("adm_charge_item_def_app")
@TableName("adm_charge_item_def_detail")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class ChargeItemDefApp extends HisBaseEntity {
public class ChargeItemDefDetail extends HisBaseEntity {
/** ID */
@TableId(type = IdType.ASSIGN_ID)
@@ -34,28 +34,19 @@ public class ChargeItemDefApp extends HisBaseEntity {
/** 条件规则 */
private Long conditionRuleId;
/** 批次号 */
private String conditionLotnumber;
/** 医保相关价格 */
private String conditionYbCode;
/** 采购售卖条件 */
private String conditionInoutCode;
/** 条件类型 */
private String conditionUnitCode;
/** 条件 */
private String conditionCode;
/** 命中值 */
private String conditionValue;
/** 优先级 */
private Integer priority;
/** 价格 */
private BigDecimal amount;
public ChargeItemDefApp() {
public ChargeItemDefDetail() {
// 默认优先级：常规
this.priority = ActPriority.ROUTINE.getValue();
}

4
openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefAppMapper.java
View File

@@ -1,9 +1,9 @@
package com.openhis.administration.mapper;
import com.openhis.administration.domain.ChargeItemDefDetail;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.administration.domain.ChargeItemDefApp;
/**
* 费用定价管理子Mapper接口
@@ -12,6 +12,6 @@ import com.openhis.administration.domain.ChargeItemDefApp;
* @date 2025-02-20
*/
@Repository
public interface ChargeItemDefAppMapper extends BaseMapper<ChargeItemDefApp> {
public interface ChargeItemDefAppMapper extends BaseMapper<ChargeItemDefDetail> {
}

12
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefAppService.java → openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefDetailService.java
View File

@@ -1,7 +1,7 @@
package com.openhis.administration.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.administration.domain.ChargeItemDefApp;
import com.openhis.administration.domain.ChargeItemDefDetail;
/**
* 费用定价管理子Service接口
@@ -9,23 +9,23 @@ import com.openhis.administration.domain.ChargeItemDefApp;
* @author system
* @date 2025-02-20
*/
public interface IChargeItemDefAppService extends IService<ChargeItemDefApp> {
public interface IChargeItemDefDetailService extends IService<ChargeItemDefDetail> {
/**
* 更新项目定价
*
* @param chargeItemDefApp 更新内容
* @param chargeItemDefDetail 更新内容
* @return 更新结果
*/
boolean updateChargeItemDefApp(ChargeItemDefApp chargeItemDefApp);
boolean updateChargeItemDefApp(ChargeItemDefDetail chargeItemDefDetail);
/**
* 新增费用定价
*
* @param chargeItemDefApp 新增内容
* @param chargeItemDefDetail 新增内容
* @return 新增结果
*/
boolean addChargeItemDefApp(ChargeItemDefApp chargeItemDefApp);
boolean addChargeItemDefApp(ChargeItemDefDetail chargeItemDefDetail);
/**
* 删除费用定价

26
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefAppServiceImpl.java → openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefDetailServiceImpl.java
View File

@@ -1,11 +1,11 @@
package com.openhis.administration.service.impl;
import com.openhis.administration.domain.ChargeItemDefDetail;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.administration.domain.ChargeItemDefApp;
import com.openhis.administration.mapper.ChargeItemDefAppMapper;
import com.openhis.administration.service.IChargeItemDefAppService;
import com.openhis.administration.service.IChargeItemDefDetailService;
/**
* 费用定价管理子Service业务层处理
@@ -14,24 +14,24 @@ import com.openhis.administration.service.IChargeItemDefAppService;
* @date 2025-02-20
*/
@Service
public class ChargeItemDefAppServiceImpl extends ServiceImpl<ChargeItemDefAppMapper, ChargeItemDefApp>
implements IChargeItemDefAppService {
public class ChargeItemDefDetailServiceImpl extends ServiceImpl<ChargeItemDefAppMapper, ChargeItemDefDetail>
implements IChargeItemDefDetailService {
/**
* 更新项目定价
*
* @param chargeItemDefApp 更新内容
* @param chargeItemDefDetail 更新内容
* @return 更新结果
*/
@Override
public boolean updateChargeItemDefApp(ChargeItemDefApp chargeItemDefApp) {
public boolean updateChargeItemDefApp(ChargeItemDefDetail chargeItemDefDetail) {
// 更新样例 一切以实际为主
if (chargeItemDefApp.getId() != null) {
if (chargeItemDefDetail.getId() != null) {
// 获取更新前收费项目，避免更新导致数据库崩溃
if (baseMapper.selectById(chargeItemDefApp.getId()) == null) {
if (baseMapper.selectById(chargeItemDefDetail.getId()) == null) {
return false;
} else {
return baseMapper.updateById(chargeItemDefApp) > 0;
return baseMapper.updateById(chargeItemDefDetail) > 0;
}
} else {
return false;
@@ -41,16 +41,16 @@ public class ChargeItemDefAppServiceImpl extends ServiceImpl<ChargeItemDefAppMap
/**
* 新增费用定价
*
* @param chargeItemDefApp 新增内容
* @param chargeItemDefDetail 新增内容
* @return 新增结果
*/
@Override
public boolean addChargeItemDefApp(ChargeItemDefApp chargeItemDefApp) {
public boolean addChargeItemDefApp(ChargeItemDefDetail chargeItemDefDetail) {
// 此判断是为了避免插入时主键重复
if (chargeItemDefApp.getId() != null) {
if (chargeItemDefDetail.getId() != null) {
return false;
} else {
return baseMapper.insert(chargeItemDefApp) > 0;
return baseMapper.insert(chargeItemDefDetail) > 0;
}
}

9
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java
View File

@@ -71,6 +71,9 @@ public class SupplyRequest extends HisBaseEntity {
/** 物品计量单位 */
private String unitCode;
/** 拆零单位 */
private String minUnitCode;
/** 请求细节 */
private String detailJson;
@@ -137,6 +140,12 @@ public class SupplyRequest extends HisBaseEntity {
/** 总价 */
private BigDecimal totalPrice;
/** 售价 */
private BigDecimal sellPrice;
/** 拆零售价 */
private BigDecimal minSellPrice;
public SupplyRequest() {
// 默认单据类型：商品调拨
this.typeEnum = SupplyType.PRODUCT_ALLOCATION.getValue();