From c410c133f21297fc2bf6fc32335652eb07eb6d52 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 08 七月 2025 11:20:38 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java | 28 ++++++++++++++
smartor/src/main/java/com/smartor/service/impl/ExternalInfoServiceImpl.java | 5 +-
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 20 ++++++++--
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 5 +-
smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml | 7 +++
smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java | 4 +
smartor/src/main/resources/mapper/smartor/ServiceTaskdeptMapper.xml | 4 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java | 13 +++++-
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 1
9 files changed, 73 insertions(+), 14 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
index cc5fd3e..49130ff 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -184,7 +184,7 @@
//閫氳繃浠诲姟ID鎷垮埌鎮ｈ�呬俊鎭�
ServiceSubtaskVO ivrTaskcall = new ServiceSubtaskVO();
ivrTaskcall.setTaskid(commonTaskcallMQ.getTaskid());
- ivrTaskcall.setSendstate(1L);
+ ivrTaskcall.setSendstate(2L);
List<ServiceSubtask> selectServiceSubtaskList = ivrTaskcallMapper.selectServiceSubtaskList(ivrTaskcall);
if (descByCode.equals("鐢佃瘽")) {
for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
@@ -315,13 +315,13 @@
// sendMagParam.setUrl(ip + ":" + req_path + "/followvisit/particty?param1=" + taskId + "¶m2=" + patid + "¶m5=false");
//杞垚16杩涘埗
String format = String.format("%03X", serviceOutPath.getId()) + RandomStringGenerator.generateRandomString();
- ;
serviceOutPath.setRadix(format);
serviceOutPath.setUpdateTime(new Date());
iServiceOutPathService.updateServiceOutPath(serviceOutPath);
sendMagParam.setPhone(serviceSubtask.getPhone());
sendMagParam.setUrl(ip + ":" + req_path + "/sf?p=" + format);
sendMagParam.setContent("鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌闅忚璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + " 濉啓銆傛劅璋㈡偍閰嶅悎锛�");
+ log.info("888888888888:{}",sendMagParam);
} else if (type == 2) {
//闂埜锛堥棶棰橈級
ServiceOutPath serviceOutPath = new ServiceOutPath();
@@ -335,6 +335,7 @@
serviceOutPath.setRadix(format);
serviceOutPath.setUpdateTime(new Date());
iServiceOutPathService.updateServiceOutPath(serviceOutPath);
+
// sendMagParam.setUrl(ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false");
sendMagParam.setPhone(serviceSubtask.getPhone());
sendMagParam.setUrl(ip + ":" + req_path + "/wt?p=" + format);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
index 8a75226..622234a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
@@ -4,6 +4,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.github.pagehelper.ISelect;
+import com.ruoyi.common.utils.PageUtils;
import com.smartor.domain.PatMedReq;
import com.smartor.domain.PatMedRes;
import io.swagger.annotations.Api;
@@ -48,9 +50,16 @@
@PostMapping("/selectPatMedOuthospList")
@ApiOperation("鏌ヨ鎮ｈ�呴棬璇婅褰曞垪琛�")
public TableDataInfo selectPatMedOuthosplist(@RequestBody PatMedOuthosp patMedOuthosp) {
- startPage();
+ PageUtils.startPageByPost(patMedOuthosp.getPageNum(), patMedOuthosp.getPageSize());
List<PatMedOuthosp> list = patMedOuthospService.selectPatMedOuthospList(patMedOuthosp);
- return getDataTable(list);
+
+ long count = PageUtils.count(new ISelect() {
+ @Override
+ public void doSelect() {
+ patMedOuthospService.selectPatMedOuthospList(patMedOuthosp);
+ }
+ });
+ return getDataTable2(count, list);
}
/**
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java b/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
index 8e6c136..df2fbbd 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
@@ -192,4 +192,32 @@
@ApiModelProperty(value = "绫诲埆锛�0鎬ヨ瘖 1闂ㄨ瘖")
private String category;
+
+ /**
+ * 灏辫瘖寮�濮嬫椂闂�
+ */
+ @ApiModelProperty(value = "灏辫瘖寮�濮嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date starttime;
+
+ /**
+ * 灏辫瘖缁撴潫鏃堕棿
+ */
+ @ApiModelProperty(value = "灏辫瘖缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date endtime;
+
+
+ /**
+ * pageNum
+ */
+ @ApiModelProperty("pageNum")
+ private Integer pageNum;
+
+ /**
+ * pageSize
+ */
+ @ApiModelProperty("pageSize")
+ private Integer pageSize;
+
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/ExternalInfoServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ExternalInfoServiceImpl.java
index 4c5aaa9..32b1d12 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ExternalInfoServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ExternalInfoServiceImpl.java
@@ -185,10 +185,11 @@
patMedOuthosp.setPatid(patid);
PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patid);
patMedOuthosp.setPatname(patArchive.getName());
+ patMedOuthosp.setPatno(patArchive.getPatientno());
patMedOuthosp.setDeptcode("" + externalOutHospInfo1.getKsdm());
patMedOuthosp.setDeptname(externalOutHospInfo1.getKsmc());
- patMedOuthosp.setDiagname(externalOutHospInfo1.getZddm());
- patMedOuthosp.setIcd10code(externalOutHospInfo1.getZdmc());
+ patMedOuthosp.setDiagname(externalOutHospInfo1.getZdmc());
+ patMedOuthosp.setIcd10code(externalOutHospInfo1.getZddm());
patMedOuthosp.setDrcode(externalOutHospInfo1.getYsdm().toString());
patMedOuthosp.setDrname(externalOutHospInfo1.getYsmc());
patMedOuthosp.setAdmitdate(externalOutHospInfo1.getJzrq());
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index e7fa277..54a8f50 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -439,6 +439,19 @@
return map;
}
+ //鑾峰彇闅忚鏃堕棿
+ Date visitTime = null;
+ List<TaskSendTimeVO> sendTimeslot = serviceTaskVO.getSendTimeslot();
+ if (CollectionUtils.isNotEmpty(sendTimeslot) && sendTimeslot.size() > 0) {
+ String dateString = sendTimeslot.get(0).getBegantime();
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ try {
+ visitTime = format.parse(dateString);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
//灏嗕换鍔′俊鎭斁鍒版湇鍔¤〃涓�
ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTaskVO, ServiceSubtask.class);
serviceSubtask.setTaskid(serviceTask.getTaskid().longValue());
@@ -450,13 +463,12 @@
//灏嗕换鍔′俊鎭柊澧炲埌闅忚鏈嶅姟琛ㄤ腑
serviceSubtask.setSendname(patTaskRelevance.getName());
serviceSubtask.setAge(patTaskRelevance.getAge());
-// serviceSubtask.setLibtemplateid(Long.valueOf(serviceTask.getLibtemplateid()));
serviceSubtask.setSfzh(patTaskRelevance.getIdcardno());
serviceSubtask.setPhone(patTaskRelevance.getTelcode());
serviceSubtask.setAddr(patTaskRelevance.getAddr());
serviceSubtask.setPatid(patTaskRelevance.getPatid());
serviceSubtask.setCreateTime(DateUtils.getNowDate());
- serviceSubtask.setSendstate(1L);
+ serviceSubtask.setSendstate(2L);
if (serviceTaskVO.getLongTask() != null && serviceTaskVO.getLongTask() == 1)
serviceSubtask.setSendstate(2L);
serviceSubtask.setDeptcode(patTaskRelevance.getDeptCode());
@@ -472,7 +484,7 @@
serviceSubtask.setEndtime(patTaskRelevance.getEndtime());
serviceSubtask.setNurseId(patTaskRelevance.getNurseId());
serviceSubtask.setNurseName(patTaskRelevance.getNurseName());
- serviceSubtask.setVisitTime(patTaskRelevance.getVisitTime());
+ serviceSubtask.setVisitTime(visitTime);
if (serviceTask.getSendType() == 2) {
serviceSubtask.setVisitTime(new Date());
}
@@ -596,7 +608,7 @@
if (patTaskRelevance.getIsoperation() == 2) serviceSubtask.setUpdateTime(new Date());
serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
if (patTaskRelevance.getIsoperation() == 1) {
- serviceSubtask.setSendstate(1L);
+ serviceSubtask.setSendstate(2L);
serviceSubtask.setCreateTime(new Date());
serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
index 024bb98..fa1ca32 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
@@ -177,7 +177,7 @@
serviceSubtask.setDelFlag("1");
Boolean aBoolean = serviceSubtaskMapper.updateServiceSubtaskByPatId(serviceSubtask);
-
+ log.error("sfSend闇�瑕佺Щ闄ょ殑缁撴灉涓猴細{}", aBoolean);
//鍏宠仈琛ㄥ垹闄�
ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
serviceTaskdept.setTaskId(taskid);
@@ -372,6 +372,8 @@
}
svyLibTemplateScriptVO.setSvyLibTemplateTargetoptions(svyLibTemplateTargetoptions);
}
+ //杩欎笢瑗垮湪鏃犻敗 锛屼細浣胯姹備笉鍒板悗绔�
+ svyLibTemplateScriptVO.setOtherdata(null);
}
svyLibTemplateScriptVOS.sort(Comparator.comparingLong(SvyLibTemplateScriptVO::getSort));
return svyLibTemplateScriptVOS;
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
index c44de47..be7d71a 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
@@ -117,7 +117,12 @@
<if test="deptname != null and deptname != ''">and b.deptname like concat('%', #{deptname}, '%')</if>
<if test="deptcode != null and deptcode != ''">and b.deptcode =#{deptcode}</if>
<if test="drname != null and drname != ''">and b.drname like concat('%', #{drname}, '%')</if>
- <if test="admitdate != null ">and b.admitdate = #{admitdate}</if>
+ <if test="starttime != null ">and date_format(pmo.admitdate,'%y%m%d') >=
+ date_format(#{starttime},'%y%m%d')
+ </if>
+ <if test="endtime != null ">and date_format(pmo.admitdate,'%y%m%d') <=
+ date_format(#{endtime},'%y%m%d')
+ </if>
<if test="orgid != null and orgid != ''">and b.orgid = #{orgid}</if>
<if test="outhospno != null and outhospno != ''">and b.outhospno = #{outhospno}</if>
<if test="category != null and category != ''">and b.category = #{category}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 049578b..31c47bc 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -716,6 +716,7 @@
<if test="suggest != null ">suggest=#{suggest},</if>
<if test="inhospid != null ">inhospid=#{inhospid},</if>
<if test="visitTime != null ">visitTime=#{visitTime},</if>
+ <if test="delFlag != null ">del_flag=#{delFlag},</if>
</trim>
<where>
<if test="patid != null ">patid=#{patid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskdeptMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskdeptMapper.xml
index f0a5ab4..24b03a3 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskdeptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskdeptMapper.xml
@@ -191,8 +191,8 @@
update_time = #{updateTime}
</trim>
<where>
- <if test="id != null">and id = #{id},</if>
- <if test="taskId != null">and task_id = #{taskId},</if>
+ <if test="id != null">and id = #{id}</if>
+ <if test="taskId != null">and task_id = #{taskId}</if>
</where>
</update>
--
Gitblit v1.9.3