From 6859e991130a26b2a1e393f6a2ce8b89a1bdfd41 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 19 五月 2025 17:12:06 +0800
Subject: [PATCH] 总检页面增加体检类型搜索调整了存储过程
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 92 ++++++++++++++++++++++++++++++---------------
1 files changed, 61 insertions(+), 31 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 3816648..e6a80cb 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
@@ -8,6 +8,7 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
import cn.hutool.json.JSONUtil;
import com.ltkj.common.core.domain.entity.SysMenu;
@@ -15,6 +16,7 @@
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.DictHosp;
import com.ltkj.hosp.domain.TjJcycxm;
+import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.domain.TjProject;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
@@ -231,6 +233,25 @@
private void tbjianyan(String s,String hosp) {
try {
+
+ String isWsByView = configService.selectConfigByKey("is_ws_by_view");
+ if (StrUtil.isNotBlank(isWsByView) && isWsByView.equals("Y")){
+ List<LtkjHysqd> sqd = testMapper.getWsHySqdByView(s);
+ if (sqd != null && !sqd.isEmpty()){
+ for (LtkjHysqd hysqd : sqd) {
+ LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
+ if (null != jybgid) {
+ ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
+ ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(hysqd.getTmh());
+ }
+ if (ltkjHysqdService.save(hysqd)) {
+ List<LtkjHybgd> wsbg = testMapper.getWsHyBgdByView(hysqd.getTmh());
+ ltkjHybgdService.saveBatch(wsbg);
+ }
+ }
+ }
+ }
+
List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s);
if(null !=awsList && !awsList.isEmpty()){
log.info("澶栭�侀」鐩釜鏁�->{} 缁撴灉",awsList.size());
@@ -285,10 +306,10 @@
List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s,hosp);
DynamicDataSourceContextHolder.clearDataSourceType();
if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
+ jcycxmService.deletedByTjh(s);
for (LtkjExamJcsqd jcsqd : jcsqdList) {
if(StringUtil.isNotBlank(jcsqd.getJgzt())){
String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;");
- jcycxmService.deletedByTjh(s);
for (String jg : split) {
if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
&& !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
@@ -367,42 +388,51 @@
@GetMapping ("/tjjcycxm")//鍚屾his椤圭洰鍗曚环淇℃伅
-// @PreAuthorize("@ss.hasPermi('system:config:tbhisproprice')")
@ApiOperation (value = "tjjcycxm")
- public AjaxResult tjjcycxm() {
+ public AjaxResult tjjcycxm(@ApiParam("浣撴鍙�") @RequestParam(required = false)String tjh) {
String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
- List<String> jc = orderService.getJianChaTjNum();
- if (null != jc && !jc.isEmpty()) {
- for (String s : jc) {
- jcycxmService.deletedByTjh(s);
- List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(s);
- if(null !=list && !list.isEmpty()){
- for (LtkjExamJcsqd jcsqd : list) {
- if(StringUtil.isNotBlank(jcsqd.getJgzt())){
-
- String[] split = jcsqd.getJgzt().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("鍙屼晶妞庨棿瀛旀棤鐙獎")&& !jg.contains("鏃犳畩")){
- TjJcycxm jcycxm=new TjJcycxm();
- jcycxm.setTjh(s);
- jcycxm.setYqid(yqbm);
- String[] split1 = jcsqd.getJcxmid().split(";");
- jcycxm.setProId(split1[0]);
- jcycxm.setProName(jcsqd.getJcxmmc());
- jcycxm.setCreateTime(new Date());
- jcycxm.setJcjg(jg);
- jcycxmService.save(jcycxm);
- }
- }
- }
- }
+ if(StringUtil.isNotBlank(tjh)){
+ extracted(tjh, yqbm);
+ }else {
+ List<String> jc = orderService.getJianChaTjNum();
+ if (null != jc && !jc.isEmpty()) {
+ for (String s : jc) {
+ extracted(s, yqbm);
}
-
}
}
return AjaxResult.success();
}
+ private void extracted(String s, String yqbm) {
+ TjOrder order = orderService.getOrderByTjNum(s);
+ jcycxmService.deletedByTjh(order.getCardId());
+ List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(order.getCardId());
+ if(null !=list && !list.isEmpty()){
+ for (LtkjExamJcsqd jcsqd : list) {
+ if(StringUtil.isNotBlank(jcsqd.getJgzt())){
+ String regex = configService.selectConfigByKey("jcycxmzz");
+ if(StringUtil.isBlank(regex)) regex= "銆倈锛泑;|,|锛�";
+ System.out.println("jcycxmzz鍊间负"+regex);
+ String[] split = jcsqd.getJgzt().replaceAll("\n", "").split(regex);
+ for (String jg : split) {
+ if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
+ && !jg.contains("鏈鏄庢樉寮傚父") && !jg.matches("\\d+") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
+ && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")&& !jg.contains("鏃犳畩")){
+ TjJcycxm jcycxm=new TjJcycxm();
+ jcycxm.setTjh(s);
+ jcycxm.setYqid(yqbm);
+ String[] split1 = jcsqd.getJcxmid().split(";");
+ jcycxm.setProId(split1[0]);
+ jcycxm.setProName(jcsqd.getJcxmmc());
+ jcycxm.setCreateTime(new Date());
+ jcycxm.setJcjg(jg);
+ jcycxmService.save(jcycxm);
+ }
+ }
+ }
+ }
+ }
+ }
+
}
--
Gitblit v1.8.0