From 88c5064877fa22316d794c225fff3ceced4371f3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 03 三月 2025 20:03:43 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 27 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java | 2
smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml | 29 ++--
smartor/src/main/java/com/smartor/domain/ExternalDiagnosisInfo.java | 159 ++++++++++++++++++++++++++
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 50 ++++++--
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 8 +
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml | 7 +
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 6
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 4
ruoyi-admin/src/main/resources/application-druid.yml | 21 +-
smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java | 5
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 6
smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java | 5
13 files changed, 285 insertions(+), 44 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java
index bcfc7f7..4fb2526 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java
@@ -107,6 +107,7 @@
@ApiOperation("鎮ｈ�呴棶棰樼粨鏋滆褰�(澶栭摼)")
@PostMapping("/saveQuestionAnswer")
public AjaxResult saveQuestionAnswer(@RequestBody ServiceSubTaskAnswerReq serviceSubTaskAnswerReq) {
+ log.error("-----saveQuestionAnswer鏂规硶鐨勫叆鍙備负锛歿}", serviceSubTaskAnswerReq);
return toAjax(serviceSubtaskAnswerService.saveQuestionAnswer(serviceSubTaskAnswerReq, 0L));
}
@@ -121,6 +122,7 @@
@ApiOperation("鎮ｈ�呴棶棰樼粨鏋滆褰�(灏忕▼鍏呭閾�)")
@PostMapping("/saveQuestionAnswerXCH")
public AjaxResult saveQuestionAnswerXCH(@RequestBody ServiceSubTaskAnswerReq serviceSubTaskAnswerReq) {
+ log.error("-------saveQuestionAnswerXCH鐨勫叆鍙傜殑鍊间负锛歿}", serviceSubTaskAnswerReq);
return toAjax(serviceSubtaskAnswerService.saveQuestionAnswer(serviceSubTaskAnswerReq, 1L));
}
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 02b7b84..d07c9df 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -17,18 +17,19 @@
# username: smartor
# password: Smartor.2023
# driverClassName: com.mysql.cj.jdbc.Driver
- # 鏂板崕
- # url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- # username: smartor
- # password: Smartor.2023
- # driverClassName: com.mysql.cj.jdbc.Driver
-
- # 鍏徃浜�
- url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: hxsoft
- password: Hxerp2000
+ # # 鏂板崕
+ url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: smartor
+ password: Smartor.2023
driverClassName: com.mysql.cj.jdbc.Driver
+# # 鍏徃浜�
+# url: jdbc:mysql://116.62.18.175:6002/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# username: hxsoft
+# password: Hxerp2000
+# driverClassName: com.mysql.cj.jdbc.Driver
+
+
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴(鍏徃)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 30d1d81..4a42a20 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -369,7 +369,8 @@
//绾歌川
} else if (descByCode.equals("寰俊灏忕▼搴�")) {
//寰俊灏忕▼搴�
- if (ivrTask1.getPatCycle() == 1) {
+ log.error("ivrTask1鐨勫�间负锛歿}", ivrTask1);
+ if (ObjectUtils.isNotEmpty(ivrTask1) && ivrTask1.getPatCycle() == 1) {
//璇存槑璇ヤ换鍔＄殑鎮ｈ�呮槸寰幆鎵ц鐨�
ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
serviceSubtaskVO.setTaskid(ivrTask1.getTaskid());
@@ -623,7 +624,7 @@
patArchive.setSex(thiedInhospInfo.getPatiRecordGender().equals("鐢�") ? 1L : 2L);
patArchive.setNation(thiedInhospInfo.getPatiNation());
patArchive.setNativePlace(thiedInhospInfo.getPatiNationality());
- patArchive.setPlaceOfResidence(thiedInhospInfo.getPatiHomeAddr());
+ patArchive.setPlaceOfResidence(StringUtils.isNotEmpty(thiedInhospInfo.getPatiHomeAddr()) ? thiedInhospInfo.getPatiHomeAddr().replace("null", "") : "");
try {
if (StringUtils.isNotEmpty(thiedInhospInfo.getPatiBirthday()))
patArchive.setBirthdate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(thiedInhospInfo.getPatiBirthday()));
@@ -698,6 +699,7 @@
patMedInhosp.setLeavehospitaldistrictcode(thiedInhospInfo.getCurrWardId());
patMedInhosp.setLeavehospitaldistrictname(thiedInhospInfo.getCurrWardName());
patMedInhosp.setLeaveldeptid(thiedInhospInfo.getCurrDeptCode());
+ patMedInhosp.setOrgid("1");
//濡傛灉鏄嚭闄紝鍏堥�氳繃鎮ｈ�呯紪鍙峰拰娴佹按鍙峰幓鏌ヤ竴涓嬶紝鎮ｈ�呮槸鍚﹀瓨鍦紝濡傛灉瀛樺湪锛屽垯杩涜淇敼
PatMedInhosp inhosp = new PatMedInhosp();
inhosp.setPatno(patArchive.getPatientno());
diff --git a/smartor/src/main/java/com/smartor/domain/ExternalDiagnosisInfo.java b/smartor/src/main/java/com/smartor/domain/ExternalDiagnosisInfo.java
new file mode 100644
index 0000000..2ed984a
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/ExternalDiagnosisInfo.java
@@ -0,0 +1,159 @@
+package com.smartor.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author 鎺ユ敹绗笁鏂规偅鑰呰瘖鏂俊鎭�
+ * @date 2024-12-13
+ */
+@Data
+@ApiModel(value = "ExternalInHospPatientInfo", description = "鎺ユ敹绗笁鏂规偅鑰呰瘖鏂俊鎭�")
+public class ExternalDiagnosisInfo extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "璇婃柇绫诲埆浠ｇ爜")
+ private String ZhenDuanLBDM;
+
+ @ApiModelProperty(value = "璇婃柇绫诲埆鍚嶇О")
+ private String ZhenDuanLBMC;
+
+ @ApiModelProperty(value = "涓尰璇婃柇鏍囧織")
+ private String ZhongYiZDBZ;
+
+ @ApiModelProperty(value = "涓尰鐥囦警 ID")
+ private String ZhongYiZHID;
+
+ @ApiModelProperty(value = "涓尰鐥囦警鍚嶇О")
+ private String ZhongYiZHMC;
+
+ @ApiModelProperty(value = "璇婃柇鍖荤敓 ID")
+ private String ZhenDuanYSID;
+
+ @ApiModelProperty(value = "璇婃柇鍖荤敓濮撳悕")
+ private String ZhenDuanYSXM;
+
+ @ApiModelProperty(value = "璇婃柇鏃堕棿")
+ private String ZhenDuanSJ;
+
+ @ApiModelProperty(value = "鍙戠梾鏃ユ湡")
+ private String FaBingRQ;
+
+ @ApiModelProperty(value = "璇婃柇 ID")
+ private String ZhenDuanID;
+
+ @ApiModelProperty(value = "璇婃柇鍚嶇О")
+ private String ZhenDuanMC;
+
+ @ApiModelProperty(value = "璇佷欢鍙风爜")
+ private String ZhengJianHM;
+
+ @ApiModelProperty(value = "鎬у埆浠ｇ爜")
+ private String XingBieDM;
+
+ @ApiModelProperty(value = "鎬у埆鍚嶇О")
+ private String XingBieMC;
+
+ @ApiModelProperty(value = "鍑虹敓鏃ユ湡")
+ private Date ChuShengRQ;
+
+ @ApiModelProperty(value = "骞撮緞")
+ private Long NianLing;
+
+ @ApiModelProperty(value = "骞撮緞鍗曚綅")
+ private String NianLingDW;
+
+ @ApiModelProperty(value = "褰撳墠绉戝ID 鍏ラ櫌绉戝 ID")
+ private String DangQianKSID;
+
+ @ApiModelProperty(value = "褰撳墠绉戝鍚嶇О 鍏ラ櫌绉戝鍚嶇О")
+ private String DangQianKSMC;
+
+ @ApiModelProperty(value = "褰撳墠鐥呭尯ID 鍏ラ櫌鐥呭尯ID")
+ private String DangQianBQID;
+
+ @ApiModelProperty(value = "褰撳墠鐥呭尯鍚嶇О 鍏ラ櫌鐥呭尯鍚嶇О")
+ private String DangQianBQMC;
+
+ @ApiModelProperty(value = "褰撳墠搴婁綅ID 鍏ラ櫌搴婁綅 ID")
+ private String DangQianCWID;
+
+ @ApiModelProperty(value = "褰撳墠搴婁綅鍚嶇О 鍏ラ櫌搴婁綅鍚嶇О")
+ private String DangQianCWMC;
+
+ @ApiModelProperty(value = "浣忛櫌娆℃暟")
+ private Long ZhuYuanCS;
+
+ @ApiModelProperty(value = "鍏ラ櫌鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date RuYuanSJ;
+
+ @ApiModelProperty(value = "璐圭敤绫诲埆 ID")
+ private String FeiYongLBID;
+
+ @ApiModelProperty(value = "璐圭敤绫诲埆鍚嶇О")
+ private String FeiYongLBMC;
+
+ @ApiModelProperty(value = "璐圭敤鎬ц川 ID")
+ private String FeiYongXZID;
+
+ @ApiModelProperty(value = "璐圭敤鎬ц川鍚嶇О")
+ private String FeiYongXZMC;
+
+ @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+ private String LianXiDH;
+
+ @ApiModelProperty(value = "鑱旂郴浜虹數璇�")
+ private String LianXiRDH;
+
+ @ApiModelProperty(value = "鍗曚綅鐢佃瘽")
+ private String DanWeiDH;
+
+ @ApiModelProperty(value = "鍗曚綅鍚嶇О")
+ private String DanWeiMC;
+
+ @ApiModelProperty(value = "濠氬Щ浠ｇ爜")
+ private String HunYinDM;
+
+ @ApiModelProperty(value = "濠氬Щ鍚嶇О")
+ private String HunYinMC;
+
+ @ApiModelProperty(value = "鑱屼笟浠ｇ爜")
+ private String ZhiYeDM;
+
+ @ApiModelProperty(value = "鑱屼笟鍚嶇О")
+ private String ZhiYeMC;
+
+ @ApiModelProperty(value = "鍥界睄浠ｇ爜")
+ private String GuoJiDM;
+
+ @ApiModelProperty(value = "鍥界睄鍚嶇О")
+ private String GuoJiMC;
+
+ @ApiModelProperty(value = "姘戞棌浠ｇ爜")
+ private String MinZuDM;
+
+ @ApiModelProperty(value = "姘戞棌鍚嶇О")
+ private String MinZuMC;
+
+ @ApiModelProperty(value = "鎿嶄綔浜� ID")
+ private String CaoZuoRID;
+
+ @ApiModelProperty(value = "鎿嶄綔浜哄鍚�")
+ private String CaoZuoRXM;
+
+ @ApiModelProperty(value = "濠村効鏍囧織")
+ private String YingErBZ;
+
+ @ApiModelProperty(value = "姣嶄翰灏辫瘖 ID")
+ private String MuQinZYJZID;
+
+ @ApiModelProperty(value = "浜у鏍囧織")
+ private String ChanFuBZ;
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
index 7085ac1..fe82b2c 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
@@ -619,5 +619,10 @@
@ApiModelProperty(value = "缁撴潫鍑洪櫌鏃ユ湡")
private Date endOutHospTime;
+ /**
+ * 绉戝涓庣梾鍖虹殑鏌ヨ鏄痮r杩樻槸and: 1:and(榛樿) 2:or
+ */
+ @ApiModelProperty(value = "绉戝涓庣梾鍖虹殑鏌ヨ鏄痮r杩樻槸and: 1:and(榛樿) 2:or ")
+ private String deptOrDistrict = "1";
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
index c0bbaa3..6ec52e2 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -215,6 +215,12 @@
List<ServiceCheck> serviceChecks = serviceCheckMapper.selectServiceCheckList(serviceCheck);
//鑾峰彇鎮ｈ�呬俊鎭�
PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
+ if (Objects.isNull(patArchive)) {
+ patMedInhosp1.setCheckFlag("2");
+ patMedInhosp1.setLongTaskReason("鎮ｈ�呭熀鏈俊鎭负绌�");
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ continue;
+ }
try {
if (CollectionUtils.isEmpty(serviceChecks) || serviceChecks != null && serviceChecks.get(0).getCheckVisitFlag() == 1 || serviceChecks != null && serviceChecks.get(0).getCheckVisitFlag() == 3) {
//鏍规嵁鎮ｈ�呮墍鍦ㄧ瀹わ紝鑾峰彇璇ョ瀹ょ殑闀挎湡浠诲姟
@@ -395,6 +401,8 @@
i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
}
}
+ } else {
+ i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
}
} else {
i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
index 744839d..311421c 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -326,7 +326,20 @@
@Override
public Boolean addFinshJZInfo(Map dataMap) {
- //杩欎釜鍏堢瓑绛�
+ log.error("ServiceExternalServiceImpl---addFinshJZInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+// Map yeWuXX = (Map) dataMap.get("YeWuXX");
+// Map<String, Object> BingRenXX = (Map<String, Object>) yeWuXX.get("BingRenXX");
+// Map<String, Object> JiuZhenXX = (Map<String, Object>) yeWuXX.get("JiuZhenXX");
+// ExternalInHospPatientInfo externalInHospPatientInfo = BeanUtil.mapToBean(BingRenXX, ExternalInHospPatientInfo.class, true);
+// PatMedOuthosp patMedOuthosp = new PatMedOuthosp();
+// patMedOuthosp.setOuthospno(externalInHospPatientInfo.getBingAnHao());
+// patMedOuthosp.setSerialnum(externalInHospPatientInfo.getBingAnHao());
+// patMedOuthosp.setPatid(Long.valueOf(externalInHospPatientInfo.getBingRenID()));
+// patMedOuthosp.setPatname(externalInHospPatientInfo.getXingMing());
+// patMedOuthosp.setHospitalname(externalInHospPatientInfo.getZuZhiJGMC());
+// patMedOuthosp.setHospitalcode(externalInHospPatientInfo.getZuZhiJGID());
+// patMedOuthosp.setIcd10code();
+
return null;
}
@@ -530,13 +543,17 @@
patArchive.setNation(externalInHospPatientInfo.getMinZuMC());
patArchive.setNativePlace(externalInHospPatientInfo.getGuoJiMC());
if (ObjectUtils.isNotEmpty(externalInHospPatientAddrInfo)) {
- patArchive.setPlaceOfResidence(externalInHospPatientAddrInfo.getShengFenMC() + externalInHospPatientAddrInfo.getShiDiQMC() + externalInHospPatientAddrInfo.getXianQuMC() + externalInHospPatientAddrInfo.getXiangZhenMC() + externalInHospPatientAddrInfo.getCunJiMC() + externalInHospPatientAddrInfo.getQiTaXX());
- patArchive.setBirthplace(externalInHospPatientAddrInfo.getShengFenMC() + externalInHospPatientAddrInfo.getShiDiQMC() + externalInHospPatientAddrInfo.getXianQuMC() + externalInHospPatientAddrInfo.getXiangZhenMC() + externalInHospPatientAddrInfo.getCunJiMC() + externalInHospPatientAddrInfo.getQiTaXX());
+ String por = externalInHospPatientAddrInfo.getShengFenMC() + externalInHospPatientAddrInfo.getShiDiQMC() + externalInHospPatientAddrInfo.getXianQuMC() + externalInHospPatientAddrInfo.getXiangZhenMC() + externalInHospPatientAddrInfo.getCunJiMC() + externalInHospPatientAddrInfo.getQiTaXX();
+ patArchive.setPlaceOfResidence(por.replace(null, ""));
+ String bp = externalInHospPatientAddrInfo.getShengFenMC() + externalInHospPatientAddrInfo.getShiDiQMC() + externalInHospPatientAddrInfo.getXianQuMC() + externalInHospPatientAddrInfo.getXiangZhenMC() + externalInHospPatientAddrInfo.getCunJiMC() + externalInHospPatientAddrInfo.getQiTaXX();
+ patArchive.setBirthplace(bp.replace(null, ""));
}
patArchive.setBirthdate(externalInHospPatientInfo.getChuShengRQ());
patArchive.setAge(externalInHospPatientInfo.getNianLing());
patArchive.setAgeUnit(externalInHospPatientInfo.getNianLingDW());
patArchive.setTelcode(externalInHospPatientInfo.getLianXiDH());
+ if (StringUtils.isEmpty(externalInHospPatientInfo.getLianXiDH()))
+ patArchive.setTelcode(externalInHospPatientInfo.getLianXiRDH());
patArchive.setRelativetelcode(externalInHospPatientInfo.getLianXiRDH());
patArchive.setGuid(externalInHospPatientInfo.getZuZhiJGID());
patArchive.setOrgid(externalInHospPatientInfo.getZuZhiJGID());
@@ -584,6 +601,8 @@
patMedInhosp.setLeavehospitaldistrictcode(externalInHospPatientInfo.getDangQianBQID());
patMedInhosp.setHospitaldistrictname(externalInHospPatientInfo.getDangQianBQMC());
patMedInhosp.setLeavehospitaldistrictname(externalInHospPatientInfo.getDangQianBQMC());
+ patMedInhosp.setTelcode(patArchive.getTelcode());
+ patMedInhosp.setDrname("");
}
if (ObjectUtils.isNotEmpty(externalInHospPatientDiagnoseInfo)) {
patMedInhosp.setIcd10code(StringUtils.isNotEmpty(patMedInhosp.getIcd10code()) ? patMedInhosp.getIcd10code() + "," + externalInHospPatientDiagnoseInfo.getZhenDuanID() : externalInHospPatientDiagnoseInfo.getZhenDuanID());
@@ -594,7 +613,7 @@
patMedInhosp.setPatid(patArchive.getId());
patMedInhosp.setPatno(patArchive.getPatientno());
patMedInhosp.setPatname(patArchive.getName());
- patMedInhosp.setDrname("");
+
patMedInhosp.setSchemestatus(1L);
patMedInhosp.setCreateTime(new Date());
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
index cb275c2..fa83eaf 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -236,6 +236,8 @@
}
}
}
+ } else {
+ continue;
}
//灏嗚key鍜寁alue浠巖edis涓紝鍒犻櫎
redisCache.deleteObject(key);
@@ -246,6 +248,8 @@
serviceSubtask.setSendstate(6L);
serviceSubtask.setExcep(serviceSubTaskAnswerReq.getExcep());
serviceSubtask.setFinishtime(new Date());
+ serviceSubtask.setUpdateTime(new Date());
+ log.error("灏嗚key鍜寁alue浠巖edis涓�,serviceSubtask鐨勫�间负--------锛歿}", serviceSubtask);
if (score != null) serviceSubtask.setScore(BigDecimal.valueOf(score));
serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
}
@@ -342,7 +346,7 @@
Map<String, Object> scriptInfoByCondition = serviceTaskService.getScriptInfoByCondition(serviceSubTaskQueryReq.getTaskid(), serviceSubTaskQueryReq.getPatid(), serviceSubTaskQueryReq.getIsFinish(), serviceSubTaskQueryReq.getPatfrom());
if (ObjectUtils.isNotEmpty(scriptInfoByCondition) && ObjectUtils.isNotEmpty(scriptInfoByCondition.get("script"))) {
- log.error("-----------scriptInfoByCondition鐨勫�间负锛歿}",scriptInfoByCondition);
+ log.error("-----------scriptInfoByCondition鐨勫�间负锛歿}", scriptInfoByCondition);
if (scriptInfoByCondition.get("type").equals("1")) {
List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOList = (List) scriptInfoByCondition.get("script");
for (IvrLibaTemplateScriptVO ivrLibaTemplateScriptVO : ivrLibaTemplateScriptVOList) {
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 6487261..4e62343 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -1081,6 +1081,8 @@
double score = redisCache.getCacheObject(phoneCallReqYQVO.getUuid() + "SCORE");
serviceSubtask.setScore(BigDecimal.valueOf(score));
serviceSubtask.setFinishtime(new Date());
+ serviceSubtask.setUpdateTime(new Date());
+ log.error("鍏堟洿鏂颁竴涓嬪垎鏁�,鐢佃瘽鐨剆erviceSubtask鐨勫�间负锛歿}", serviceSubtask);
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
Map<String, String> map = delRedisValue(null, id.toString());
if (ObjectUtils.isNotEmpty(map)) redisCache.setCacheObject(map.get("cacheName"), map.get("val"));
@@ -1985,6 +1987,8 @@
serviceSubtask.setSendstate(6L);
serviceSubtask.setId(Long.valueOf(phoneCallRecordVO.getTaskid()));
serviceSubtask.setFinishtime(new Date());
+ serviceSubtask.setUpdateTime(new Date());
+ log.error("鐢佃瘽鎷ㄦ墦宸插畬鎴恠erviceSubtask鐨勫�间负:{}",serviceSubtask);
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
//涓嬭浇鏂囦欢
ftpService.downloadFolder("/" + LocalDate.now().toString(), profile + "/upload/vadio/voice/" + LocalDate.now().toString());
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 73fdfa3..e8fe8b5 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
@@ -10,6 +10,7 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.http.HttpUtils;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import com.smartor.domain.*;
import com.smartor.mapper.*;
@@ -353,7 +354,7 @@
}
//鏇挎崲鎮ｈ�呬釜浜轰俊鎭暟鎹�
log.error("闂id锛歿}, 闂鍐呭锛歿}", svyLibTemplateScriptVO.getId(), svyLibTemplateScriptVO.getScriptContent());
- if (StringUtils.isNotEmpty(svyLibTemplateScriptVO.getScriptContent())) {
+ if (StringUtils.isNotEmpty(svyLibTemplateScriptVO.getScriptContent()) && ObjectUtils.isNotEmpty(patArchive)) {
svyLibTemplateScriptVO.setScriptContent(svyLibTemplateScriptVO.getScriptContent().replace("${name}", StringUtils.isNotEmpty(patArchive.getName()) ? patArchive.getName() : ""));
svyLibTemplateScriptVO.setScriptContent(svyLibTemplateScriptVO.getScriptContent().replace("${dzz}", StringUtils.isNotEmpty(patArchive.getPlaceOfResidence()) ? patArchive.getPlaceOfResidence() : ""));
svyLibTemplateScriptVO.setScriptContent(svyLibTemplateScriptVO.getScriptContent().replace("${dhh}", StringUtils.isNotEmpty(patArchive.getTelcode()) ? patArchive.getTelcode() : ""));
@@ -376,6 +377,8 @@
serviceSubtask.setPatid(patid);
serviceSubtask.setResult("瀹屾垚");
serviceSubtask.setFinishtime(new Date());
+ serviceSubtask.setUpdateTime(new Date());
+ log.error("serviceSubtask---xjInfo-鐨勪慨鏀规暟鎹細{}", serviceSubtask);
serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
}
HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(Long.valueOf(templateId));
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index c114008..1282926 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -59,11 +59,13 @@
<result property="guid" column="guid"/>
<result property="operator" column="operator"/>
<result property="operatorId" column="operator_id"/>
+ <result property="remark" column="remark"/>
</resultMap>
<sql id="selectPatMedInhospVo">
select inhospid,
patname,
+ remark,
guid,
operator,
operator_id,
@@ -122,6 +124,7 @@
a.sex,
b.guid,
b.operator,
+ b.remark,
b.operator_id,
b.inhospid,
b.nurse_id,
@@ -253,6 +256,7 @@
b.patname,
b.operator_id,
b.operator,
+ b.remark,
b.out_way_id,
b.out_way_name,
b.nurse_id,
@@ -403,6 +407,7 @@
<if test="operator != null ">operator,</if>
<if test="operatorId != null ">operator_id,</if>
<if test="inhospno != null ">inhospno,</if>
+ <if test="remark != null ">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="serialnum != null">#{serialnum},</if>
@@ -455,6 +460,7 @@
<if test="operator != null ">#{operator},</if>
<if test="operatorId != null ">#{operatorId},</if>
<if test="inhospno != null ">#{inhospno},</if>
+ <if test="remark != null ">#{remark},</if>
</trim>
</insert>
@@ -510,6 +516,7 @@
<if test="guid != null ">guid = #{guid},</if>
<if test="operator != null ">operator = #{operator},</if>
<if test="operatorId != null ">operator_id = #{operatorId},</if>
+ <if test="remark != null ">remark = #{remark},</if>
</trim>
where inhospid = #{inhospid}
</update>
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 547a221..9c71231 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -198,19 +198,39 @@
<if test="longSendTime != null">
AND date_format(long_send_time,'%y%m%d') <= date_format(#{longSendTime},'%y%m%d')
</if>
- <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
- AND leavehospitaldistrictcode IN
- <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
- close=")">
- #{leavehospitaldistrictcode}
- </foreach>
+ <if test="deptOrDistrict==1">
+ <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
+ AND leavehospitaldistrictcode IN
+ <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="("
+ separator=","
+ close=")">
+ #{leavehospitaldistrictcode}
+ </foreach>
+ </if>
+ <if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
+ AND deptcode IN
+ <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
+ close=")">
+ #{leaveldeptcode}
+ </foreach>
+ </if>
</if>
- <if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
- AND deptcode IN
- <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
- close=")">
- #{leaveldeptcode}
- </foreach>
+ <if test="deptOrDistrict==2">
+ <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
+ AND leavehospitaldistrictcode IN
+ <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="("
+ separator=","
+ close=")">
+ #{leavehospitaldistrictcode}
+ </foreach>
+ </if>
+ <if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
+ OR deptcode IN
+ <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
+ close=")">
+ #{leaveldeptcode}
+ </foreach>
+ </if>
</if>
<if test="senddate != null ">and senddate = #{senddate}</if>
@@ -575,8 +595,10 @@
<if test="patfrom != null ">patfrom=#{patfrom},</if>
<if test="taskGuid != null ">taskGuid=#{taskGuid},</if>
</trim>
- <if test="patid != null ">and patid = #{patid}</if>
- <if test="taskid != null ">and taskid = #{taskid}</if>
+ <where>
+ <if test="patid != null ">and patid = #{patid}</if>
+ <if test="taskid != null ">and taskid = #{taskid}</if>
+ </where>
</update>
<update id="updateServiceSubtaskByCondition" parameterType="com.smartor.domain.ServiceSubtask">
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
index 3970f13..1c27746 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -58,11 +58,13 @@
<result property="nexttaskid" column="nexttaskid"/>
<result property="nexttaskname" column="nexttaskname"/>
<result property="appltype" column="appltype"/>
+ <result property="patCycle" column="pat_cycle"/>
</resultMap>
<sql id="selectServiceTaskVo">
select taskid,
task_name,
+ pat_cycle,
appltype,
send_day,
long_task,
@@ -248,18 +250,18 @@
service_task.orgid from service_task
<where>
service_task.del_flag=0
-<!-- and taskid in (-->
-<!-- select task_id from service_taskdept-->
-<!-- <where>-->
-<!-- <if test="leaveldeptcodes != null and leaveldeptcodes.size()>0">-->
-<!-- dept_code in-->
-<!-- <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","-->
-<!-- close=")">-->
-<!-- #{leaveldeptcode}-->
-<!-- </foreach>-->
-<!-- </if>-->
-<!-- </where>-->
-<!-- )-->
+ <!-- and taskid in (-->
+ <!-- select task_id from service_taskdept-->
+ <!-- <where>-->
+ <!-- <if test="leaveldeptcodes != null and leaveldeptcodes.size()>0">-->
+ <!-- dept_code in-->
+ <!-- <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","-->
+ <!-- close=")">-->
+ <!-- #{leaveldeptcode}-->
+ <!-- </foreach>-->
+ <!-- </if>-->
+ <!-- </where>-->
+ <!-- )-->
<if test="taskName != null and taskName != ''">and service_task.task_name like concat('%', #{taskName},
'%')
</if>
@@ -385,6 +387,7 @@
<if test="compensateDate != null and compensateDate != ''">compensate_date,</if>
<if test="sendDay != null ">send_day,</if>
<if test="appltype != null ">appltype,</if>
+ <if test="patCycle != null ">pat_cycle,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskName != null">#{taskName},</if>
@@ -438,6 +441,7 @@
<if test="compensateDate != null and compensateDate != ''">#{compensateDate}</if>
<if test="sendDay != null ">#{sendDay},</if>
<if test="appltype != null ">#{appltype},</if>
+ <if test="patCycle != null ">#{patCycle},</if>
</trim>
</insert>
@@ -497,6 +501,7 @@
<if test="compensateDate != null and compensateDate != ''">compensate_date = #{compensateDate}</if>
<if test="sendDay != null ">send_day = #{sendDay}</if>
<if test="appltype != null ">appltype = #{appltype}</if>
+ <if test="patCycle != null ">pat_cycle = #{patCycle}</if>
</trim>
where taskid = #{taskid}
</update>
--
Gitblit v1.9.3