小程序我的消息
This commit is contained in:
parent
c6cd94f6c8
commit
7cde67cee2
@ -94,17 +94,21 @@ public class HomePageServiceImpl implements HomePageService {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public TableDataInfo myFollowUp(MyFollowUpVO myFollowUp) {
|
public TableDataInfo myFollowUp(MyFollowUpVO myFollowUp) {
|
||||||
|
//查询已执行数据
|
||||||
myFollowUp.setNodeExecuteStatus(NodeExecuteStatusEnum.EXECUTED.getInfo());
|
myFollowUp.setNodeExecuteStatus(NodeExecuteStatusEnum.EXECUTED.getInfo());
|
||||||
List<MyFollowUpVO> myFollowUpList = homePageMapper.selectManageRouteNode(myFollowUp);
|
List<MyFollowUpVO> myFollowUpList = homePageMapper.selectManageRouteNode(myFollowUp);
|
||||||
int total = myFollowUpList.size();
|
int total = myFollowUpList.size();
|
||||||
if (CollectionUtils.isEmpty(myFollowUpList)) {
|
if (CollectionUtils.isEmpty(myFollowUpList)) {
|
||||||
return pageServiceUtil.getDataTable(new ArrayList<>());
|
return pageServiceUtil.getDataTable(new ArrayList<>());
|
||||||
}
|
}
|
||||||
|
//筛选未提交路径、组装数据
|
||||||
List<MyFollowUpVO> myFollowUpVOS = new ArrayList<>();
|
List<MyFollowUpVO> myFollowUpVOS = new ArrayList<>();
|
||||||
for (MyFollowUpVO myFollowUpVO : myFollowUpList) {
|
for (MyFollowUpVO myFollowUpVO : myFollowUpList) {
|
||||||
|
//筛选未提交路径
|
||||||
if (Objects.nonNull(myFollowUpVO.getSign()) && myFollowUpVO.getSign() == 0) {
|
if (Objects.nonNull(myFollowUpVO.getSign()) && myFollowUpVO.getSign() == 0) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
//组装数据
|
||||||
if (Objects.nonNull(myFollowUpVO.getDischargeTime())) {
|
if (Objects.nonNull(myFollowUpVO.getDischargeTime())) {
|
||||||
myFollowUpVO.setFollowDate(myFollowUpVO.getDischargeTime().plusDays(myFollowUpVO.getRouteNodeDay()));
|
myFollowUpVO.setFollowDate(myFollowUpVO.getDischargeTime().plusDays(myFollowUpVO.getRouteNodeDay()));
|
||||||
myFollowUpVO.setManageRouteNodeName(RouteNodeNameEnum.getNameByInfo(myFollowUpVO.getRouteNodeName()).getName());
|
myFollowUpVO.setManageRouteNodeName(RouteNodeNameEnum.getNameByInfo(myFollowUpVO.getRouteNodeName()).getName());
|
||||||
@ -113,7 +117,7 @@ public class HomePageServiceImpl implements HomePageService {
|
|||||||
myFollowUpVOS.add(myFollowUpVO);
|
myFollowUpVOS.add(myFollowUpVO);
|
||||||
}
|
}
|
||||||
myFollowUpVOS.sort(Comparator.comparing(MyFollowUpVO::getFollowDate).reversed());
|
myFollowUpVOS.sort(Comparator.comparing(MyFollowUpVO::getFollowDate).reversed());
|
||||||
//处理上面查询的list集合
|
//分页
|
||||||
if (Objects.nonNull(myFollowUp.getNum()) || Objects.nonNull(myFollowUp.getSize())) {
|
if (Objects.nonNull(myFollowUp.getNum()) || Objects.nonNull(myFollowUp.getSize())) {
|
||||||
Integer pageNum = myFollowUp.getNum();
|
Integer pageNum = myFollowUp.getNum();
|
||||||
Integer pageSize = myFollowUp.getSize();
|
Integer pageSize = myFollowUp.getSize();
|
||||||
@ -268,6 +272,7 @@ public class HomePageServiceImpl implements HomePageService {
|
|||||||
public TableDataInfo satisfactionQuestionnaire(Long residentId) {
|
public TableDataInfo satisfactionQuestionnaire(Long residentId) {
|
||||||
pageServiceUtil.startPage();
|
pageServiceUtil.startPage();
|
||||||
List<SatisfactionQuestionnaire> satisfactionQuestionnaires = homePageMapper.satisfactionQuestionnaireByResidentId(residentId, QuestionTypeEnum.SATISFACTION_QUESTIONNAIRE.getInfo(), QuestionnaireStatusEnum.PUBLISHED.getInfo());
|
List<SatisfactionQuestionnaire> satisfactionQuestionnaires = homePageMapper.satisfactionQuestionnaireByResidentId(residentId, QuestionTypeEnum.SATISFACTION_QUESTIONNAIRE.getInfo(), QuestionnaireStatusEnum.PUBLISHED.getInfo());
|
||||||
|
//判断是否完成
|
||||||
for (SatisfactionQuestionnaire satisfactionQuestionnaire : satisfactionQuestionnaires) {
|
for (SatisfactionQuestionnaire satisfactionQuestionnaire : satisfactionQuestionnaires) {
|
||||||
if (Objects.isNull(satisfactionQuestionnaire.getPatientQuestionSubmitResultId())) {
|
if (Objects.isNull(satisfactionQuestionnaire.getPatientQuestionSubmitResultId())) {
|
||||||
satisfactionQuestionnaire.setSign("incomplete");
|
satisfactionQuestionnaire.setSign("incomplete");
|
||||||
@ -286,22 +291,26 @@ public class HomePageServiceImpl implements HomePageService {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public AjaxResult selectSignPatientManageRouteNode(Long residentId) {
|
public AjaxResult selectSignPatientManageRouteNode(Long residentId) {
|
||||||
|
//查询已执行人工随访
|
||||||
List<MessageTabulationVO> signPatientManageRouteNodes = homePageMapper.selectManageRouteByResidentId(residentId, NodeExecuteStatusEnum.EXECUTED.getInfo());
|
List<MessageTabulationVO> signPatientManageRouteNodes = homePageMapper.selectManageRouteByResidentId(residentId, NodeExecuteStatusEnum.EXECUTED.getInfo());
|
||||||
if (CollectionUtils.isEmpty(signPatientManageRouteNodes)) {
|
if (CollectionUtils.isEmpty(signPatientManageRouteNodes)) {
|
||||||
return AjaxResult.success(new ArrayList<>());
|
return AjaxResult.success(new ArrayList<>());
|
||||||
}
|
}
|
||||||
|
//过滤电话外呼数据
|
||||||
|
List<MessageTabulationVO> messageTabulationVOS = new ArrayList<>();
|
||||||
for (MessageTabulationVO manageRouteNode : signPatientManageRouteNodes) {
|
for (MessageTabulationVO manageRouteNode : signPatientManageRouteNodes) {
|
||||||
if (Objects.isNull(manageRouteNode) || TaskContentEnum.PHONE_OUTBOUND.getInfo().equals(manageRouteNode.getTaskNodeType())) {
|
if (Objects.isNull(manageRouteNode) || TaskContentEnum.PHONE_OUTBOUND.getInfo().equals(manageRouteNode.getTaskNodeType())) {
|
||||||
signPatientManageRouteNodes.remove(manageRouteNode);
|
continue;
|
||||||
}
|
}
|
||||||
if (Objects.nonNull(manageRouteNode) && StringUtils.isNotBlank(manageRouteNode.getManageRouteName()) && StringUtils.isNotBlank(manageRouteNode.getRouteNodeName()) && Objects.nonNull(manageRouteNode.getRouteNodeDay())) {
|
if (StringUtils.isNotBlank(manageRouteNode.getManageRouteName()) && StringUtils.isNotBlank(manageRouteNode.getRouteNodeName()) && Objects.nonNull(manageRouteNode.getRouteNodeDay())) {
|
||||||
if (StringUtils.isNotBlank(manageRouteNode.getRouteNodeName())) {
|
if (StringUtils.isNotBlank(manageRouteNode.getRouteNodeName())) {
|
||||||
manageRouteNode.setRouteNodeName(RouteNodeNameEnum.getNameByInfo(manageRouteNode.getRouteNodeName()).getName());
|
manageRouteNode.setRouteNodeName(RouteNodeNameEnum.getNameByInfo(manageRouteNode.getRouteNodeName()).getName());
|
||||||
}
|
}
|
||||||
manageRouteNode.setRouteNodeName(manageRouteNode.getManageRouteName() + manageRouteNode.getRouteNodeName() + "第" + manageRouteNode.getRouteNodeDay() + "天");
|
manageRouteNode.setRouteNodeName(manageRouteNode.getManageRouteName() + manageRouteNode.getRouteNodeName() + "第" + manageRouteNode.getRouteNodeDay() + "天");
|
||||||
|
messageTabulationVOS.add(manageRouteNode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return AjaxResult.success(signPatientManageRouteNodes);
|
return AjaxResult.success(messageTabulationVOS);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user