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

Merge branch '3.11_院后第二增量' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量

Browse Source
This commit is contained in:
haown 2024-03-20 16:34:19 +08:00
commit badef731f1
7 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java
View File

@ -180,15 +180,20 @@ public class Constants {
public static final String SERVICE_MODE_ENCODING = "SME";
/**
* 服务方式编码
* 任务类型编码
*/
public static final String TASK_TYPE_CODE = "TTC";
/**
* 服务方式编码
* 任务细分编码
*/
public static final String TASK_PARTITION_CODE = "TPC";
/**
* 任务状态编码
*/
public static final String TASK_STATUS_CODE = "TSC";
/**
* 门诊患者
*/

8
postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldinfo/LabelFieldInfoController.java
View File

@ -43,6 +43,14 @@ public class LabelFieldInfoController extends BaseController {
return getDataTable(list);
}
/**
* 查询标签字段信息列表 不分页
*/
@GetMapping("/labelFieldInfoList")
public AjaxResult labelFieldInfoList(LabelFieldInfo labelFieldInfo) {
return AjaxResult.success(labelFieldInfoService.selectLabelFieldInfoList(labelFieldInfo));
}
/**
* 导出标签字段信息列表
*/

2
postdischarge-manage/src/main/java/com/xinelu/manage/domain/signroutetriggercondition/SignRouteTriggerCondition.java
View File

@ -66,6 +66,4 @@ public class SignRouteTriggerCondition extends BaseEntity {
@ApiModelProperty(value = "备注信息")
@Excel(name = "备注信息")
private String triggerConditionRemark;
}

12
postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/ILabelFieldContentService.java
View File

@ -18,7 +18,7 @@ public interface ILabelFieldContentService {
* @param id 标签字段内容信息主键
* @return 标签字段内容信息
*/
public LabelFieldContent selectLabelFieldContentById(Long id);
LabelFieldContent selectLabelFieldContentById(Long id);
/**
* 查询标签字段内容信息列表
@ -26,7 +26,7 @@ public interface ILabelFieldContentService {
* @param labelFieldContent 标签字段内容信息
* @return 标签字段内容信息集合
*/
public List<LabelFieldContent> selectLabelFieldContentList(LabelFieldContent labelFieldContent);
List<LabelFieldContent> selectLabelFieldContentList(LabelFieldContent labelFieldContent);
/**
* 新增标签字段内容信息
@ -34,7 +34,7 @@ public interface ILabelFieldContentService {
* @param labelFieldContent 标签字段内容信息
* @return 结果
*/
public int insertLabelFieldContent(LabelFieldContent labelFieldContent);
int insertLabelFieldContent(LabelFieldContent labelFieldContent);
/**
* 修改标签字段内容信息
@ -42,7 +42,7 @@ public interface ILabelFieldContentService {
* @param labelFieldContent 标签字段内容信息
* @return 结果
*/
public int updateLabelFieldContent(LabelFieldContent labelFieldContent);
int updateLabelFieldContent(LabelFieldContent labelFieldContent);
/**
* 批量删除标签字段内容信息
@ -50,7 +50,7 @@ public interface ILabelFieldContentService {
* @param ids 需要删除的标签字段内容信息主键集合
* @return 结果
*/
public int deleteLabelFieldContentByIds(Long[] ids);
int deleteLabelFieldContentByIds(Long[] ids);
/**
* 删除标签字段内容信息
@ -58,7 +58,7 @@ public interface ILabelFieldContentService {
* @param id 标签字段内容信息主键
* @return 结果
*/
public int deleteLabelFieldContentById(Long id);
int deleteLabelFieldContentById(Long id);
/**
* 批量新增标签字段内容信息

13
postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/ILabelFieldInfoService.java
View File

@ -18,7 +18,7 @@ public interface ILabelFieldInfoService {
* @param id 标签字段信息主键
* @return 标签字段信息
*/
public LabelFieldInfo selectLabelFieldInfoById(Long id);
LabelFieldInfo selectLabelFieldInfoById(Long id);
/**
* 查询标签字段信息列表
@ -26,7 +26,7 @@ public interface ILabelFieldInfoService {
* @param labelFieldInfo 标签字段信息
* @return 标签字段信息集合
*/
public List<LabelFieldInfo> selectLabelFieldInfoList(LabelFieldInfo labelFieldInfo);
List<LabelFieldInfo> selectLabelFieldInfoList(LabelFieldInfo labelFieldInfo);
/**
* 新增标签字段信息
@ -34,7 +34,7 @@ public interface ILabelFieldInfoService {
* @param labelFieldInfo 标签字段信息
* @return 结果
*/
public int insertLabelFieldInfo(LabelFieldInfo labelFieldInfo);
int insertLabelFieldInfo(LabelFieldInfo labelFieldInfo);
/**
* 修改标签字段信息
@ -42,7 +42,7 @@ public interface ILabelFieldInfoService {
* @param labelFieldInfo 标签字段信息
* @return 结果
*/
public int updateLabelFieldInfo(LabelFieldInfo labelFieldInfo);
int updateLabelFieldInfo(LabelFieldInfo labelFieldInfo);
/**
* 批量删除标签字段信息
@ -50,7 +50,7 @@ public interface ILabelFieldInfoService {
* @param ids 需要删除的标签字段信息主键集合
* @return 结果
*/
public int deleteLabelFieldInfoByIds(Long[] ids);
int deleteLabelFieldInfoByIds(Long[] ids);
/**
* 删除标签字段信息信息
@ -58,11 +58,10 @@ public interface ILabelFieldInfoService {
* @param id 标签字段信息主键
* @return 结果
*/
public int deleteLabelFieldInfoById(Long id);
int deleteLabelFieldInfoById(Long id);
/**
* 批量新增标签字段信息
*/
int insertLabelFieldInfoList(LabelFieldInfoAddDTO labelFieldInfoAddDTO);
}

12
postdischarge-manage/src/main/java/com/xinelu/manage/service/taskstatusdict/ITaskStatusDictService.java
View File

@ -18,7 +18,7 @@ public interface ITaskStatusDictService {
* @param id 任务状态字典主键
* @return 任务状态字典
*/
public TaskStatusDict selectTaskStatusDictById(Long id);
TaskStatusDict selectTaskStatusDictById(Long id);
/**
* 查询任务状态字典列表
@ -26,7 +26,7 @@ public interface ITaskStatusDictService {
* @param taskStatusDict 任务状态字典
* @return 任务状态字典集合
*/
public List<TaskStatusDict> selectTaskStatusDictList(TaskStatusDict taskStatusDict);
List<TaskStatusDict> selectTaskStatusDictList(TaskStatusDict taskStatusDict);
/**
* 新增任务状态字典
@ -34,7 +34,7 @@ public interface ITaskStatusDictService {
* @param taskStatusDict 任务状态字典
* @return 结果
*/
public int insertTaskStatusDict(TaskStatusDict taskStatusDict);
int insertTaskStatusDict(TaskStatusDict taskStatusDict);
/**
* 修改任务状态字典
@ -42,7 +42,7 @@ public interface ITaskStatusDictService {
* @param taskStatusDict 任务状态字典
* @return 结果
*/
public int updateTaskStatusDict(TaskStatusDict taskStatusDict);
int updateTaskStatusDict(TaskStatusDict taskStatusDict);
/**
* 批量删除任务状态字典
@ -50,7 +50,7 @@ public interface ITaskStatusDictService {
* @param ids 需要删除的任务状态字典主键集合
* @return 结果
*/
public int deleteTaskStatusDictByIds(Long[] ids);
int deleteTaskStatusDictByIds(Long[] ids);
/**
* 删除任务状态字典信息
@ -58,5 +58,5 @@ public interface ITaskStatusDictService {
* @param id 任务状态字典主键
* @return 结果
*/
public int deleteTaskStatusDictById(Long id);
int deleteTaskStatusDictById(Long id);
}

8
postdischarge-manage/src/main/java/com/xinelu/manage/service/taskstatusdict/impl/TaskStatusDictServiceImpl.java
View File

@ -1,5 +1,8 @@
package com.xinelu.manage.service.taskstatusdict.impl;
import com.xinelu.common.constant.Constants;
import com.xinelu.common.utils.SecurityUtils;
import com.xinelu.common.utils.codes.GenerateSystemCodeUtil;
import com.xinelu.manage.domain.taskstatusdict.TaskStatusDict;
import com.xinelu.manage.mapper.taskstatusdict.TaskStatusDictMapper;
import com.xinelu.manage.service.taskstatusdict.ITaskStatusDictService;
@ -20,6 +23,8 @@ import java.util.List;
public class TaskStatusDictServiceImpl implements ITaskStatusDictService {
@Resource
private TaskStatusDictMapper taskStatusDictMapper;
@Resource
private GenerateSystemCodeUtil generateSystemCodeUtil;
/**
* 查询任务状态字典
@ -51,7 +56,9 @@ public class TaskStatusDictServiceImpl implements ITaskStatusDictService {
*/
@Override
public int insertTaskStatusDict(TaskStatusDict taskStatusDict) {
taskStatusDict.setTaskStatusCode(Constants.TASK_STATUS_CODE + generateSystemCodeUtil.generateSystemCode(Constants.TASK_STATUS_CODE));
taskStatusDict.setCreateTime(LocalDateTime.now());
taskStatusDict.setCreateBy(SecurityUtils.getUsername());
return taskStatusDictMapper.insertTaskStatusDict(taskStatusDict);
}
@ -64,6 +71,7 @@ public class TaskStatusDictServiceImpl implements ITaskStatusDictService {
@Override
public int updateTaskStatusDict(TaskStatusDict taskStatusDict) {
taskStatusDict.setUpdateTime(LocalDateTime.now());
taskStatusDict.setUpdateBy(SecurityUtils.getUsername());
return taskStatusDictMapper.updateTaskStatusDict(taskStatusDict);
}