From 69123c8bf13ccb27539b0475e626c6c95c0ea6bb Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 17 四月 2024 12:29:01 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/IvrTaskSingleServiceImpl.java | 87 +++++++++++++++++++++++++++----------------
1 files changed, 54 insertions(+), 33 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrTaskSingleServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrTaskSingleServiceImpl.java
index 8fc80bd..91b93f6 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrTaskSingleServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrTaskSingleServiceImpl.java
@@ -88,41 +88,64 @@
}
@Override
- public List<IvrVisitInfoVo> patItem(IvrTaskSingle ivrTaskcall) {
- List<IvrTaskSingle> list = this.selectIvrTaskcallList(ivrTaskcall);
+ public IvrTaskSingleVO queryTaskByCondition(IvrTaskSingle ivrTaskcall) {
+ //瀹氫箟鎮ｈ�呬笌鍗曚竴浠诲姟鍏宠仈琛ㄩ泦鍚�
+ List<PatTaskRelevance> patTaskRelevances = new ArrayList<>();
+ List<IvrTaskSingle> list = selectIvrTaskcallList(ivrTaskcall);
+ //灏嗘煡鍑烘潵鐨勬暟鎹�掑叆IvrTaskcallVO涓�
+ IvrTaskSingleVO ivrTaskcallVO2 = DtoConversionUtils.sourceToTarget(list.get(0), IvrTaskSingleVO.class);
+ String sendTimeSlot = list.get(0).getSendTimeSlot();
+ ObjectMapper objectMapper = new ObjectMapper();
+ try {
+ //鑾峰彇鍒板彂閫佹椂闂寸殑闆嗗悎
+ if (com.ruoyi.common.utils.StringUtils.isNotEmpty(sendTimeSlot)) {
+ List<TaskSendTimeVO> taskSendTimeVOList = objectMapper.readValue(sendTimeSlot, List.class);
+ ivrTaskcallVO2.setSendTimeslot(taskSendTimeVOList);
+ }
+ //鏂囨湰鍙橀噺鍙傛暟
+ if (com.ruoyi.common.utils.StringUtils.isNotEmpty(list.get(0).getTextParam())) {
+ Map<String, Map<String, String>> textParam = objectMapper.readValue(list.get(0).getTextParam(), Map.class);
+ ivrTaskcallVO2.setTextParam(textParam);
+ }
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ }
- //瀹氫箟杩斿弬鏁版嵁
- List<IvrVisitInfoVo> visitInfoVos = new ArrayList<>();
for (IvrTaskSingle ivrTaskcall1 : list) {
- IvrVisitInfoVo ivrVisitInfoVo = DtoConversionUtils.sourceToTarget(ivrTaskcall1, IvrVisitInfoVo.class);
- ivrVisitInfoVo.setPatientName(ivrTaskcall1.getSendname());
- if (ivrTaskcall.getRecordid() != null) {
- if (ivrTaskcall1.getHospType().equals("1")) {
- //闂ㄨ瘖闅忚
- PatMedOuthosp patMedOuthosp = patMedOuthospMapper.selectPatMedOuthospById(ivrTaskcall.getRecordid());
- ivrVisitInfoVo.setDiagname(patMedOuthosp.getDiagname());
- ivrVisitInfoVo.setDeptname(patMedOuthosp.getDeptname());
- ivrVisitInfoVo.setAdmitdate(patMedOuthosp.getAdmitdate());
- ivrVisitInfoVo.setVisitTime(ivrTaskcall1.getSendTimeSlot());
- ivrVisitInfoVo.setState(ivrTaskcall1.getSendstate());
- ivrVisitInfoVo.setHospno(patMedOuthosp.getOuthospno());
- visitInfoVos.add(ivrVisitInfoVo);
- } else if (ivrTaskcall1.getHospType().equals("2")) {
- //鍑洪櫌
- PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(ivrTaskcall.getRecordid());
- ivrVisitInfoVo.setDiagname(patMedInhosp.getDiagname());
- ivrVisitInfoVo.setDeptname(patMedInhosp.getDeptname());
- ivrVisitInfoVo.setAdmitdate(patMedInhosp.getStarttime());
- ivrVisitInfoVo.setVisitTime(ivrTaskcall1.getSendTimeSlot());
- ivrVisitInfoVo.setState(ivrTaskcall1.getSendstate());
- ivrVisitInfoVo.setHospno(patMedInhosp.getInhospno());
- ivrVisitInfoVo.setRoomno(patMedInhosp.getRoomno());
- ivrVisitInfoVo.setBedno(patMedInhosp.getBedno());
- visitInfoVos.add(ivrVisitInfoVo);
- }
+ PatTaskRelevance patTaskRelevance = new PatTaskRelevance();
+ if (!ivrTaskcall1.getHospType().equals("2")) {
+ log.info("闅忚鏌ヨ涓嶄负鍑洪櫌锛寋}", ivrTaskcall1.getHospType());
+ //鑾峰彇鍒版偅鑰呬俊鎭紝骞舵斁鍏ュ埌闆嗗悎涓�
+ patTaskRelevance.setName(ivrTaskcall1.getSendname());
+ patTaskRelevance.setAge(ivrTaskcall1.getAge());
+ patTaskRelevance.setSfzh(ivrTaskcall1.getSfzh());
+ patTaskRelevance.setPhone(ivrTaskcall1.getPhone());
+ patTaskRelevance.setAddr(ivrTaskcall1.getAddr());
+ patTaskRelevance.setDiagname(ivrTaskcall1.getDiagname());
+ patTaskRelevances.add(patTaskRelevance);
+ } else if (ivrTaskcall1.getHospType().equals("2")) {
+ log.info("闅忚鏌ヨ涓哄嚭闄紝{}", ivrTaskcall1.getHospType());
+ patTaskRelevance.setName(ivrTaskcall1.getSendname());
+ patTaskRelevance.setAge(ivrTaskcall1.getAge());
+ patTaskRelevance.setSfzh(ivrTaskcall1.getSfzh());
+ patTaskRelevance.setPhone(ivrTaskcall1.getPhone());
+ patTaskRelevance.setAddr(ivrTaskcall1.getAddr());
+ patTaskRelevance.setDeptName(ivrTaskcall1.getDeptname());
+ patTaskRelevance.setBedNo(ivrTaskcall1.getBadNo());
+ patTaskRelevance.setDiagname(ivrTaskcall1.getDiagname());
+ patTaskRelevances.add(patTaskRelevance);
}
}
- return visitInfoVos;
+
+ ivrTaskcallVO2.setPatTaskRelevances(patTaskRelevances);
+ return ivrTaskcallVO2;
+ }
+
+ @Override
+ public List<IvrTaskSingle> patItem(IvrTaskSingle ivrTaskSingle) {
+
+
+ return this.selectIvrTaskcallList(ivrTaskSingle);
}
/**
@@ -152,7 +175,6 @@
/**
* 鎵归噺鍒犻櫎鍗曚竴浠诲姟锛堥殢璁匡級
*
- * @param ids 闇�瑕佸垹闄ょ殑鍗曚竴浠诲姟锛堥殢璁匡級涓婚敭
* @return 缁撴灉
*/
@Override
@@ -167,7 +189,6 @@
/**
* 鍗曚竴浠诲姟
*
- * @param ivrTaskcallVO 鍗曚竴浠诲姟
* @return 缁撴灉
*/
@Transactional(rollbackFor = Exception.class)
--
Gitblit v1.9.3