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/config/timer/AsyncResultTask.java | 4 +
ltkj-admin/src/test/java/zjhTest.java | 23 +++----
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 70 +++++++++++++----------
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java | 2
ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml | 43 ++++++++++++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java | 18 +++++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 20 ++++--
7 files changed, 120 insertions(+), 60 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
index 812ee9f..c6211ad 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
@@ -159,7 +159,9 @@
if(null !=list && !list.isEmpty()){
for (LtkjExamJcsqd jcsqd : list) {
if(StringUtil.isNotBlank(jcsqd.getJgzt())){
- String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;");
+ String regex = configService.selectConfigByKey("jcycxmzz");
+ if(StringUtil.isBlank(regex)) regex= "銆倈锛泑;|,|锛�";
+ String[] split = jcsqd.getJgzt().replaceAll("\n", "").split(regex);
for (String jg : split) {
if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
&& !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
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("姝ｅ父")&& !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);
+ }
+ }
+ }
+ }
+ }
+ }
+
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
index 2105291..b3472f6 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
@@ -8,6 +8,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
@@ -125,13 +126,23 @@
askWorkLog.setHarmTypeLogs(skuNos);
}
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNumber);
+ one.setTjLx(order.getTjCategory());
+
LambdaQueryWrapper<TjAskHistorys> wqq111 = new LambdaQueryWrapper<>();
wqq111.eq(TjAskHistorys::getAskId, one.getAskId());
- final List<TjAskHistorys> list11 = historysService.list(wqq111);
+ wqq111.eq(TjAskHistorys::getDataType,1);
+ List<TjAskHistorys> list11 = historysService.list(wqq111);
one.setTjAskHistorysList(list11);
- TjOrder order = tjOrderService.getOrderByTjNum(tjNumber);
- one.setTjLx(order.getTjCategory());
+
+ wqq111 = new LambdaQueryWrapper<>();
+ wqq111.eq(TjAskHistorys::getAskId, one.getAskId());
+ wqq111.eq(TjAskHistorys::getDataType,2);
+ list11 = historysService.list(wqq111);
+ one.setZhiyezzList(list11);
+
+
return AjaxResult.success(one);
}else {
TjAskMedicalHistory a = new TjAskMedicalHistory();
@@ -367,6 +378,7 @@
return toAjax(historysService.removeByIds(historyId));
}
+
/**
* 灏忕▼搴忔牴鎹鎴疯韩浠借瘉鍙疯幏鍙栭棶璇婅缁嗕俊鎭�
*/
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 3a68c77..e6b5ae0 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
@@ -1686,16 +1686,20 @@
}
} else {
- String[] split = tjOrderDetail.getProResult().split("[銆�,锛�:锛�.\\s]+");
+ String regex = configService.selectConfigByKey("jcycjgfgzz");
+ if(StringUtil.isBlank(regex)) regex="銆倈锛泑;|,|锛�";
+ String[] split = tjOrderDetail.getProResult().replaceAll("\n", "").split(regex);
List<Map<String, Object>> mapList = new ArrayList<>();
for (String s : split) {
- s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "").replaceAll(" ","")
- .replaceAll("鐥�","").replaceAll("[0-9]", "");
- Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s.replaceAll(" ",""), "0",xb);
- if (null != maps && !maps.isEmpty()) {
- Object bt = maps.get("bt");
- Object nr = maps.get("nr");
- if (null != bt || null != nr) mapList.add(maps);
+ if(StringUtil.isNotBlank(s)){
+ s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "").replaceAll(" ","")
+ .replaceAll("[0-9]", "");
+ Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s.replaceAll(" ",""), "0",xb);
+ if (null != maps && !maps.isEmpty()) {
+ Object bt = maps.get("bt");
+ Object nr = maps.get("nr");
+ if (null != bt || null != nr) mapList.add(maps);
+ }
}
}
tjOrderDetail.setAdvices(mapList);
diff --git a/ltkj-admin/src/test/java/zjhTest.java b/ltkj-admin/src/test/java/zjhTest.java
index 56057aa..4d0a2d2 100644
--- a/ltkj-admin/src/test/java/zjhTest.java
+++ b/ltkj-admin/src/test/java/zjhTest.java
@@ -129,23 +129,22 @@
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 input = "1399168522"; // 杈撳叆瀛楃涓�
+ String input = "1.鐢茬姸鑵哄弻渚у彾缁撹妭;浣撶Н澧炲ぇ锛屽厜鐐瑰绮楋紝璇风粨鍚堜复搴�2.鍙屼晶涔宠吅澧炵敓鐥�3.鍙充晶闄勪欢鍥婅偪;鐩嗚厰灏戦噺绉恫";
+ String s = "(\\d+[\\.銆乚\\s*)|[銆俔";
+ System.out.println("jcycxmzz鍊间负"+s);
+ // 浣跨敤姝ｅ垯鍒嗗壊锛氬尮閰� 1. 1銆侊紙鍚庨潰鍙互鏈夌┖鏍硷級锛屾垨涓枃鍙ュ彿鈥溿�傗��
+ String[] parts = input.split(s);
- boolean mobileNO = MatchUtils.isMobileNO(input);
- System.out.println(mobileNO); // 杈撳嚭缁撴灉
- System.out.println(!mobileNO); // 杈撳嚭缁撴灉
-
- if(!mobileNO){
- System.out.println(111);
+ for (String part : parts) {
+ String trimmed = part.trim();
+ System.out.println(trimmed);
}
-
-// System.out.println(s);
}
+ public static boolean isNumeric(String str) {
+ return str != null && str.matches("\\d+");
+ }
/**
* 鎵ц鐢熸垚
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java
index 217f5a4..920fa05 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java
@@ -112,7 +112,7 @@
List<Map<String ,Object >> getCusInfoListByCardAndName(@Param("card") String card,@Param("name") String name);
- @Select("SELECT IF(b.cus_sex=0,'鐢�','濂�') xb FROM tj_order a JOIN tj_customer b ON b.cus_id=a.user_id \n" +
+ @Select("SELECT IF(b.cus_sex=0,'0','1') xb FROM tj_order a JOIN tj_customer b ON b.cus_id=a.user_id \n" +
"WHERE a.tj_number=#{tjNumber}")
String getSexByTjh(String tjNumber);
}
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml
index 5c684ad..837b1dd 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml
@@ -67,11 +67,44 @@
</resultMap>
<sql id="selectTjAskMedicalHistoryVo">
- select ask_id, cus_id, cus_name, work, work_status, medical_history, chuchao, jingqi, zhouqi, mociage, zinv, liuchan,
- zaochan, sichan, yichangtai, xiyan, xiyanpinlv, xiyanyear, yinjiu, yinjiupinlv, yinjiuyear, qita, remark, create_by,
- create_time, update_by, update_time, deleted,from_by,zzsjj,contact_poison,gong_zhong,gong_ling,jhgl,
- dwmc,
- ygdw
+ select ask_id,
+ cus_id,
+ cus_name,
+ work,
+ work_status,
+ medical_history_ids,
+ medical_history,
+ medical_history_other,
+ chuchao,
+ jingqi,
+ zhouqi,
+ mociage,
+ zinv,
+ liuchan,
+ zaochan,
+ sichan,
+ yichangtai,
+ xiyan,
+ xiyanpinlv,
+ xiyanyear,
+ yinjiu,
+ yinjiupinlv,
+ yinjiuyear,
+ qita,
+ remark,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ deleted,
+ from_by,
+ zzsjj,
+ contact_poison,
+ gong_zhong,
+ gong_ling,
+ jhgl,
+ dwmc,
+ ygdw
from tj_ask_medical_history
</sql>
--
Gitblit v1.8.0