From 111c93ba533e13d9b47660c1e68ab1f9a23cfb68 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 19 四月 2024 10:54:40 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/PatArchiveReq.java | 20 ++++
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 96 ++++++++++++-------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java | 1
smartor/src/main/java/com/smartor/domain/HeTaskSingleVO.java | 52 ++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/hanler/ChatWebSocketHandler.java | 26 +++-
smartor/src/main/java/com/smartor/service/impl/IvrTaskSingleServiceImpl.java | 3
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java | 2
smartor/src/main/resources/mapper/smartor/HeTaskSingleMapper.xml | 42 ++++++++
smartor/src/main/java/com/smartor/domain/HeTaskSingle.java | 50 ++++++++++
9 files changed, 245 insertions(+), 47 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/hanler/ChatWebSocketHandler.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/hanler/ChatWebSocketHandler.java
index 1540222..18fb07f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/hanler/ChatWebSocketHandler.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/hanler/ChatWebSocketHandler.java
@@ -184,7 +184,7 @@
// returnQues.setCode(null);
List<IvrLibaTemplateScriptVO> backQusetRedis = redisCache.getCacheObject(userId + "backQuset");
returnQues.setContent(JSON.toJSONString(backQusetRedis));
- returnQues.setJsy("鎰熻阿鎮ㄧ殑鑰愬績鍥炵瓟锛屽啀瑙�");
+ returnQues.setJsy(ivrLibaTemplateVO1.getRevisitAfter());
redisCache.setCacheObject(userId + "returnQues", returnQues, 120, TimeUnit.MINUTES);
redisCache.setCacheObject(userId + "isOver", 1, 120, TimeUnit.MINUTES);
@@ -205,7 +205,7 @@
redisCache.setCacheObject(userId + "noVoice", noVoice2, 120, TimeUnit.MINUTES);
}
} else {
- //瀵瑰洖绛旂殑闂,杩涜姝ｅ垯鍖归厤锛堣繖閲屽彧閽堝閫夋嫨棰橈紝鍏跺畠棰樺瀷涓嶈锛�
+ //瀵瑰洖绛旂殑闂,杩涜姝ｅ垯鍖归厤锛堣繖閲屽彧閽堝閫夋嫨棰橈紝鍏跺畠棰樺瀷涓嶈锛墄
for (int j = 0; j < ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().size(); j++) {
//鍖呭惈
Matcher matcher = null;
@@ -232,12 +232,22 @@
redisCache.setCacheObject(userId + "noVoice", 0, 120, TimeUnit.MINUTES);
//鑾峰彇涓嬩竴棰�
Integer nextQuestion = ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(j).getNextQuestion();
- for (IvrLibaTemplateScriptVO script : ivrLibaTemplateScriptVOList) {
- if (script.getTargetid() == nextQuestion) {
- QuestionMessage returnQues = new QuestionMessage();
- returnQues.setNowQuestion(script);
- redisCache.setCacheObject(userId + "returnQues", returnQues, 120, TimeUnit.MINUTES);
- break;
+ if (nextQuestion > ivrLibaTemplateScriptVOList.size()) {
+ //濡傛灉涓嬩竴棰樻病鏈変簡锛屽氨缁撴潫浜�
+ QuestionMessage returnQues = new QuestionMessage();
+ List<IvrLibaTemplateScriptVO> backQusetRedis = redisCache.getCacheObject(userId + "backQuset");
+ returnQues.setContent(JSON.toJSONString(backQusetRedis));
+ returnQues.setJsy(ivrLibaTemplateVO1.getRevisitAfter());
+ redisCache.setCacheObject(userId + "returnQues", returnQues, 120, TimeUnit.MINUTES);
+ redisCache.setCacheObject(userId + "isOver", 1, 120, TimeUnit.MINUTES);
+ } else {
+ for (IvrLibaTemplateScriptVO script : ivrLibaTemplateScriptVOList) {
+ if (script.getTargetid() == nextQuestion) {
+ QuestionMessage returnQues = new QuestionMessage();
+ returnQues.setNowQuestion(script);
+ redisCache.setCacheObject(userId + "returnQues", returnQues, 120, TimeUnit.MINUTES);
+ break;
+ }
}
}
break;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java
index 41cbb2a..dba7a42 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java
@@ -84,7 +84,6 @@
* 鏂板鎴栦慨鏀规寚鏍囦俊鎭�
*/
@ApiOperation("鏂板鎴栦慨鏀规寚鏍囦俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:target:edit')")
@Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.UPDATE)
@PostMapping("/saveOrupdateIvrLibaTarget")
public AjaxResult saveOrupdateIvrLibaTarget(@RequestBody IvrLibaTargetVO ivrLibaTargetVO) {
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index c3883d0..75fa536 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -108,7 +108,7 @@
// 杩囨护璇锋眰
.authorizeRequests()
// 瀵逛簬鐧诲綍login 娉ㄥ唽register 楠岃瘉鐮乧aptchaImage 鍏佽鍖垮悕璁块棶
- .antMatchers("/login", "/register", "/captchaImage", "/qrcode/generateStaticHtml", "/qrcode/getQRcode", "/qrcode/getFormDate", "/chat", "/system/file/admin/uploadFile", "/smartor/dingtalk/sendNotification", "/patient/read/patientInfo","/socket","/API_ESB_Service","/API_ESB_Service/Run","/magic/web/**","/smartor/taskcall/phoneCallBack").permitAll()
+ .antMatchers("/login", "/register", "/captchaImage", "/qrcode/generateStaticHtml", "/qrcode/getQRcode", "/qrcode/getFormDate", "/chat", "/system/file/admin/uploadFile", "/smartor/dingtalk/sendNotification", "/patient/read/patientInfo","/socket","/API_ESB_Service","/API_ESB_Service/Run","/magic/web/**","/smartor/tasksingle/phoneCallBack").permitAll()
// 闈欐�佽祫婧愶紝鍙尶鍚嶈闂�
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll().antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
// 闄や笂闈㈠鐨勬墍鏈夎姹傚叏閮ㄩ渶瑕侀壌鏉冭璇�
diff --git a/smartor/src/main/java/com/smartor/domain/HeTaskSingle.java b/smartor/src/main/java/com/smartor/domain/HeTaskSingle.java
index 2d9a063..7f9f1ce 100644
--- a/smartor/src/main/java/com/smartor/domain/HeTaskSingle.java
+++ b/smartor/src/main/java/com/smartor/domain/HeTaskSingle.java
@@ -331,4 +331,54 @@
@Excel(name = "绫诲瀷锛�1 瀹ｆ暀銆�2 鍖绘妧锛�")
@ApiModelProperty(value = "绫诲瀷锛�1 瀹ｆ暀銆�2 鍖绘妧锛�")
private String type;
+
+ /**
+ * 鍙戦�佹棩鏈�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 鍙戦�佹棩鏈� ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鍙戦�佹棩鏈�")
+ private Date senddate;
+
+ /**
+ * 涓婂崍寮�濮嬪彂閫佹椂闂撮檺鍒�
+ */
+ @Excel(name = " 涓婂崍寮�濮嬪彂閫佹椂闂撮檺鍒� ")
+ @ApiModelProperty(value = "涓婂崍寮�濮嬪彂閫佹椂闂撮檺鍒�")
+ private String sendlimitabegin;
+
+ /**
+ * 涓婂崍缁撴潫鍙戦�佹椂闂撮檺鍒�
+ */
+ @Excel(name = " 涓婂崍缁撴潫鍙戦�佹椂闂撮檺鍒� ")
+ @ApiModelProperty(value = "涓婂崍缁撴潫鍙戦�佹椂闂撮檺鍒�")
+ private String sendlimitaend;
+
+ /**
+ * 涓嬪崍寮�濮嬪彂閫佹椂闂撮檺鍒�
+ */
+ @Excel(name = " 涓嬪崍寮�濮嬪彂閫佹椂闂撮檺鍒� ")
+ @ApiModelProperty(value = "涓嬪崍寮�濮嬪彂閫佹椂闂撮檺鍒�")
+ private String sendlimitpbegin;
+
+ /**
+ * 涓嬪崍缁撴潫鍙戦�佹椂闂撮檺鍒�
+ */
+ @Excel(name = " 涓嬪崍缁撴潫鍙戦�佹椂闂撮檺鍒� ")
+ @ApiModelProperty(value = "涓嬪崍缁撴潫鍙戦�佹椂闂撮檺鍒�")
+ private String sendlimitpend;
+
+ /**
+ * 鏅氫笂寮�濮嬪彂閫佹椂闂撮檺鍒�
+ */
+ @Excel(name = " 鏅氫笂寮�濮嬪彂閫佹椂闂撮檺鍒� ")
+ @ApiModelProperty(value = "鏅氫笂寮�濮嬪彂閫佹椂闂撮檺鍒�")
+ private String sendlimitnbegin;
+
+ /**
+ * 鏅氫笂缁撴潫鍙戦�佹椂闂撮檺鍒�
+ */
+ @Excel(name = " 鏅氫笂缁撴潫鍙戦�佹椂闂撮檺鍒� ")
+ @ApiModelProperty(value = "鏅氫笂缁撴潫鍙戦�佹椂闂撮檺鍒�")
+ private String sendlimitnend;
}
diff --git a/smartor/src/main/java/com/smartor/domain/HeTaskSingleVO.java b/smartor/src/main/java/com/smartor/domain/HeTaskSingleVO.java
index 6087ee9..4278962 100644
--- a/smartor/src/main/java/com/smartor/domain/HeTaskSingleVO.java
+++ b/smartor/src/main/java/com/smartor/domain/HeTaskSingleVO.java
@@ -18,7 +18,7 @@
* @author ruoyi
* @date 2024-04-16
*/
-@ApiModel(value = "IvrTask", description = "瀹ｆ暀鍗曚竴浠诲姟瀵硅薄 ")
+@ApiModel(value = "HeTaskSingleVO", description = "瀹ｆ暀鍗曚竴浠诲姟瀵硅薄 ")
@Data
public class HeTaskSingleVO extends BaseEntity {
private static final long serialVersionUID = 1L;
@@ -257,6 +257,56 @@
private String type;
/**
+ * 鍙戦�佹棩鏈�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 鍙戦�佹棩鏈� ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鍙戦�佹棩鏈�")
+ private Date senddate;
+
+ /**
+ * 涓婂崍寮�濮嬪彂閫佹椂闂撮檺鍒�
+ */
+ @Excel(name = " 涓婂崍寮�濮嬪彂閫佹椂闂撮檺鍒� ")
+ @ApiModelProperty(value = "涓婂崍寮�濮嬪彂閫佹椂闂撮檺鍒�")
+ private String sendlimitabegin;
+
+ /**
+ * 涓婂崍缁撴潫鍙戦�佹椂闂撮檺鍒�
+ */
+ @Excel(name = " 涓婂崍缁撴潫鍙戦�佹椂闂撮檺鍒� ")
+ @ApiModelProperty(value = "涓婂崍缁撴潫鍙戦�佹椂闂撮檺鍒�")
+ private String sendlimitaend;
+
+ /**
+ * 涓嬪崍寮�濮嬪彂閫佹椂闂撮檺鍒�
+ */
+ @Excel(name = " 涓嬪崍寮�濮嬪彂閫佹椂闂撮檺鍒� ")
+ @ApiModelProperty(value = "涓嬪崍寮�濮嬪彂閫佹椂闂撮檺鍒�")
+ private String sendlimitpbegin;
+
+ /**
+ * 涓嬪崍缁撴潫鍙戦�佹椂闂撮檺鍒�
+ */
+ @Excel(name = " 涓嬪崍缁撴潫鍙戦�佹椂闂撮檺鍒� ")
+ @ApiModelProperty(value = "涓嬪崍缁撴潫鍙戦�佹椂闂撮檺鍒�")
+ private String sendlimitpend;
+
+ /**
+ * 鏅氫笂寮�濮嬪彂閫佹椂闂撮檺鍒�
+ */
+ @Excel(name = " 鏅氫笂寮�濮嬪彂閫佹椂闂撮檺鍒� ")
+ @ApiModelProperty(value = "鏅氫笂寮�濮嬪彂閫佹椂闂撮檺鍒�")
+ private String sendlimitnbegin;
+
+ /**
+ * 鏅氫笂缁撴潫鍙戦�佹椂闂撮檺鍒�
+ */
+ @Excel(name = " 鏅氫笂缁撴潫鍙戦�佹椂闂撮檺鍒� ")
+ @ApiModelProperty(value = "鏅氫笂缁撴潫鍙戦�佹椂闂撮檺鍒�")
+ private String sendlimitnend;
+
+ /**
* 鎮ｈ�呬笌鍗曚竴浠诲姟鍏宠仈琛ㄩ泦鍚�
*/
@Excel(name = " 瀹ｆ偅鑰呬笌鍗曚竴浠诲姟鍏宠仈琛ㄩ泦鍚�")
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java b/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java
index 2c1eb3c..aeebb40 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java
@@ -36,6 +36,13 @@
private String name;
/**
+ * 鐤剧梾鍚嶇О
+ */
+ @ApiModelProperty("鐤剧梾鍚嶇О")
+ @Excel(name = " 鐤剧梾鍚嶇О ")
+ private String diagname;
+
+ /**
* 璇佷欢鍙风爜
*/
@ApiModelProperty("璇佷欢鍙风爜")
@@ -49,6 +56,13 @@
@ApiModelProperty("鎵嬫満鍙风爜")
@Excel(name = " 鎵嬫満鍙风爜 ")
private String telcode;
+
+ /**
+ * 鎵嬫満鍙风爜
+ */
+ @ApiModelProperty("鎵嬫満鍙风爜")
+ @Excel(name = " 鎵嬫満鍙风爜 ")
+ private String leaveicd10code;
/**
* 鏍囩ID
@@ -96,6 +110,12 @@
private String visitno;
/**
+ * 闄㈠尯鍚嶇О
+ */
+ @ApiModelProperty(value = " 闄㈠尯鍚嶇О ")
+ private String hospitaldistrictname;
+
+ /**
* pageNum
*/
@ApiModelProperty(value = "pageNum")
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 91b93f6..f31568c 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrTaskSingleServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrTaskSingleServiceImpl.java
@@ -123,7 +123,8 @@
patTaskRelevance.setAddr(ivrTaskcall1.getAddr());
patTaskRelevance.setDiagname(ivrTaskcall1.getDiagname());
patTaskRelevances.add(patTaskRelevance);
- } else if (ivrTaskcall1.getHospType().equals("2")) {
+ }
+ if (ivrTaskcall1.getHospType().equals("2")) {
log.info("闅忚鏌ヨ涓哄嚭闄紝{}", ivrTaskcall1.getHospType());
patTaskRelevance.setName(ivrTaskcall1.getSendname());
patTaskRelevance.setAge(ivrTaskcall1.getAge());
diff --git a/smartor/src/main/resources/mapper/smartor/HeTaskSingleMapper.xml b/smartor/src/main/resources/mapper/smartor/HeTaskSingleMapper.xml
index 8e1477d..2839d27 100644
--- a/smartor/src/main/resources/mapper/smartor/HeTaskSingleMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/HeTaskSingleMapper.xml
@@ -53,6 +53,13 @@
<result property="type" column="type"/>
<result property="sendType" column="send_type"/>
<result property="sendTimeSlot" column="send_time_slot"/>
+ <result property="senddate" column="senddate"/>
+ <result property="sendlimitabegin" column="sendlimitabegin"/>
+ <result property="sendlimitaend" column="sendlimitaend"/>
+ <result property="sendlimitpbegin" column="sendlimitpbegin"/>
+ <result property="sendlimitpend" column="sendlimitpend"/>
+ <result property="sendlimitnbegin" column="sendlimitnbegin"/>
+ <result property="sendlimitnend" column="sendlimitnend"/>
</resultMap>
<sql id="selectHeTaskSingleVo">
@@ -103,6 +110,13 @@
bedno,
send_type,
type,
+ senddate,
+ sendlimitabegin,
+ sendlimitaend,
+ sendlimitpbegin,
+ sendlimitpend,
+ sendlimitnbegin,
+ sendlimitnend,
send_time_slot
from he_task_single
</sql>
@@ -156,6 +170,13 @@
<if test="sendType != null and sendType != ''">and send_type = #{sendType}</if>
<if test="sendTimeSlot != null and sendTimeSlot != ''">and send_time_slot = #{sendTimeSlot}</if>
<if test="type != null and type != ''">and type = #{type}</if>
+ <if test="senddate != null ">and senddate = #{senddate}</if>
+ <if test="sendlimitabegin != null and sendlimitabegin != ''">and sendlimitabegin = #{sendlimitabegin}</if>
+ <if test="sendlimitaend != null and sendlimitaend != ''">and sendlimitaend = #{sendlimitaend}</if>
+ <if test="sendlimitpbegin != null and sendlimitpbegin != ''">and sendlimitpbegin = #{sendlimitpbegin}</if>
+ <if test="sendlimitpend != null and sendlimitpend != ''">and sendlimitpend = #{sendlimitpend}</if>
+ <if test="sendlimitnbegin != null and sendlimitnbegin != ''">and sendlimitnbegin = #{sendlimitnbegin}</if>
+ <if test="sendlimitnend != null and sendlimitnend != ''">and sendlimitnend = #{sendlimitnend}</if>
</where>
</select>
@@ -215,6 +236,13 @@
<if test="sendType != null">send_type,</if>
<if test="sendTimeSlot != null">send_time_slot,</if>
<if test="type != null">type,</if>
+ <if test="senddate != null">senddate,</if>
+ <if test="sendlimitabegin != null">sendlimitabegin,</if>
+ <if test="sendlimitaend != null">sendlimitaend,</if>
+ <if test="sendlimitpbegin != null">sendlimitpbegin,</if>
+ <if test="sendlimitpend != null">sendlimitpend,</if>
+ <if test="sendlimitnbegin != null">sendlimitnbegin,</if>
+ <if test="sendlimitnend != null">sendlimitnend,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="svrtaskid != null">#{svrtaskid},</if>
@@ -264,6 +292,13 @@
<if test="sendType != null">#{sendType},</if>
<if test="sendTimeSlot != null">#{sendTimeSlot},</if>
<if test="type != null">#{type},</if>
+ <if test="senddate != null">#{senddate},</if>
+ <if test="sendlimitabegin != null">#{sendlimitabegin},</if>
+ <if test="sendlimitaend != null">#{sendlimitaend},</if>
+ <if test="sendlimitpbegin != null">#{sendlimitpbegin},</if>
+ <if test="sendlimitpend != null">#{sendlimitpend},</if>
+ <if test="sendlimitnbegin != null">#{sendlimitnbegin},</if>
+ <if test="sendlimitnend != null">#{sendlimitnend},</if>
</trim>
</insert>
@@ -317,6 +352,13 @@
<if test="sendType != null">send_type = #{sendType},</if>
<if test="sendTimeSlot != null">send_time_slot = #{sendTimeSlot},</if>
<if test="type != null">type = #{type},</if>
+ <if test="senddate != null">senddate = #{senddate},</if>
+ <if test="sendlimitabegin != null">sendlimitabegin = #{sendlimitabegin},</if>
+ <if test="sendlimitaend != null">sendlimitaend = #{sendlimitaend},</if>
+ <if test="sendlimitpbegin != null">sendlimitpbegin = #{sendlimitpbegin},</if>
+ <if test="sendlimitpend != null">sendlimitpend = #{sendlimitpend},</if>
+ <if test="sendlimitnbegin != null">sendlimitnbegin = #{sendlimitnbegin},</if>
+ <if test="sendlimitnend != null">sendlimitnend = #{sendlimitnend},</if>
</trim>
where id = #{id}
</update>
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index 4bf4eaa..d3b775d 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -269,8 +269,8 @@
resultMap="PatArchiveResult">
select
- c.tagname as tag,
- b.tagid as tagid,
+ -- c.tagname as tag,
+ -- b.tagid as tagid,
a.patid,
a.name,
d.deptname,
@@ -298,22 +298,30 @@
a.isupload,
a.upload_time,
a.pattype,
- d.bedno
- from pat_archive a,pat_archivetag b ,base_tag c,pat_med_inhosp d
+ d.bed_no
+ -- from pat_archive a,pat_archivetag b ,base_tag c,pat_med_inhosp d
+ from pat_archive a,pat_med_inhosp d
<where>
- a.patid = b.patid and b.tagid = c.tagid and a.patid = d.patid
+ -- a.patid = b.patid and b.tagid = c.tagid and a.patid = d.patid
+ a.patid = d.patid
<if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>
<if test="pid != null and pid != ''">and a.patid = #{pid}</if>
<if test="telcode != null and telcode != ''">and a.telcode = #{telcode}</if>
- <if test="tagIds != null and tagIds != ''">and c.tagid in
- <foreach collection="tagIds" item="tagId" open="(" separator="," close=")">
- #{tagId}
- </foreach>
- </if>
+ <!-- <if test="tagIds != null and tagIds != ''">and c.tagid in-->
+ <!-- <foreach collection="tagIds" item="tagId" open="(" separator="," close=")">-->
+ <!-- #{tagId}-->
+ <!-- </foreach>-->
+ <!-- </if>-->
<if test="hospitalname != null and hospitalname != ''">
AND d.hospitalname = #{hospitalname}
+ </if>
+ <if test="hospitaldistrictname != null and hospitaldistrictname != ''">
+ AND d.hospitaldistrictname LIKE concat('%',#{hospitaldistrictname}, '%')
+ </if>
+ <if test="leaveicd10code != null and leaveicd10code != ''">
+ AND d.leaveicd10code LIKE concat('%',#{leaveicd10code}, '%')
</if>
<if test="endtime != null">
AND d.endtime = #{endtime}
@@ -327,10 +335,16 @@
<if test="drname != null and drname != ''">
AND d.drname LIKE concat('%',#{drname}, '%')
</if>
+ <if test="diagname != null and diagname != ''">
+ AND d.diagname LIKE concat('%',#{diagname}, '%')
+ </if>
+ <if test="deptname != null and deptname != ''">
+ AND d.deptname LIKE concat('%',#{deptname}, '%')
+ </if>
AND d.del_flag != 1
- AND b.del_flag != 1
- AND c.del_flag != 1
+ -- AND b.del_flag != 1
+ -- AND c.del_flag != 1
AND a.del_flag != 1
</where>
</select>
@@ -339,8 +353,8 @@
resultMap="PatArchiveResult">
select
- c.tagname as tag,
- b.tagid as tagid,
+ -- c.tagname as tag,
+ -- b.tagid as tagid,
a.patid,
d.deptname,
a.name,
@@ -368,19 +382,25 @@
a.isupload,
a.upload_time,
a.pattype
- from pat_archive a,pat_archivetag b ,base_tag c, pat_med_outhosp d
+ -- from pat_archive a,pat_archivetag b ,base_tag c, pat_med_outhosp d
+ from pat_archive a, pat_med_outhosp d
<where>
- a.patid = b.patid and b.tagid = c.tagid and a.patid = d.patid
+ a.patid = d.patid
<if test="pid != null and pid != ''">and a.patid = #{pid}</if>
<if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>
<if test="telcode != null and telcode != ''">and a.telcode = #{telcode}</if>
- <if test="tagIds != null and tagIds != ''">and c.tagid in
- <foreach collection="tagIds" item="tagId" open="(" separator="," close=")">
- #{tagId}
- </foreach>
+ <!-- <if test="tagIds != null and tagIds != ''">and c.tagid in-->
+ <!-- <foreach collection="tagIds" item="tagId" open="(" separator="," close=")">-->
+ <!-- #{tagId}-->
+ <!-- </foreach>-->
+ <!-- </if>-->
+ <if test="hospitaldistrictname != null and hospitaldistrictname != ''">
+ AND d.hospitaldistrictname LIKE concat('%',#{hospitaldistrictname}, '%')
</if>
-
+ <if test="diagname != null and diagname != ''">
+ AND d.diagname LIKE concat('%',#{diagname}, '%')
+ </if>
<if test="hospitalname != null and hospitalname != ''">
AND d.hospitalname = #{hospitalname}
</if>
@@ -395,8 +415,8 @@
</if>
AND d.del_flag != 1
- AND b.del_flag != 1
- AND c.del_flag != 1
+ -- AND b.del_flag != 1
+ -- AND c.del_flag != 1
AND a.del_flag != 1
</where>
</select>
@@ -405,8 +425,8 @@
resultMap="PatArchiveResult">
select
- c.tagname as tag,
- b.tagid as tagid,
+ -- c.tagname as tag,
+ -- b.tagid as tagid,
a.patid as id,
a.name,
a.sex,
@@ -434,19 +454,25 @@
a.isupload,
a.upload_time,
a.pattype
- from pat_archive a,pat_archivetag b ,base_tag c, pat_med_physical d
+ -- from pat_archive a,pat_archivetag b ,base_tag c, pat_med_physical d
+ from pat_archive a, pat_med_physical d
<where>
- a.patid = b.patid and b.tagid = c.tagid and a.patid = d.patid
+ a.patid = d.patid
<if test="pid != null and pid != ''">and a.patid = #{pid}</if>
<if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>
<if test="telcode != null and telcode != ''">and a.telcode = #{telcode}</if>
- <if test="tagIds != null and tagIds != ''">and c.tagid in
- <foreach collection="tagIds" item="tagId" open="(" separator="," close=")">
- #{tagId}
- </foreach>
+<!-- <if test="tagIds != null and tagIds != ''">and c.tagid in-->
+<!-- <foreach collection="tagIds" item="tagId" open="(" separator="," close=")">-->
+<!-- #{tagId}-->
+<!-- </foreach>-->
+<!-- </if>-->
+ <if test="hospitaldistrictname != null and hospitaldistrictname != ''">
+ AND d.hospitaldistrictname LIKE concat('%',#{hospitaldistrictname}, '%')
</if>
-
+ <if test="diagname != null and diagname != ''">
+ AND d.diagname LIKE concat('%',#{diagname}, '%')
+ </if>
<if test="hospitalname != null and hospitalname != ''">
AND d.hospitalname = #{hospitalname}
</if>
@@ -462,11 +488,11 @@
</if>
AND d.del_flag != 1
- AND b.del_flag != 1
- AND c.del_flag != 1
+-- AND b.del_flag != 1
+-- AND c.del_flag != 1
AND a.del_flag != 1
</where>
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3