From cf84e1347914b92e46c6a63155fff74282490890 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 02 四月 2025 18:02:03 +0800
Subject: [PATCH] zjh20250402
---
ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java | 15 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java | 3
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java | 83 +++++++++--
ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java | 5
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 13 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjXdtgmdjgMapper.java | 21 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java | 4
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 4
ltkj-admin/src/test/java/zjhTest.java | 150 ++++++++-------------
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcbgdServiceImpl.java | 5
ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcbgdService.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 5
ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml | 1
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjXdtgmdjgService.java | 17 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjXdtgmdjgServiceImpl.java | 27 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjXdtgmdjg.java | 28 ++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java | 3
19 files changed, 271 insertions(+), 119 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
index 113b0d7..93246b8 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
@@ -1,12 +1,15 @@
package com.ltkj.web.config.timer;
import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.TjJcycxm;
+import com.ltkj.hosp.domain.TjXdtgmdjg;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.*;
import com.ltkj.system.service.ISysConfigService;
+import com.ltkj.web.controller.system.TjXdPictureController;
import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -59,6 +62,10 @@
private TjJcycxmService jcycxmService;
@Autowired
private AwsService awsService;
+ @Resource
+ private TjXdtgmdjgService xdtgmdjgService;
+ @Resource
+ private TjXdPictureController pictureController;
private final ReentrantLock reentrantLock = new ReentrantLock();
@@ -119,6 +126,14 @@
log.info("鍚屾妫�鏌ヤ汉鍛� 鎵ц鏁伴噺->{}", jc.size());
for (String s : jc) {
extractedjiancha(s,dqyyyqbm);
+// LambdaQueryWrapper<TjXdtgmdjg> wq=new LambdaQueryWrapper<>();
+// wq.eq(TjXdtgmdjg::getTjh,s);
+// List<TjXdtgmdjg> list = xdtgmdjgService.list(wq);
+// if(null !=list && !list.isEmpty()){
+// for (TjXdtgmdjg xdtgmdjg : list) {
+// pictureController.saveTjXdtgmdjgByJcbgd(xdtgmdjg);
+// }
+// }
}
}
Map<String, Object> map = new HashMap<>();
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 2189921..48f2064 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
@@ -134,7 +134,10 @@
private SysConfigController configController;
@Autowired
private TjJcycxmService jcycxmService;
-
+ @Resource
+ private TjXdtgmdjgService xdtgmdjgService;
+ @Resource
+ private TjXdPictureController pictureController;
@GetMapping ("/ceshicc")
@ApiOperation (value = "娴嬭瘯璋冪敤瀛樺偍杩囩▼鑰楁椂鎺ュ彛")
@@ -914,6 +917,14 @@
}
}
}
+ 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/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index 86c55e7..faa6972 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -235,8 +235,8 @@
// tjFlowingWater.setPayStasus(1L);
TjOrder order = orderService.getById(tjFlowingWater.getOrderId());
- if (order.getFinishTime() != null) {
- return AjaxResult.error("璇ヤ汉鍛樺凡绛剧,涓嶅彲琛ュ綍椤圭洰!");
+ if (order.getPrintLastTime() != null) {
+ return AjaxResult.error("璇ヤ汉鍛樻姤鍛婂凡鎵撳嵃,涓嶅彲琛ュ綍椤圭洰!");
}
TjCustomer customer = customerService.getById(order.getUserId());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
index cd429dd..d229676 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
@@ -1,18 +1,20 @@
package com.ltkj.web.controller.system;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.unit.DataUnit;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
+import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
+import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
import com.ltkj.hosp.vodomain.CsProVo;
import com.ltkj.system.service.ISysConfigService;
import io.swagger.annotations.Api;
@@ -54,7 +56,12 @@
private ITjOrderRemarkService remarkService;
@Resource
private ITjProjectService projectService;
-
+ @Resource
+ private TjXdtgmdjgService xdtgmdjgService;
+ @Resource
+ private LtkjExamJcbgdService jcbgdService;
+ @Resource
+ private LtkjExamJcsqdService jcsqdService;
/**
* 鏌ヨ浣撴蹇冪數鍥剧鐞嗗垪琛�
*/
@@ -198,7 +205,8 @@
@GetMapping ("/getYxJcList")
@ApiOperation (value = "褰卞儚妫�鏌ュ垪琛�(楠ㄥ瘑搴﹀拰蹇冪數鍥�)")//0寰�1宸�
@Transactional
- public AjaxResult getYxJcList(@ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer page,
+ public AjaxResult getYxJcList(@ApiParam (value = "瀹℃牳鐘舵�� 0寰呭鏍� 1宸插鏍�") @RequestParam Integer checkStatus,
+ @ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer page,
@ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
@ApiParam (value = "浣撴鍗曞彿") @RequestParam (required = false) String tjNumber,
@ApiParam (value = "鍗曚綅") @RequestParam (required = false) Long compId,
@@ -290,7 +298,7 @@
if (beginTime == null) beginTime = "";
if (endTime == null) endTime = "";
if (tcm == null) tcm = "";
- return AjaxResult.success(orderService.getYxJcList(tjNumber, page, pageSize, value, beginTime, endTime, name,tcm));
+ return AjaxResult.success(orderService.getYxJcList(checkStatus,tjNumber, page, pageSize, value, beginTime, endTime, name,tcm));
}
@GetMapping ("/getYxJcXx")
@@ -307,6 +315,7 @@
@ApiParam (value = "椤圭洰id") @RequestParam String proId,
@ApiParam (value = "妫�鏌ユ墍瑙�") @RequestParam String jcsj,
@ApiParam (value = "妫�鏌ョ粨璁�") @RequestParam String jcjl) {
+ SysUser user = SecurityUtils.getLoginUser().getUser();
TjOrder order = orderService.getOrderByTjNum(tjNumber);
if(null !=order){
TjProject project = projectService.getById(proId);
@@ -327,6 +336,18 @@
if(null !=orderRemark){
orderRemark.setType(1);
remarkService.updateById(orderRemark);
+ xdtgmdjgService.deletedByTJhAndProId(tjNumber, proId);
+ TjXdtgmdjg xdtgmdjg=new TjXdtgmdjg();
+ xdtgmdjg.setTjh(tjNumber);
+ xdtgmdjg.setCardId(order.getCardId());
+ xdtgmdjg.setProId(proId);
+ xdtgmdjg.setProName(project.getProName());
+ xdtgmdjg.setJcsj(jcsj);
+ xdtgmdjg.setJcjl(jcjl);
+ xdtgmdjg.setCreateBy(user.getNickName());
+ xdtgmdjg.setCreateId(user.getUserId().toString());
+ xdtgmdjgService.save(xdtgmdjg);
+ saveTjXdtgmdjgByJcbgd(xdtgmdjg);
}
}
}
@@ -335,6 +356,31 @@
return AjaxResult.error("鏆傛棤浣撴璁板綍");
}
+ public void saveTjXdtgmdjgByJcbgd(TjXdtgmdjg xdtgmdjg) {
+ int length = xdtgmdjg.getProId().length();
+ // 纭繚瀛楃涓查暱搴﹁嚦灏戜负6
+ String last6 = length >= 6 ? xdtgmdjg.getProId().substring(length - 6) : xdtgmdjg.getProId();
+
+ LtkjExamJcbgd jcbgd=new LtkjExamJcbgd();
+ jcsqdService.deletedLtkjJcsqdByTjhandtmh(xdtgmdjg.getCardId(),xdtgmdjg.getTjh()+last6);
+ jcbgdService.deletedLtkjJcbgdByTjhandtmh(xdtgmdjg.getCardId(),xdtgmdjg.getTjh()+last6);
+ jcbgd.setTjh(xdtgmdjg.getCardId());
+ jcbgd.setTmh(xdtgmdjg.getTjh()+last6);
+ jcbgd.setXmdm(xdtgmdjg.getProId());
+ jcbgd.setXmmc(xdtgmdjg.getProName());
+ jcbgd.setBgNr(xdtgmdjg.getJcsj());
+ jcbgd.setBgUrl("");
+ jcbgd.setShysxm(xdtgmdjg.getCreateBy());
+ jcbgd.setShysdm(xdtgmdjg.getCreateId());
+ jcbgd.setYxzd(xdtgmdjg.getJcjl());
+ jcbgd.setYxbx("鏈寮傚父");
+ jcbgd.setZdsj(DateUtil.format(new Date(),"yyyy-MM-dd"));
+ jcbgd.setJcbw("");
+ jcbgd.setSqsj(DateUtil.format(new Date(),"yyyy-MM-dd"));
+ jcbgd.setCreateTime(new Date());
+ jcbgdService.save(jcbgd);
+ jcsqdService.saveLtkjExamJcsqd(xdtgmdjg.getCardId());
+ }
@GetMapping ("/getYxJcXxJg")
@@ -344,20 +390,17 @@
@ApiParam (value = "椤圭洰id") @RequestParam String proId) {
TjOrder order = orderService.getOrderByTjNum(tjNumber);
if(null !=order){
- TjProject project = projectService.getById(proId);
- if(null !=project){
- List<TjProject> projects = projectService.getTjProjectListBySoneId(proId);
- LambdaQueryWrapper<TjOrderDetail>wq1=new LambdaQueryWrapper<>();
- wq1.eq(TjOrderDetail::getProId,projects.get(0).getProParentId());
- wq1.eq(TjOrderDetail::getOrderId,order.getOrderId());
- TjOrderDetail detail = detailService.getOne(wq1);
- if(null !=detail && StringUtil.isNotBlank(detail.getProResult())){
- Map<String,Object> map=new HashMap<>();
- String string = detail.getProResult();
-
- }
+ LambdaQueryWrapper<TjXdtgmdjg> wq=new LambdaQueryWrapper<>();
+ wq.eq(TjXdtgmdjg::getTjh,tjNumber);
+ wq.eq(TjXdtgmdjg::getProId,proId);
+ TjXdtgmdjg xdtgmdjg = xdtgmdjgService.getOne(wq);
+ Map<String,Object>map=new HashMap<>();
+ if(null !=xdtgmdjg ){
+ map.put("jcsj",xdtgmdjg.getJcsj());
+ map.put("jcjl",xdtgmdjg.getJcjl());
+ return AjaxResult.success(map);
}
- return AjaxResult.success();
+ return AjaxResult.success(map);
}
return AjaxResult.error("鏆傛棤浣撴璁板綍");
}
diff --git a/ltkj-admin/src/test/java/zjhTest.java b/ltkj-admin/src/test/java/zjhTest.java
index 0f94bb7..d60c4e3 100644
--- a/ltkj-admin/src/test/java/zjhTest.java
+++ b/ltkj-admin/src/test/java/zjhTest.java
@@ -1,22 +1,14 @@
-import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil;
-import cn.hutool.extra.pinyin.PinyinUtil;
import com.ltkj.LtkjApplication;
-import com.ltkj.hosp.domain.TjProject;
-import com.ltkj.hosp.service.*;
+import com.ltkj.hosp.idutil.IdUtils;
import lombok.extern.slf4j.Slf4j;
-import org.joda.money.CurrencyUnit;
-import org.joda.money.Money;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.openqa.selenium.By;
import org.openqa.selenium.Dimension;
import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
import org.openqa.selenium.chrome.ChromeDriver;
import org.openqa.selenium.chrome.ChromeOptions;
-import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -25,25 +17,19 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import java.math.BigDecimal;
-import java.math.RoundingMode;
import java.net.HttpURLConnection;
import java.net.URL;
-import java.time.LocalTime;
-import java.time.ZonedDateTime;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
import java.io.BufferedReader;
import java.io.InputStreamReader;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.openqa.selenium.*;
-import org.springframework.core.io.ClassPathResource;
+
import java.io.File;
import java.io.IOException;
-import java.time.Duration;
-
-import static javafx.scene.input.ScrollEvent.VerticalTextScrollUnits.PAGES;
-
/**
* @Author: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃/璧典匠璞�
* @Date: 2022/12/12 9:05
@@ -53,89 +39,71 @@
@Slf4j
@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class})
public class zjhTest {
-//
-// @Autowired
-// private ITjGroupingProService groupingProService;
+
@Autowired
- private ITjProjectService projectService;
-// @Resource
-// private ITjCustomerService tjCustomerService;
-// @Resource
-// private ITjPackageService tjPackageService;
-//
-// @Resource
-// private ITjOrderService tjOrderService;
-// @Resource
-// private ITjOrderDetailService tjOrderDetailService;
-// @Resource
-// private ITjOrderRemarkService remarkService;
-//
-// @Resource
-// private RedisCache redisCache;
-////
-// @Autowired
-// public RedisTemplate<Object,Object> redisTemplate;
-//// @Resource
-// private StringRedisTemplate stringRedisTemplate;
-//@Resource
-//private IDictHospService dictHospService;
+ private IdUtils idUtils;
+
@Value("${token.secret_key}")
private String secret;
@Test
- public void test() {
+ public void test() throws InterruptedException {
-
- List<TjProject> list = projectService.list();
- for (TjProject project : list) {
- project.setProEngName(PinyinUtil.getFirstLetter(project.getProName(),""));
- projectService.updateById(project);
+ ExecutorService executorService = Executors.newFixedThreadPool(20); // 20涓嚎绋嬫睜
+ Set<String> numbers = Collections.synchronizedSet(new HashSet<>()); // 绾跨▼瀹夊叏鐨凷et锛屽瓨鏀剧敓鎴愮殑缂栧彿
+ // 骞跺彂鎵ц
+ for (int i = 0; i < 20; i++) {
+ executorService.execute(() -> {
+ try {
+ String number = idUtils.getNewTjNumberRedisLock(); // 璋冪敤鑾峰彇缂栧彿鐨勬柟娉�
+ numbers.add(number); // 娣诲姞鍒� Set
+ } catch (RuntimeException e) {
+ throw new RuntimeException(e);
+ }
+ });
}
-/*
-
-// 鐢熸垚鎸囧畾url瀵瑰簲鐨勪簩缁寸爜鍒版枃浠讹紝瀹藉拰楂橀兘鏄�300鍍忕礌
- QrCodeUtil.generate("https://ltpeis.xaltjdkj.cn:5516/1000110001240327094056%E7%8E%89%E5%BF%A0_%E4%BD%93%E6%A3%80%E6%8A%A5%E5%91%8A.pdf", 300, 300, FileUtil.file("D:\\Users\\w\\Desktop\\qrcode.jpg"));
-
-*/
-
-// List<TjProject> list = projectService.list();
-// for (TjProject tjProject : list) {
-// tjProject.setProEngName(PinyinUtil.getFirstLetter(tjProject.getProName(),""));
-// projectService.updateById(tjProject);
-// }
-//
-// List<TjCustomer> list1 = tjCustomerService.list();
-// for (TjCustomer customer : list1) {
-// customer.setPym(PinyinUtil.getFirstLetter(customer.getCusName(),""));
-// tjCustomerService.updateById(customer);
-// }
-//
-// List<TjPackage> list2 = tjPackageService.list();
-// for (TjPackage tjPackage : list2) {
-// tjPackage.setPym(PinyinUtil.getFirstLetter(tjPackage.getPacName(),""));
-// tjPackageService.updateById(tjPackage);
-// }
-
-
-// PinyinUtil.getFirstLetter();
+ System.out.println(numbers);
+ executorService.shutdown(); // 鍏抽棴绾跨▼姹�
}
+ public static void main(String[] args) throws Exception {
+ List<String> numbers = Arrays.asList(
+ "25032800283", "25032800284", "25032800285", "25032800286",
+ "25032800287", "25032800288", "25032800289", "25032800290",
+ "25032800291", "25032800292", "25032800293", "25032800294",
+ "25032800295", "25032800296", "25032800297", "25032800298",
+ "25032800299", "25032800300", "25032800301", "25032800302",
+ "25032800303", "25032800304", "25032800305", "25032800306",
+ "25032800307", "25032800308", "25032800309", "25032800310",
+ "25032800311", "25032800312", "25032800313", "25032800314",
+ "25032800315", "25032800316", "25032800317", "25032800318",
+ "25032800319", "25032800320", "25032800321", "25032800322",
+ "25032800323", "25032800324", "25032800325", "25032800326",
+ "25032800327", "25032800328", "25032800329", "25032800330",
+ "25032800331", "25032800332", "25032800333", "25032800334",
+ "25032800335", "25032800336", "25032800337", "25032800338",
+ "25032800339", "25032800340", "25032800341", "25032800342",
+ "25032800343", "25032800344", "25032800345", "25032800346",
+ "25032800347", "25032800348", "25032800349", "25032800350",
+ "25032800351", "25032800352", "25032800353", "25032800354",
+ "25032800355", "25032800356", "25032800357", "25032800358",
+ "25032800359", "25032800360", "25032800361", "25032800362",
+ "25032800363", "25032800364", "25032800365", "25032800366",
+ "25032800367", "25032800368", "25032800369", "25032800370",
+ "25032800371", "25032800372", "25032800373", "25032800374"
+ );
-
-
-
- public static void main(String[] args) {
-// BigDecimal ordPrice =new BigDecimal("13.05");
-// BigDecimal multiply = ordPrice.multiply((new BigDecimal("6.5").divide(BigDecimal.valueOf(10))));
-// System.out.println(multiply);
-
- String a="1,4";
- String[] split = a.split(",|锛寍銆倈锛殀:");
- List<String> list = Arrays.asList(split);
- log.info("鍙傛暟閰嶇疆閲岄潰鐨勫�间负 list :"+list);
-
- System.out.println( list.contains("1"));
+ Set<String> uniqueNumbers = new HashSet<>(numbers);
+ if (uniqueNumbers.size() == numbers.size()) {
+ System.out.println("鉁� 娌℃湁閲嶅缂栧彿锛�");
+ } else {
+ System.out.println("鉂� 鍙戠幇閲嶅缂栧彿锛�");
+ numbers.stream()
+ .filter(n -> Collections.frequency(numbers, n) > 1)
+ .distinct()
+ .forEach(n -> System.out.println("閲嶅鐨勭紪鍙凤細" + n));
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjXdtgmdjg.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjXdtgmdjg.java
new file mode 100644
index 0000000..5852cff
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjXdtgmdjg.java
@@ -0,0 +1,28 @@
+package com.ltkj.hosp.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.ltkj.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * ClassName: tjXdtgmdjg <br/>
+ * Description: <br/>
+ * date: 2025/3/31 15:20<br/>
+ *
+ * @author zjh<br />
+ */
+@Data
+public class TjXdtgmdjg extends BaseEntity {
+ @TableId(type = IdType.AUTO)
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long Id;
+ private String tjh;
+ private String cardId;
+ private String proId;
+ private String proName;
+ private String jcsj;
+ private String jcjl;
+}
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 9d0812d..b6c7fe4 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
@@ -7,6 +7,7 @@
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@@ -23,6 +24,9 @@
@Delete ("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tmh} ")
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);
+
@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);
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 e3c2e55..1df6bdc 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,6 +28,9 @@
@Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh}")
void deletedLtkjJcsqdByTjhAndTmh(@Param("tjh")String tjh);
+ @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and tmh=#{tmh}")
+ 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);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
index fa65ef8..0d75038 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -174,13 +174,12 @@
@Select("SELECT a.* FROM tj_order_remark a LEFT JOIN sys_dept b ON b.dept_id=a.dept_id LEFT JOIN tj_project c ON c.pro_id=a.pro_id\n" +
"\n" +
- "WHERE a.deleted=0 AND b.org_type = 3 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
-// AND c.need_report='Y' guo
+ "WHERE a.deleted=0 AND b.org_type = 3 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
List<TjOrderRemark> notHuaYanData(String tjnumber);
@Select("SELECT a.* FROM tj_order_remark a LEFT JOIN sys_dept b ON b.dept_id=a.dept_id LEFT JOIN tj_project c ON c.pro_id=a.pro_id\n" +
"\n" +
- "WHERE a.deleted=0 AND b.org_type = 2 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
+ "WHERE a.deleted=0 AND b.org_type = 2 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
// AND c.need_report='Y' guo
List<TjOrderRemark> pacsJianChaData(String tjnumber);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjXdtgmdjgMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjXdtgmdjgMapper.java
new file mode 100644
index 0000000..6c970f0
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjXdtgmdjgMapper.java
@@ -0,0 +1,21 @@
+package com.ltkj.hosp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ltkj.hosp.domain.TjXdtgmdjg;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * ClassName: TjXdtgmdjgMapper <br/>
+ * Description: <br/>
+ * date: 2025/3/31 15:46<br/>
+ *
+ * @author zjh<br />
+ */
+@Mapper
+public interface TjXdtgmdjgMapper extends BaseMapper<TjXdtgmdjg> {
+
+ @Delete("DELETE FROM tj_xdtgmdjg WHERE tjh=#{tjNumber} and pro_id=#{proId}")
+ void deletedByTJhAndProId(@Param("tjNumber") String tjNumber,@Param("proId") String proId);
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
index 20debd9..7f56c09 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -193,5 +193,5 @@
//瀛樺偍杩囩▼涓撶敤鎺ュ彛(鍒濆)
- Map<String,Object> getYxJcList(String tjNumber,Integer page,Integer pageSize, String compId, String beginTime, String endTime,String tjname,String tcm);
+ Map<String,Object> getYxJcList(Integer checkStatus ,String tjNumber,Integer page,Integer pageSize, String compId, String beginTime, String endTime,String tjname,String tcm);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcbgdService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcbgdService.java
index 0d2f330..b893f3d 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcbgdService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcbgdService.java
@@ -17,6 +17,8 @@
void deletedLtkjJcbgdByTjhAndTmh(String tmh);
+ void deletedLtkjJcbgdByTjhandtmh(String tjh,String tmh);
+
List<String> getJianJcBaoGaoDan(String cardId);
List<LtkjExamJcbgd> getJianJcBaoGaoDanList(String tmh);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java
index 5c566d4..4d97952 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java
@@ -21,6 +21,8 @@
void deletedLtkjJcsqdByTjhAndTmh(String tjh);
+ void deletedLtkjJcsqdByTjhandtmh(String tjh,String tmh);
+
List<LtkjExamJcsqd> getLtkjJcsqdByTjh(String tjh);
void saveLtkjExamJcsqd(String tjh);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjXdtgmdjgService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjXdtgmdjgService.java
new file mode 100644
index 0000000..a052a73
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjXdtgmdjgService.java
@@ -0,0 +1,17 @@
+package com.ltkj.hosp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ltkj.hosp.domain.TjXdtgmdjg;
+
+/**
+ * ClassName: TjXdtgmdjgService <br/>
+ * Description: <br/>
+ * date: 2025/3/31 15:46<br/>
+ *
+ * @author zjh<br />
+ */
+
+
+public interface TjXdtgmdjgService extends IService<TjXdtgmdjg> {
+ void deletedByTJhAndProId(String tjNumber, String proId);
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcbgdServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcbgdServiceImpl.java
index 215f935..7cbdebf 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcbgdServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcbgdServiceImpl.java
@@ -31,6 +31,11 @@
}
@Override
+ public void deletedLtkjJcbgdByTjhandtmh(String tjh, String tmh) {
+ mapper.deletedLtkjJcbgdByTjhandtmh(tjh,tmh);
+ }
+
+ @Override
public List<String> getJianJcBaoGaoDan(String cardId) {
return mapper.getJianJcBaoGaoDan(cardId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java
index 6182d21..860ee11 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java
@@ -52,6 +52,11 @@
}
@Override
+ public void deletedLtkjJcsqdByTjhandtmh(String tjh, String tmh) {
+ mapper.deletedLtkjJcsqdByTjhandtmh(tjh,tmh);
+ }
+
+ @Override
public List<LtkjExamJcsqd> getLtkjJcsqdByTjh(String tjh) {
return mapper.getLtkjJcsqdByTjh(tjh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
index 01480b4..6b58b88 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -458,8 +458,9 @@
}
@Override
- public Map<String, Object> getYxJcList(String tjNumber, Integer page, Integer pageSize, String compId, String beginTime, String endTime, String tjname,String tcm) {
+ public Map<String, Object> getYxJcList(Integer checkStatus ,String tjNumber, Integer page, Integer pageSize, String compId, String beginTime, String endTime, String tjname,String tcm) {
Map<String, Object> map = new HashMap<>();
+ map.put("checkStatus",checkStatus);
map.put("page",page);
map.put("pageSize",pageSize);
map.put("tjNumber",tjNumber);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjXdtgmdjgServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjXdtgmdjgServiceImpl.java
new file mode 100644
index 0000000..5d345a4
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjXdtgmdjgServiceImpl.java
@@ -0,0 +1,27 @@
+package com.ltkj.hosp.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ltkj.hosp.domain.TjXdtgmdjg;
+import com.ltkj.hosp.mapper.TjXdtgmdjgMapper;
+import com.ltkj.hosp.service.TjXdtgmdjgService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * ClassName: TjXdtgmdjgServiceImpl <br/>
+ * Description: <br/>
+ * date: 2025/3/31 15:47<br/>
+ *
+ * @author zjh<br />
+ */
+@Service
+public class TjXdtgmdjgServiceImpl extends ServiceImpl<TjXdtgmdjgMapper, TjXdtgmdjg> implements TjXdtgmdjgService {
+
+ @Autowired
+ private TjXdtgmdjgMapper mapper;
+
+ @Override
+ public void deletedByTJhAndProId(String tjNumber, String proId) {
+ mapper.deletedByTJhAndProId(tjNumber,proId);
+ }
+}
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
index ad5e7f3..a256507 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
@@ -416,6 +416,7 @@
<select id="getYxJcList" parameterType="java.util.Map" statementType="CALLABLE" resultType="java.util.Map">
{call tj_xdtgmd_list(
+ #{checkStatus,mode=IN,jdbcType=INTEGER},
#{page,mode=IN,jdbcType=INTEGER},
#{pageSize,mode=IN,jdbcType=INTEGER},
#{tjNumber,mode=IN,jdbcType=VARCHAR},
--
Gitblit v1.8.0