xinyilu/PostDischargePatientManage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

参数设置

Browse Source
This commit is contained in:
zhangheng 2025-01-02 15:45:46 +08:00
parent f1174757a6
commit 46eca29edb
4 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
postdischarge-admin/src/main/resources/application.yml
View File

@ -294,6 +294,3 @@ aiob:
# 任务执行回调地址--测试
callBackUrl: http://182.92.166.109:9707/api/taskCallBack
# callBackUrl: http://8.131.93.145:54011/api/taskCallBack
xinyilu-database:
id: 46

18
postdischarge-common/src/main/java/com/xinelu/common/config/XinYiLuDatabase.java
View File

@ -1,18 +0,0 @@
package com.xinelu.common.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
/**
* @Description 新医路院后数据库账号id参数配置类
* @Author zh
* @Date 2024-07-31
*/
@Data
@Component
@ConfigurationProperties(prefix = "xinyilu-database")
public class XinYiLuDatabase {
private Long id;
}

2
postdischarge-manage/src/main/java/com/xinelu/manage/service/homepage/impl/SystemHomePageServiceImpl.java
View File

@ -163,7 +163,7 @@ public class SystemHomePageServiceImpl implements SystemHomePageService {
allCount = patientAndNodes.size();
for (PatientAndNode patientAndNode : patientAndNodes) {
LocalDate localDate = null;
if (Objects.nonNull(patientAndNode.getDischargeTime())) {
if (Objects.nonNull(patientAndNode.getDischargeTime()) && Objects.nonNull(patientAndNode.getRouteNodeDay())) {
localDate = patientAndNode.getDischargeTime().plusDays(patientAndNode.getRouteNodeDay());
}
if (Objects.isNull(patientAndNode.getDischargeTime()) && Objects.nonNull(patientAndNode.getVisitDate()) && Objects.nonNull(patientAndNode.getRouteNodeDay())) {

10
postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java
View File

@ -1,7 +1,6 @@
package com.xinelu.manage.service.propagandainfo.impl;
import com.xinelu.common.annotation.DataScope;
import com.xinelu.common.config.XinYiLuDatabase;
import com.xinelu.common.constant.Constants;
import com.xinelu.common.exception.ServiceException;
import com.xinelu.common.utils.SecurityUtils;
@ -26,6 +25,8 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Resource;
import com.xinelu.system.service.ISysConfigService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
@ -51,7 +52,7 @@ public class PropagandaInfoServiceImpl implements IPropagandaInfoService {
@Resource
private GenerateSystemCodeUtil generateSystemCodeUtil;
@Resource
private XinYiLuDatabase xinYiLuDatabase;
private ISysConfigService sysConfigService;
/**
* 查询宣教库管理
@ -96,7 +97,10 @@ public class PropagandaInfoServiceImpl implements IPropagandaInfoService {
//@DataScope(agencyAlias = "p") 除admin其他账号的机构id必传
public List<PropagandaInfo> selectPropagandaInfoList(PropagandaInfoDto propagandaInfo) {
if (StringUtils.isNotBlank(propagandaInfo.getSource()) && propagandaInfo.getSource().equals("PUBLIC")){
propagandaInfo.setPublicId(xinYiLuDatabase.getId());
String publicAgencyId = sysConfigService.selectConfigByKey("public_agency_id");
if (StringUtils.isNotBlank(publicAgencyId)){
propagandaInfo.setPublicId(Long.parseLong(publicAgencyId));
}
}
return propagandaInfoMapper.selectPropagandaInfoList(propagandaInfo);
}