From 2359d57cf9074650c25956ae9591c1a2e43a873d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 16 五月 2025 17:28:10 +0800
Subject: [PATCH] zjh20250516

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java |   70 ++++++++++++++++++++---------------
 1 files changed, 40 insertions(+), 30 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 ff41046..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
@@ -16,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.*;
@@ -387,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("姝e父")&& !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("姝e父")&& !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