From 4bd9498d45b4d9f4bc948c04ec8efc9bb02d937e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 06 七月 2024 10:12:25 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 22 +++++++----
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 3 +
smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml | 2
smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml | 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 60 +++++++++++++-----------------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java | 10 ++++
6 files changed, 53 insertions(+), 45 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
index 2358750..fc69251 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -1,12 +1,27 @@
package com.ruoyi.web.controller.common;
-import java.io.*;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import javax.lang.model.util.Elements;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.PhotoEnum;
+import com.ruoyi.common.enums.RadioEnum;
+import com.ruoyi.common.enums.VadioEnum;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.framework.config.ServerConfig;
+import com.smartor.domain.HtmlContentVO;
+import org.apache.poi.hwpf.HWPFDocument;
+import org.apache.poi.hwpf.converter.PicturesManager;
+import org.apache.poi.hwpf.converter.WordToHtmlConverter;
+import org.apache.poi.hwpf.usermodel.PictureType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -17,33 +32,10 @@
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-
-import com.ruoyi.common.enums.PhotoEnum;
-import com.ruoyi.common.enums.RadioEnum;
-import com.ruoyi.common.enums.VadioEnum;
-import com.smartor.domain.HtmlContentVO;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.converter.PicturesManager;
-import org.apache.poi.hwpf.converter.WordToHtmlConverter;
-import org.apache.poi.hwpf.usermodel.Picture;
-import org.apache.poi.hwpf.usermodel.PictureType;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Element;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.common.utils.file.FileUtils;
-import com.ruoyi.framework.config.ServerConfig;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
-import org.w3c.dom.Document;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
/**
* 閫氱敤璇锋眰澶勭悊
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 8b37ba3..0f9e8ce 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
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.github.pagehelper.ISelect;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -160,7 +161,14 @@
@PostMapping("/patInfoByContion")
public TableDataInfo patInfoByCondition(@RequestBody PatArchiveReq patArchive) {
PageUtils.startPageByPost(patArchive.getPageNum(), patArchive.getPageSize());
- return getDataTable(patArchiveService.patInfoByContion(patArchive));
+ List<PatArchive> patArchives = patArchiveService.patInfoByContion(patArchive);
+ long count = PageUtils.count(new ISelect() {
+ @Override
+ public void doSelect() {
+ patArchiveService.patInfoByContion(patArchive);
+ }
+ });
+ return getDataTable2(count, patArchives);
}
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 a8e83f2..3a45920 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -100,7 +100,7 @@
}
ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(ServiceSubtask.getTaskid());
//灏嗘煡鍑烘潵鐨勬暟鎹�掑叆ServiceSubtaskVO涓�
- ServiceTaskVO serviceTaskVO = DtoConversionUtils.sourceToTarget(list.get(0), ServiceTaskVO.class);
+ ServiceTaskVO serviceTaskVO = DtoConversionUtils.sourceToTarget(serviceTask, ServiceTaskVO.class);
serviceTaskVO.setShowDate(serviceTask.getShowDate());
serviceTaskVO.setShowTimeMorn(serviceTask.getShowTimeMorn());
serviceTaskVO.setShowTimeNoon(serviceTask.getShowTimeNoon());
@@ -230,6 +230,7 @@
//灏嗕换鍔′俊鎭斁鍒版湇鍔¤〃涓�
ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTaskVO, ServiceSubtask.class);
serviceSubtask.setTaskid(serviceTask.getTaskid().longValue());
+ serviceSubtask.setTemplatename(serviceTaskVO.getTemplatename());
//鏂板
if (CollectionUtils.isNotEmpty(serviceTaskVO.getPatTaskRelevances())) {
for (PatTaskRelevance patTaskRelevance : serviceTaskVO.getPatTaskRelevances()) {
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index 3af7acc..31d5826 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -279,7 +279,7 @@
select
a.patid,
- a.name,
+ a.NAME,
d.deptname,
a.sex,
a.nation,
@@ -307,10 +307,14 @@
a.upload_time,
a.pattype,
d.bed_no,
- d.starttime as inhosptime
- from pat_archive a,pat_med_inhosp d
+ d.starttime AS inhosptime,
+ t.tagname
+ FROM
+ pat_med_inhosp d
+ JOIN pat_archive a ON a.patid = d.patid
+ LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
+ d.patid
<where>
- 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>
@@ -386,9 +390,10 @@
a.isupload,
a.upload_time,
a.pattype
- from pat_archive a, pat_med_outhosp d
+ from pat_med_outhosp d JOIN pat_archive a ON a.patid = d.patid
+ LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
+ d.patid
<where>
- 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>
@@ -454,9 +459,10 @@
a.isupload,
a.upload_time,
a.pattype
- from pat_archive a, pat_med_physical d
+ from pat_med_physical d JOIN pat_archive a ON a.patid = d.patid
+ LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
+ d.patid
<where>
- 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>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml
index 08927f4..8cdd88c 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml
@@ -95,6 +95,7 @@
<if test="score != null and score != ''">and score = #{score}</if>
<if test="topic != null and topic != ''">and topic = #{topic}</if>
</where>
+ order by id desc
</select>
<select id="selectSvyLibScriptByScriptid" parameterType="Long" resultMap="SvyLibScriptResult">
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml
index 3c0a691..a10842f 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml
@@ -220,7 +220,7 @@
<update id="deleteSvyLibScriptOptionByOptionid" parameterType="Long">
update svy_lib_ScriptOption
<trim prefix="SET" suffixOverrides=",">
- del_flag = 1
+ del_flag = 1
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3