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

参与者与系统用户整合

Browse Source
This commit is contained in:
Wang.Huan
2025-03-26 16:01:32 +08:00
parent 6e63d3c286
commit 945e115b50
10 changed files with 87 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,6 +224,9 @@ public class PractitionerAppServiceImpl implements IPractitionerAppService {
*/
@Override
public R<?> delUserPractitioner(Long userId) {
if (1L == userId) {
return R.fail(null, "admin不允许删除");
}
iBizUserService.remove(new LambdaQueryWrapper<BizUser>().eq(BizUser::getUserId, userId));
practitionerAppAppMapper.delUserRole(userId);
Practitioner one =

4
openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ChargeItemFormData.java
View File

@@ -84,8 +84,8 @@ public class ChargeItemFormData {
this.statusEnum = ChargeItemStatus.BILLED.getValue();
this.contextEnum = EncounterClass.AMB.getValue();
this.occurrenceTime = new Date();
this.performerId = SecurityUtils.getLoginUser().getUserId();
this.entererId = SecurityUtils.getLoginUser().getUserId();
this.performerId = SecurityUtils.getLoginUser().getPractitionerId();
this.entererId = SecurityUtils.getLoginUser().getPractitionerId();
this.enteredDate = new Date();
this.serviceTable = CommonConstants.TableName.ADM_HEALTHCARE_SERVICE;
}

4
openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java
View File

@@ -2,6 +2,7 @@ package com.openhis.web.doctorstation.dto;
import java.math.BigDecimal;
import com.core.common.utils.SecurityUtils;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.common.enums.EncounterClass;
@@ -126,8 +127,7 @@ public class AdviceSaveDto {
this.statusEnum = RequestStatus.DRAFT.getValue();
this.categoryEnum = EncounterClass.AMB.getValue();
this.therapyEnum = TherapyTimeType.TEMPORARY.getValue();
// TODO: 应该从当前登录账号获取参与者id,现在没有
// this.practitionerId
this.practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
}
}