From 3acbfbf90dbaa7f87aa2d37405700a9abc08073a Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 15 四月 2025 18:13:20 +0800
Subject: [PATCH] zjh20250415
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 27 +++++++------
ltkj-admin/src/test/java/zjhTest.java | 14 ++++++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 3 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 6 ++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java | 16 +++++--
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjRules.java | 6 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java | 10 +++--
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java | 12 +++---
8 files changed, 61 insertions(+), 33 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
index 82c5064..f4b339a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -281,7 +281,8 @@
jcbgdService.deletedLtkjJcbgdByTjhAndTmh(s);
jcsqdService.saveBatch(jcsqdList);
List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s);
- if(null !=jcsqdList && !jcsqdList.isEmpty()){
+ jcycxmService.deletedByTjh(s);
+ if(!jcsqdList.isEmpty()){
for (LtkjExamJcsqd jcsqd : jcsqdList) {
if(StringUtil.isNotBlank(jcsqd.getJgzt())){
String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;");
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 687b4ba..f958a35 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -877,14 +877,16 @@
}
}
}
- LambdaQueryWrapper<TjXdtgmdjg> wq = new LambdaQueryWrapper<>();
+
+ /* LambdaQueryWrapper<TjXdtgmdjg> wq = new LambdaQueryWrapper<>();
wq.eq(TjXdtgmdjg::getTjh, tjNumber);
List<TjXdtgmdjg> list = xdtgmdjgService.list(wq);
if (null != list && !list.isEmpty()) {
for (TjXdtgmdjg xdtgmdjg : list) {
pictureController.saveTjXdtgmdjgByJcbgd(xdtgmdjg);
}
- }
+ }*/
+
if (StrUtil.isBlank(resultMsg))
return AjaxResult.success("鍚屾鎴愬姛");
else return AjaxResult.error(resultMsg);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index 59a012f..0faa62b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -1816,17 +1816,18 @@
TjCustomer tjCustomer = tjCustomerService.getById( tjOrder.getUserId());
- LambdaQueryWrapper<TjReport> we = new LambdaQueryWrapper<>();
- we.eq(TjReport::getTjNumber, tjNumber);
- we.eq(TjReport::getType, "浣撴鎶ュ憡");
- TjReport one = tjReportService.getOne(we);
- if (one == null) {
- return;
- }
-
- String userId = SecurityUtils.getLoginUser().getUsername();
- PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
- String filePath = value + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
+// LambdaQueryWrapper<TjReport> we = new LambdaQueryWrapper<>();
+// we.eq(TjReport::getTjNumber, tjNumber);
+// we.eq(TjReport::getType, "浣撴鎶ュ憡");
+// TjReport one = tjReportService.getOne(we);
+// if (one == null) {
+// return;
+// }
+//
+// String userId = SecurityUtils.getLoginUser().getUsername();
+// PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
+// String filePath = value + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
+ String filePath = value + File.separator + tjCustomer.getCusId() + tjNumber + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
File f = new File(filePath);
if (filePath.isEmpty()) {
System.out.println("鏂囦欢涓嶅瓨鍦紒");
@@ -1848,13 +1849,13 @@
String contentType = u.openConnection().getContentType();
response.setContentType(contentType);
response.setHeader("Content-Disposition", "inline;filename="
- + userId + tjNumber + ".pdf");
+ + tjCustomer.getCusId() + tjNumber + ".pdf");
} else {
// 绾笅杞芥柟寮�
response.setContentType("application/x-msdownload");
response.setContentType("application/pdf;charset=utf-8");
response.setHeader("Content-Disposition", "attachment;filename="
- + userId + tjNumber + ".pdf");
+ + tjCustomer.getCusId() + tjNumber + ".pdf");
}
out = response.getOutputStream();
while ((len = br.read(bs)) > 0) {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
index 4a56102..3316a68 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
@@ -7,6 +7,7 @@
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
@@ -58,8 +59,10 @@
//@PreAuthorize("@ss.hasPermi('hosp:rules:list')")
@GetMapping("/list")
@ApiOperation(value = "鏌ヨ瑙勫垯+鐥呯鍒楄〃")
- public TableDataInfo list(TjRules tjRules) {
- startPage();
+ public AjaxResult list(TjRules tjRules) {
+
+ Page<TjRules> page=new Page<>(tjRules.getPageNum(),tjRules.getPageSize());
+
LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>();
if (tjRules.getProId() != null) {
List<TjProject> projects = projectService.getTjProjectListBySoneId(tjRules.getProId());
@@ -90,9 +93,12 @@
wq.eq(TjRules::getSex, tjRules.getSex());
}
wq.orderByAsc(TjRules::getSort);
- List<TjRules> list = tjRulesService.list(wq);
-
- return getDataTable(list);
+// List<TjRules> list = tjRulesService.list(wq);
+ Page<TjRules> page1 = tjRulesService.page(page, wq);
+ Map<String,Object>map=new HashMap<>();
+ map.put("rows",page1.getRecords());
+ map.put("total",page1.getTotal());
+ return AjaxResult.success(map);
}
diff --git a/ltkj-admin/src/test/java/zjhTest.java b/ltkj-admin/src/test/java/zjhTest.java
index 761b949..8329e75 100644
--- a/ltkj-admin/src/test/java/zjhTest.java
+++ b/ltkj-admin/src/test/java/zjhTest.java
@@ -2,7 +2,9 @@
import cn.hutool.core.io.FileUtil;
import com.ltkj.LtkjApplication;
import com.ltkj.framework.config.MatchUtils;
+import com.ltkj.hosp.domain.TjJcycxm;
import com.ltkj.hosp.idutil.IdUtils;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -70,8 +72,16 @@
public static void main(String[] args) throws Exception {
- System.out.println(MatchUtils.isIdCard("622723197401030409"));
- System.out.println(MatchUtils.isMobileNO("15346732733"));
+ String s = "L4/5銆丩5/S1妞庨棿鐩樼獊鍑猴紝鑵版妞庝綋杞诲害楠ㄨ川澧炵敓銆�";
+
+ String[] split = s.replaceAll("\n", "").split("銆倈锛泑;");
+ for (String jg : split) {
+ if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
+ && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
+ && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")){
+ System.out.println(1);
+ }
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjRules.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjRules.java
index b281839..00901b7 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjRules.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjRules.java
@@ -167,6 +167,12 @@
@TableField(exist = false)
private List<TjRuleAdvice> ruleAdvices;
+ @TableField(exist = false)
+ private Integer pageNum;
+
+ @TableField(exist = false)
+ private Integer pageSize;
+
@Override
public String toString() {
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
index 85e3793..199a146 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
@@ -21,18 +21,18 @@
@DataSource(value = DataSourceType.MASTER)
public interface LtkjExamJcbgdMapper extends BaseMapper<LtkjExamJcbgd> {
- @Delete ("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tmh} and lx=0 ")
- void deletedLtkjJcbgdByTjhAndTmh(String tmh);
+ @Delete("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tmh} and lx=0 ")
+ void deletedLtkjJcbgdByTjhAndTmh(String tmh);
- @Delete ("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tjh} and tmh=#{tmh} ")
- void deletedLtkjJcbgdByTjhandtmh(@Param("tjh") String tjh,@Param("tmh") String tmh);
+ @Delete("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tjh} and tmh=#{tmh} and lx=1 ")
+ void deletedLtkjJcbgdByTjhandtmh(@Param("tjh") String tjh, @Param("tmh") String tmh);
- @Select ("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='妫�鏌�' GROUP BY a.sqdh")
+ @Select("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='妫�鏌�' GROUP BY a.sqdh")
List<String> getJianJcBaoGaoDan(String cardId);
@Select("SELECT * FROM ltkj_exam_jcbgd WHERE tmh=#{tmh} GROUP BY xmmc ")
List<LtkjExamJcbgd> getJianJcBaoGaoDanList(String tmh);
-@Select("SELECT * FROM ltkj_exam_jcbgd WHERE tjh=#{cardId}")
+ @Select("SELECT * FROM ltkj_exam_jcbgd WHERE tjh=#{cardId}")
List<LtkjExamJcbgd> getJianJcBaoGaoDanByTjh(String cardId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
index 33b95d1..c0c0e7f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
@@ -28,16 +28,17 @@
@Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and lx=0 ")
void deletedLtkjJcsqdByTjhAndTmh(@Param("tjh")String tjh);
- @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and tmh=#{tmh}")
+ @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and tmh=#{tmh} and lx=1 ")
void deletedLtkjJcsqdByTjhandtmh(@Param("tjh") String tjh,@Param("tmh") String tmh);
@Select("SELECT * FROM ltkj_exam_jcsqd a WHERE a.tjh=#{tjh}")
List<LtkjExamJcsqd> getLtkjJcsqdByTjh(String tjh);
- @Insert("INSERT INTO ltkj_exam_jcsqd \n" +
+ @Insert("INSERT INTO ltkj_exam_jcsqd (`tjh`, `tmh`, `jclx`, `jczlx`, `bgys`, `bgysid`, " +
+ "`sqsj`, `jgsj`, `jcxmmc`, `jcxmid`, `bw`, `jgzt`, `jgbx`, `lx`, `create_time`)\n" +
"SELECT a.tjh,a.tmh,NULL jclx,NULL jczlx,a.shysxm bgys,a.shysdm bgysid,a.sqsj,a.zdsj jgsj, a.xmmc jcxmmc,a.xmdm jcxmid,a.jcbw bw,\n" +
- "a.yxzd jgzt,a.bg_nr jgbx,sysdate()\n" +
+ "a.yxzd jgzt,a.bg_nr jgbx,'0',sysdate()\n" +
"FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} GROUP BY a.xmmc")
void saveLtkjExamJcsqd(String tjh);
@@ -59,7 +60,8 @@
void deletedLtkjJcsqdByTjhAndProId(@Param("tjh") String tjh,@Param("xmid") String xmid);
- @Insert("INSERT INTO ltkj_exam_jcsqd \n" +
+ @Insert("INSERT INTO ltkj_exam_jcsqd (`tjh`, `tmh`, `jclx`, `jczlx`, `bgys`, `bgysid`, `sqsj`, " +
+ "`jgsj`, `jcxmmc`, `jcxmid`, `bw`, `jgzt`, `jgbx`, `lx`, `create_time`)\n" +
"SELECT a.tjh,a.tmh,NULL jclx,NULL jczlx,a.shysxm bgys,a.shysdm bgysid,a.sqsj,a.zdsj jgsj, a.xmmc jcxmmc,a.xmdm jcxmid,a.jcbw bw,\n" +
"a.yxzd jgzt,a.bg_nr jgbx,'1',sysdate()\n" +
"FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} GROUP BY a.xmmc")
--
Gitblit v1.8.0