From 73a816fd2b1e29c25d615c85ce34b12b55c16ccf Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 20 一月 2025 13:41:45 +0800
Subject: [PATCH] zjh20250120
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 120 ++++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 76 insertions(+), 44 deletions(-)
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 b7188ec..839c23c 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
@@ -122,49 +122,59 @@
private RedissonClient redissonClient;
@Autowired
private ITjRulesService rulesService;
+ @Autowired
+ private ITjProAdvicerulesService tjProAdvicerulesService;
@GetMapping ("/ceshicc")
@ApiOperation (value = "娴嬭瘯璋冪敤瀛樺偍杩囩▼鑰楁椂鎺ュ彛")
@RepeatSubmit
// @Transactional
- public AjaxResult ceshicc(String s) {
+ public AjaxResult ceshicc() {
- Map<String,Object> map=new HashMap<>();
- List<List<?>> tjpled = testMapper.tjplUpdateDetatilByVi(map);
- log.info(tjpled.toString());
- Integer object = (Integer) map.get("total");
- return AjaxResult.success(object);
+ List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd1("8003241206085556");
+ if(null !=jcsqdList && !jcsqdList.isEmpty()){
+ jcsqdService.deletedLtkjJcsqdByTjhAndTmh("8003241206085556");
+ jcbgdService.deletedLtkjJcbgdByTjhAndTmh("8003241206085556");
+ jcsqdService.saveBatch(jcsqdList);
+ List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd1("8003241206085556");
+ if(null != jcbgdList && !jcbgdList.isEmpty())jcbgdService.saveBatch(jcbgdList);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ }
+ return AjaxResult.success();
}
- @GetMapping ("/ceshi")
- @ApiOperation (value = "娴嬭瘯璋冪敤lis瑙嗗浘鏁版嵁鎺ュ彛")
- @RepeatSubmit
-// @Transactional
- public AjaxResult ceshi() {
- List<Map<String, Object>> ccXZxYyLisJgSt = testMapper.getCcXZxYyLisJgSt();
- return AjaxResult.success(ccXZxYyLisJgSt);
- }
+// @GetMapping ("/ceshi")
+// @ApiOperation (value = "娴嬭瘯璋冪敤lis瑙嗗浘鏁版嵁鎺ュ彛")
+// @RepeatSubmit
+//// @Transactional
+// public AjaxResult ceshi() {
+// List<Map<String, Object>> ccXZxYyLisJgSt = testMapper.getCcXZxYyLisJgSt();
+// return AjaxResult.success(ccXZxYyLisJgSt);
+// }
- @GetMapping ("/pacs")
- @ApiOperation (value = "娴嬭瘯璋冪敤pacs瑙嗗浘鏁版嵁鎺ュ彛")
- @RepeatSubmit
- public AjaxResult pacs() {
- List<Map<String, Object>> ccXZxYyPacsJgSt = testMapper.getCcXZxYyPacsJgSt();
+// @GetMapping ("/pacs")
+// @ApiOperation (value = "娴嬭瘯璋冪敤pacs瑙嗗浘鏁版嵁鎺ュ彛")
+// @RepeatSubmit
+// public AjaxResult pacs() {
+// List<Map<String, Object>> ccXZxYyPacsJgSt = testMapper.getCcXZxYyPacsJgSt();
+//
+// List<LtkjExamJcsqd> list = testMapper.getCcXZxYyPacsLtkjExamJcsqd("");
+//
+// log.info(list.toString());
+//
+// List<LtkjExamJcbgd> list1 = testMapper.getCcXZxYyPacsLtkjExamJcbgd("");
+//
+// log.info(list1.toString());
+//
+// return AjaxResult.success(ccXZxYyPacsJgSt);
+// }
- List<LtkjExamJcsqd> list = testMapper.getCcXZxYyPacsLtkjExamJcsqd("");
- log.info(list.toString());
- List<LtkjExamJcbgd> list1 = testMapper.getCcXZxYyPacsLtkjExamJcbgd("");
-
- log.info(list1.toString());
-
- return AjaxResult.success(ccXZxYyPacsJgSt);
- }
@GetMapping ("/getOperationPermissionsByTjNum")
@ApiOperation (value = "(鍒濆椤甸潰 鍜� 鍖荤敓椤甸潰)鏍规嵁浣撴鍙疯幏鍙栨槸鍚﹀彲鎿嶄綔鏉冮檺鎺ュ彛 true鍙搷浣� 鍙嶄箣涓嶅彲")
@@ -716,9 +726,9 @@
if ("Y".equals(getInfoFromSqlData)) {
tbhyxm(order);
//鍚屾鍖栭獙椤圭洰
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
+// testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
//鍚屾妫�鏌ラ」鐩�
- testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
+// testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
asyncService.updateCheckType(order.getTjNumber());
}
@@ -763,6 +773,7 @@
hysqd.setShrdm(jsonObject.getStr("JYYSBH"));
hysqd.setShrxm(jsonObject.getStr("JYYSQM"));
hysqd.setJybgjg(jsonObject.getStr("JYBGJG"));
+ hysqd.setCreateTime(new Date());
QueryWrapper<LtkjHysqd> queryWrapper = new QueryWrapper<>(hysqd);
List<LtkjHysqd> list = ltkjHysqdService.list(queryWrapper);
if (list.isEmpty())
@@ -774,10 +785,10 @@
}
}
//鍚屾鍖栭獙椤圭洰
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
+// testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
}
/*鍚屾妫�鏌� his鎺ュ彛*/
- if (null != jianChaBaoGaoDan && jianChaBaoGaoDan.size() > 0) {
+ if (null != jianChaBaoGaoDan && !jianChaBaoGaoDan.isEmpty()) {
Map<String, Object> maps = new HashMap<>();
maps.put("his_registration_id", order.getCardId());
maps.put("ksbm", "浣撴涓績");
@@ -829,10 +840,11 @@
jcbgd.setJcbw(objectMap.get("JCBW").toString());
if (null != objectMap.get("SQRQSJ") || !objectMap.get("SQRQSJ").equals(""))
jcbgd.setSqsj(objectMap.get("SQRQSJ").toString());
+ jcbgd.setCreateTime(new Date());
jcbgdService.save(jcbgd);
}
jcsqdService.saveLtkjExamJcsqd(order.getCardId());
- testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
+// testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
}else {
return AjaxResult.error("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!");
}
@@ -841,7 +853,7 @@
return AjaxResult.success("鍚屾鎴愬姛");
}
//鍖栭獙
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
+// testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
//妫�鏌�
jcsqdService.saveLtkjExamJcsqd(order.getCardId());
return AjaxResult.success("鍚屾鎴愬姛");
@@ -892,6 +904,7 @@
bgd.setShys(js.getStr("SHRBH"));
bgd.setShysmc(js.getStr("SHRXM"));
bgd.setYcbz(js.getStr("YCTS"));
+ bgd.setCreateTime(new Date());
// bgd.setTpurl(js.getStr(""));
QueryWrapper<LtkjHybgd> queryWrapper = new QueryWrapper<>(bgd);
List<LtkjHybgd> list = ltkjHybgdService.list(queryWrapper);
@@ -946,7 +959,7 @@
private void tbhyxm(TjOrder order) {
List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId());
- if (one != null && one.size() > 0) {
+ if (one != null && !one.isEmpty()) {
for (LtkjHysqd ltkjHysqd : one) {
ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(ltkjHysqd.getTmh());
@@ -955,7 +968,7 @@
ltkjHysqdService.save(ltkjHysqd);
DynamicDataSourceContextHolder.clearDataSourceType();
List<LtkjHybgd> one1 = testMapper.getHybgdByTmh(ltkjHysqd.getTmh());
- if (one1 != null && one1.size() > 0) {
+ if (one1 != null && !one1.isEmpty()) {
DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
ltkjHybgdService.saveBatch(one1);
DynamicDataSourceContextHolder.clearDataSourceType();
@@ -1212,7 +1225,7 @@
int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
if (num > 0) return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
}
-
+ Date date = new Date();
if (null != tjNumber) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
@@ -1224,17 +1237,15 @@
tjOrder.setCheckStatus(checkStatus);
tjOrder.setStatus(TjConstants.TJ_CHECK);
tjOrder.setCheckDoctor(sysUser.getNickName());
- tjOrder.setCheckTime(new Date());
+ tjOrder.setCheckTime(date);
tjOrder.setStatus(401);
+ tjOrder.setFinishTime(date);
if (orderService.updateById(tjOrder)) {
TjCustomer customer = customerService.getById(tjOrder.getUserId());
if (null != customer) {
customer.setCusNumber(customer.getCusNumber() + 1);
+ customer.setCardId("0");
if (customerService.updateById(customer)) {
-// LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
-// wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
-// wqq.eq(TbTransition::getCardId, customer.getCardId());
-// transitionService.remove(wqq);
asyncService.updateCheckType(tjNumber);
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
@@ -1648,10 +1659,31 @@
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
if(null !=tjOrderDetail.getProId()&& null !=tjOrderDetail.getYcbz()){
- List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString(),"",tjOrderDetail.getYcbz(),tjNumber);
- if(null !=maps && !maps.isEmpty()){
- tjOrderDetail.setAdvices(maps);
+ if(!tjOrderDetail.getDeptId().equals("2")){
+ List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
+ ,"",tjOrderDetail.getYcbz().replaceAll(" ", ""),tjNumber
+ ,tjOrderDetail.getProName().replaceAll("\\锛圼^\\锛塢*\\锛�", "")
+ .replaceAll("[ 娴嬪畾]","")
+ ,tjOrderDetail.getProResult());
+ if(null !=maps && !maps.isEmpty()){
+ tjOrderDetail.setAdvices(maps);
+ }
+ }else {
+ String[] split = tjOrderDetail.getProResult().split("銆倈,|锛�");
+ List<Map<String,Object>> mapList=new ArrayList<>();
+ for (String s : split) {
+ s = s.replaceAll("\n", "");
+// Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
+ Map<String,Object> maps= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(),s,"0");
+ 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);
}
+
}
dels.add(tjOrderDetail);
--
Gitblit v1.8.0