From 75cb81f0b88f313857ea431b46b929bef95d7cc8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 29 七月 2024 10:36:59 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java | 3 +
smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml | 19 +++++----
smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml | 2
smartor/src/main/resources/mapper/smartor/IvrLibaTargetoptionMapper.xml | 6 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java | 17 ++++++++
smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java | 42 +++++++++++++++++++++
smartor/src/main/resources/mapper/smartor/SvyLibTopicCategoryMapper.xml | 2
smartor/src/main/java/com/smartor/service/IPatArchiveService.java | 2 +
8 files changed, 82 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
index 0f9e8ce..722e2bf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
@@ -189,4 +189,21 @@
util.exportExcel(response, patArchives, "鎮ｈ�呮。妗堟暟鎹�");
}
+ /**
+ * 鑾峰彇鎮ｈ�呬俊鎭�
+ */
+ @ApiOperation("鑾峰彇鎮ｈ�呬俊鎭�")
+ @PostMapping("/getPatientInfo")
+ public TableDataInfo getPatientInfo(@RequestBody PatArchiveReq patArchiveReq) {
+ PageUtils.startPageByPost(patArchiveReq.getPageNum(), patArchiveReq.getPageSize());
+ List<PatTaskRelevance> patientInfo = patArchiveService.getPatientInfo(patArchiveReq);
+ long count = PageUtils.count(new ISelect() {
+ @Override
+ public void doSelect() {
+ patArchiveService.getPatientInfo(patArchiveReq);
+ }
+ });
+ return getDataTable2(count, patientInfo);
+ }
+
}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java
index 25f793e..bc292f7 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java
@@ -174,6 +174,9 @@
@ApiModelProperty(value = "闄勪欢淇℃伅")
private String appenddesc;
+
+ @ApiModelProperty(value = "闄勪欢淇℃伅")
+ private String picturePath;
/**
* pageNum
*/
diff --git a/smartor/src/main/java/com/smartor/service/IPatArchiveService.java b/smartor/src/main/java/com/smartor/service/IPatArchiveService.java
index 38014de..86eea7c 100644
--- a/smartor/src/main/java/com/smartor/service/IPatArchiveService.java
+++ b/smartor/src/main/java/com/smartor/service/IPatArchiveService.java
@@ -90,4 +90,6 @@
public List<PatArchivetagAndPatientInfo> patInfoByTag(List<Long> tagids);
public List<Object> getUserTreatmentInfo(String pid,String type);
+
+ public List<PatTaskRelevance> getPatientInfo(PatArchiveReq patArchiveReq);
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
index 17705b9..c860b0e 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
@@ -173,6 +173,48 @@
return patArchiveMapper.deletePatArchiveByPatid(patid);
}
+ /**
+ * 鑾峰彇鎮ｈ�呬俊鎭�
+ *
+ * @param patArchiveReq
+ * @return
+ */
+ @Override
+ public List<PatTaskRelevance> getPatientInfo(PatArchiveReq patArchiveReq) {
+ List<PatTaskRelevance> PatTaskRelevances = new ArrayList<>();
+
+ List<PatArchive> patArchiveList = new ArrayList<>();
+ if (patArchiveReq.getAllhosp() != null && patArchiveReq.getAllhosp() == 1) {
+ // 鏌ョ湅浣忛櫌 1 鏌ョ湅闂ㄨ瘖 2 鏌ョ湅浣撴 3
+ List<PatArchive> patArchives1 = patArchiveMapper.selectPatArchiveInfoByInhosp(patArchiveReq);
+ if (CollectionUtils.isNotEmpty(patArchives1)) {
+ patArchiveList.addAll(patArchives1);
+ }
+ } else if (patArchiveReq.getAllhosp() != null && patArchiveReq.getAllhosp() == 2) {
+ // 鏌ョ湅浣忛櫌 1 鏌ョ湅闂ㄨ瘖 2 鏌ョ湅浣撴 3
+ List<PatArchive> patArchives2 = patArchiveMapper.selectPatArchiveInfoByOuthosp(patArchiveReq);
+ if (CollectionUtils.isNotEmpty(patArchives2)) {
+ patArchiveList.addAll(patArchives2);
+ }
+ } else if (patArchiveReq.getAllhosp() != null && patArchiveReq.getAllhosp() == 3) {
+ // 鏌ョ湅浣忛櫌 1 鏌ョ湅闂ㄨ瘖 2 鏌ョ湅浣撴 3
+ List<PatArchive> patArchives3 = patArchiveMapper.selectPatArchiveInfoByPhysical(patArchiveReq);
+ if (CollectionUtils.isNotEmpty(patArchives3)) {
+ patArchiveList.addAll(patArchives3);
+ }
+ }
+ for (PatArchive patArchive : patArchiveList) {
+ PatTaskRelevance patTaskRelevance = DtoConversionUtils.sourceToTarget(patArchive, PatTaskRelevance.class);
+ patTaskRelevance.setCreateTime(patArchive.getCreateTime());
+ patTaskRelevance.setCreateBy(patArchive.getCreateBy());
+ patTaskRelevance.setDeptName(patArchive.getDept());
+ PatTaskRelevances.add(patTaskRelevance);
+ }
+
+ return PatTaskRelevances;
+ }
+
+
@Override
@Transactional
public PatUpInfoVO importFilehandle(SysUser user, String tags, MultipartFile file) {
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml
index b6695b4..bd62c98 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml
@@ -110,7 +110,8 @@
<if test="groupid != null and groupid != ''">and groupid = #{groupid}</if>
<if test="targettype != null and targettype != ''">and targettype = #{targettype}</if>
<if test="targetname != null and targetname != ''">and targetname like concat('%', #{targetname}, '%')</if>
- <if test="scriptType != null and scriptType != ''">and script_type like concat('%', #{scriptType}, '%')</if>
+ <if test="scriptType != null and scriptType != ''">and script_type like concat('%', #{scriptType}, '%')
+ </if>
<if test="targetdesc != null and targetdesc != ''">and targetdesc = #{targetdesc}</if>
<if test="language != null and language != ''">and language = #{language}</if>
<if test="version != null ">and version = #{version}</if>
@@ -124,10 +125,10 @@
<if test="pid != null ">and pid = #{pid}</if>
<if test="guid != null and guid != ''">and guid = #{guid}</if>
<if test="assortid != null ">and assortid = #{assortid}</if>
- <if test="isAvailable != null">and isAvailable=#{isAvailable},</if>
- <if test="suitDisease != null and suitDisease != ''">and suitDisease = #{suitDisease},</if>
- <if test="suitWay != null and suitWay != ''">and suitWay = #{suitWay},</if>
- <if test="parameter != null and parameter != ''">and parameter = #{parameter},</if>
+ <if test="isAvailable != null">and isAvailable=#{isAvailable}</if>
+ <if test="suitDisease != null and suitDisease != ''">and suitDisease = #{suitDisease}</if>
+ <if test="suitWay != null and suitWay != ''">and suitWay like concat('%', #{suitWay}, '%')</if>
+ <if test="parameter != null and parameter != ''">and parameter = #{parameter}</if>
</where>
</select>
@@ -182,10 +183,10 @@
<if test="pid != null ">and a.pid = #{pid}</if>
<if test="guid != null and guid != ''">and a.guid = #{guid}</if>
<if test="assortid != null ">and a.assortid = #{assortid}</if>
- <if test="isAvailable != null">a.isAvailable=#{isAvailable},</if>
- <if test="suitDisease != null and suitDisease != ''">a.suitDisease = #{suitDisease},</if>
- <if test="suitWay != null and suitWay != ''">a.suitWay = #{suitWay},</if>
- <if test="parameter != null and parameter != ''">a.parameter = #{parameter},</if>
+ <if test="isAvailable != null">a.isAvailable=#{isAvailable}</if>
+ <if test="suitDisease != null and suitDisease != ''">a.suitDisease = #{suitDisease}</if>
+ <if test="suitWay != null and suitWay != ''">a.suitWay like concat('%', #{suitWay}, '%')</if>
+ <if test="parameter != null and parameter != ''">a.parameter = #{parameter}</if>
</where>
ORDER BY a.targetID
</select>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetoptionMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetoptionMapper.xml
index 8824810..be5b525 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetoptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetoptionMapper.xml
@@ -34,12 +34,14 @@
<result property="orderno" column="orderno"/>
<result property="appendflag" column="appendflag"/>
<result property="appenddesc" column="appenddesc"/>
+ <result property="picturePath" column="picture_path"/>
</resultMap>
<sql id="selectIvrLibaTargetoptionVo">
select targetoptionid,
targetid,
appendflag,
+ picture_path,
appenddesc,
targettype,
categoryName,
@@ -83,6 +85,7 @@
<if test="dynamiccruxsJson != null">and dynamiccruxs = #{dynamiccruxsJson}</if>
<if test="appendflag != null">and appendflag = #{appendflag}</if>
<if test="appenddesc != null">and appenddesc = #{appenddesc}</if>
+ <if test="picturePath != null">and picture_path = #{picturePath}</if>
</where>
order by guid asc
</select>
@@ -124,6 +127,7 @@
<if test="orderno != null">orderno,</if>
<if test="appendflag != null">appendflag,</if>
<if test="appenddesc != null">appenddesc,</if>
+ <if test="picturePath != null">picture_path,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="targetid != null">#{targetid},</if>
@@ -154,6 +158,7 @@
<if test="orderno != null">#{orderno},</if>
<if test="appendflag != null">#{appendflag},</if>
<if test="appenddesc != null">#{appenddesc},</if>
+ <if test="picturePath != null">#{picturePath},</if>
</trim>
</insert>
@@ -188,6 +193,7 @@
<if test="orderno != null">orderno = #{orderno},</if>
<if test="appendflag != null">appendflag = #{appendflag},</if>
<if test="appenddesc != null">appenddesc = #{appenddesc},</if>
+ <if test="picturePath != null">picture_path = #{picturePath},</if>
</trim>
where targetoptionid = #{targetoptionid}
</update>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml
index 73696dc..827c2ef 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml
@@ -94,7 +94,7 @@
<if test="language != null and language != ''">and language = #{language}</if>
<if test="scoretype != null and scoretype != ''">and scoretype = #{scoretype}</if>
<if test="score != null and score != ''">and score = #{score}</if>
- <if test="scriptTopic != null and scriptTopic != ''">and script_topic = #{scriptTopic}</if>
+ <if test="scriptTopic != null and scriptTopic != ''">and script_topic like concat('%', #{scriptTopic}, '%')</if>
<if test="targetid != null ">and targetid = #{targetid}</if>
<if test="targetname != null and targetname != ''">and targetname = #{targetname}</if>
<if test="targettype != null and targettype != ''">and targettype = #{targettype}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTopicCategoryMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTopicCategoryMapper.xml
index efcb0c8..620c32f 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTopicCategoryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTopicCategoryMapper.xml
@@ -121,7 +121,7 @@
<select id="selectSeqMax" resultType="integer">
select max(seqno) seqno
- from iivr_liba_template_assort
+ from ivr_liba_template_assort
</select>
</mapper>
--
Gitblit v1.9.3