后端最新版本同步

2025-09-25 10:43:25 +08:00
parent 1276dc4adb
commit c8014404f1
355 changed files with 10070 additions and 5578 deletions
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java
@@ -67,7 +67,7 @@ public class ChargeItem extends HisBaseEntity {
    private Long costOrgId;

    /** 数量 */
-    private Integer quantityValue;
+    private BigDecimal quantityValue;

    /** 单位 */
    private String quantityUnit;
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java
@@ -44,5 +44,5 @@ public class EncounterParticipant extends HisBaseEntity {
    private Long practitionerId;

    /** 状态 */
-    private Long statusEnum;
+    private Integer statusEnum;
 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java
@@ -100,4 +100,7 @@ public class Practitioner extends HisBaseEntity {

    /** 开票点编码 */
    private String kpdCode;
+
+    /** 签名图片 */
+    private String signature;
 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemBaseInfoDto.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemBaseInfoDto.java
@@ -1,6 +1,10 @@
 package com.openhis.administration.dto;

+import java.math.BigDecimal;
+import java.util.Date;
+
 import com.openhis.administration.domain.ChargeItem;
+
 import lombok.Data;
 import lombok.experimental.Accessors;

@@ -65,8 +69,46 @@ public class ChargeItemBaseInfoDto extends ChargeItem {
    /** 开单科室医保码 */
    private String doctYbNo;

-    /** 自费还是医保收费  */
+    /** 自费还是医保收费 */
    private String contractNo;

+    /** 名称 */
+    private String chargeName;
+
+    /** 标题 */
+    private String title;
+
+    /** 状态 */
+    private Integer statusEnum;
+
+    /** 机构ID */
+    private Long orgId;
+
+    /** 描述 */
+    private String description;
+
+    /** 代码 */
+    private String instanceTable;
+
+    /** 关联项目 */
+    private Long instanceId;
+
+    /** 有效时间开始 */
+    private Date effectiveStart;
+
+    /** 有效时间结束 */
+    private Date effectiveEnd;
+
+    /** 财务类别 */
+    private String typeCode;
+
+    /** 医保类别 */
+    private String ybType;
+
+    /** 是否使用详细价格规则 */
+    private Integer conditionFlag;
+
+    /** 基础价格 */
+    private BigDecimal price;

 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java
@@ -54,9 +54,9 @@ public interface IChargeItemService extends IService<ChargeItem> {
    void updateRefundChargeStatus(List<Long> chargeItemIdList);

    /**
-     * 根据集合更改收费状态
+     * 更新收费状态
     * 
-     * @param chargeItemIdList 实体集合
+     * @param chargeItemIdList 收费项目id集合
     * @param value 状态值
     */
    void updatePaymentStatus(List<Long> chargeItemIdList, Integer value);
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterLocationService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterLocationService.java
@@ -5,7 +5,7 @@ import java.util.List;

 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.administration.domain.EncounterLocation;
-import com.openhis.common.enums.EncounterLocationStatus;
+import com.openhis.common.enums.EncounterActivityStatus;
 import com.openhis.common.enums.LocationForm;

 /**
@@ -70,11 +70,11 @@ public interface IEncounterLocationService extends IService<EncounterLocation> {
     * 根据就诊id查询就诊位置信息(某个类型)(某个状态)
     * 
     * @param locationForm 类型
-     * @param encounterLocationStatus 状态
+     * @param encounterActivityStatus 状态
     * @param encounterId 就诊id
     * @return 就诊位置集合
     */
    List<EncounterLocation> getEncounterLocationList(Long encounterId, LocationForm locationForm,
-        EncounterLocationStatus encounterLocationStatus);
+        EncounterActivityStatus encounterActivityStatus);

 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java
@@ -9,6 +9,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.core.common.utils.SecurityUtils;
 import com.openhis.administration.domain.ChargeItem;
 import com.openhis.administration.dto.ChargeItemBaseInfoDto;
 import com.openhis.administration.dto.ChargeItemDefInfo;
@@ -96,9 +97,16 @@ public class ChargeItemServiceImpl extends ServiceImpl<ChargeItemMapper, ChargeI
            new LambdaUpdateWrapper<ChargeItem>().in(ChargeItem::getId, chargeItemIdList));
    }

+    /**
+     * 更新收费状态
+     *
+     * @param chargeItemIdList 收费项目id集合
+     * @param value 状态值
+     */
    @Override
    public void updatePaymentStatus(List<Long> chargeItemIdList, Integer value) {
-        baseMapper.update(new ChargeItem().setStatusEnum(value),
+        baseMapper.update(
+            new ChargeItem().setStatusEnum(value).setPerformerId(SecurityUtils.getLoginUser().getPractitionerId()),
            new LambdaUpdateWrapper<ChargeItem>().in(ChargeItem::getId, chargeItemIdList));
    }

--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterLocationServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterLocationServiceImpl.java
@@ -13,7 +13,7 @@ import com.openhis.administration.domain.EncounterLocation;
 import com.openhis.administration.mapper.EncounterLocationMapper;
 import com.openhis.administration.service.IEncounterLocationService;
 import com.openhis.common.enums.DelFlag;
-import com.openhis.common.enums.EncounterLocationStatus;
+import com.openhis.common.enums.EncounterActivityStatus;
 import com.openhis.common.enums.LocationForm;

 /**
@@ -48,7 +48,7 @@ public class EncounterLocationServiceImpl extends ServiceImpl<EncounterLocationM
        queryWrapper.eq(EncounterLocation::getEncounterId, encounterLocation.getEncounterId())
            .eq(EncounterLocation::getFormEnum, encounterLocation.getFormEnum())
            // 状态为使用中
-            .eq(EncounterLocation::getStatusEnum, EncounterLocationStatus.ACTIVE.getValue());
+            .eq(EncounterLocation::getStatusEnum, EncounterActivityStatus.ACTIVE.getValue());

        // 查询是否存在记录
        EncounterLocation existingRecord = baseMapper.selectOne(queryWrapper);
@@ -86,7 +86,7 @@ public class EncounterLocationServiceImpl extends ServiceImpl<EncounterLocationM
    @Override
    public List<EncounterLocation> getEncounterLocationInfo(Long encounterId, Long locationId) {
        LambdaQueryWrapper<EncounterLocation> queryWrapper = new LambdaQueryWrapper<EncounterLocation>()
-            .eq(EncounterLocation::getStatusEnum, EncounterLocationStatus.ACTIVE.getValue())
+            .eq(EncounterLocation::getStatusEnum, EncounterActivityStatus.ACTIVE.getValue())
            .eq(EncounterLocation::getDeleteFlag, DelFlag.NO.getCode());
        if (locationId != null) {
            queryWrapper.eq(EncounterLocation::getLocationId, locationId).eq(EncounterLocation::getFormEnum,
@@ -118,7 +118,7 @@ public class EncounterLocationServiceImpl extends ServiceImpl<EncounterLocationM
        // 更新状态为已完成
        return baseMapper.update(null,
            new LambdaUpdateWrapper<EncounterLocation>()
-                .set(EncounterLocation::getStatusEnum, EncounterLocationStatus.COMPLETED.getValue())
+                .set(EncounterLocation::getStatusEnum, EncounterActivityStatus.COMPLETED.getValue())
                .eq(EncounterLocation::getEncounterId, encounterId).in(EncounterLocation::getFormEnum, locationForms));
    }

@@ -138,13 +138,13 @@ public class EncounterLocationServiceImpl extends ServiceImpl<EncounterLocationM
     * 根据就诊id查询就诊位置信息(某个类型)(某个状态)
     * 
     * @param locationForm 类型
-     * @param encounterLocationStatus 状态
+     * @param encounterActivityStatus 状态
     * @param encounterId 就诊id
     * @return 就诊位置集合
     */
    @Override
    public List<EncounterLocation> getEncounterLocationList(Long encounterId, LocationForm locationForm,
-        EncounterLocationStatus encounterLocationStatus) {
+        EncounterActivityStatus encounterActivityStatus) {
        LambdaQueryWrapper<EncounterLocation> queryWrapper =
            new LambdaQueryWrapper<EncounterLocation>().eq(EncounterLocation::getEncounterId, encounterId)
                .eq(EncounterLocation::getDeleteFlag, DelFlag.NO.getCode());
@@ -153,8 +153,8 @@ public class EncounterLocationServiceImpl extends ServiceImpl<EncounterLocationM
            queryWrapper.eq(EncounterLocation::getFormEnum, locationForm.getCode());
        }

-        if (encounterLocationStatus != null) {
-            queryWrapper.eq(EncounterLocation::getStatusEnum, encounterLocationStatus.getCode());
+        if (encounterActivityStatus != null) {
+            queryWrapper.eq(EncounterLocation::getStatusEnum, encounterActivityStatus.getCode());
        }
        return baseMapper.selectList(queryWrapper);
    }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterParticipantServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterParticipantServiceImpl.java
@@ -13,7 +13,7 @@ import com.openhis.administration.domain.EncounterParticipant;
 import com.openhis.administration.mapper.EncounterParticipantMapper;
 import com.openhis.administration.service.IEncounterParticipantService;
 import com.openhis.common.enums.DelFlag;
-import com.openhis.common.enums.EncounterLocationStatus;
+import com.openhis.common.enums.EncounterActivityStatus;
 import com.openhis.common.enums.ParticipantType;

 /**
@@ -63,7 +63,7 @@ public class EncounterParticipantServiceImpl extends ServiceImpl<EncounterPartic
        // 更新状态为已完成
        return baseMapper.update(null,
            new LambdaUpdateWrapper<EncounterParticipant>()
-                .set(EncounterParticipant::getStatusEnum, EncounterLocationStatus.COMPLETED.getValue())
+                .set(EncounterParticipant::getStatusEnum, EncounterActivityStatus.COMPLETED.getValue())
                .eq(EncounterParticipant::getEncounterId, encounterId).in(EncounterParticipant::getTypeCode,
                    ParticipantType.ATTENDING_DOCTOR.getCode(), ParticipantType.CHIEF_DOCTOR.getCode(),
                    ParticipantType.PRIMARY_NURSE.getCode(), ParticipantType.ADMITTING_DOCTOR.getCode()));
@@ -79,7 +79,7 @@ public class EncounterParticipantServiceImpl extends ServiceImpl<EncounterPartic
    public List<EncounterParticipant> getEncounterParticipantList(Long encounterId) {
        return baseMapper.selectList(
            new LambdaQueryWrapper<EncounterParticipant>().eq(EncounterParticipant::getEncounterId, encounterId)
-                .eq(EncounterParticipant::getStatusEnum, EncounterLocationStatus.ACTIVE.getValue())
+                .eq(EncounterParticipant::getStatusEnum, EncounterActivityStatus.ACTIVE.getValue())
                .eq(EncounterParticipant::getDeleteFlag, DelFlag.NO.getCode()));
    }

--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java
@@ -138,7 +138,7 @@ public class PatientServiceImpl extends ServiceImpl<PatientMapper, Patient> impl
        // 设置五笔首拼
        patient.setWbStr(ChineseConvertUtils.toWBFirstLetter(patient.getName()));
        // 不存在重复的证件号，新增患者
-        if (idCardExists(patient) == null) {
+        if (patient.getIdCard() == null || patient.getIdCard().isEmpty() ||idCardExists(patient) == null) {
            // 添加患者
            return baseMapper.insert(patient) > 0;
        }