From 4761f2bc70814bde9929f1081a213a9ab38a7393 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 02 一月 2025 18:15:38 +0800
Subject: [PATCH] 采样管理确认采样增加调用lis请求
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 217 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 176 insertions(+), 41 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 328415d..99b3545 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
@@ -63,7 +63,7 @@
*/
@RestController
@RequestMapping ("/check")
-@Api (tags = "鎬绘鍖诲笀鐩稿叧鎺ュ彛")
+@Api (tags = "AAAAAAAAAAAA鎬绘鍖诲笀鐩稿叧鎺ュ彛")
@Slf4j
public class TjCheckController {
@Resource
@@ -120,6 +120,59 @@
private HisApiConfigService hisApiConfigService;
@Autowired
private RedissonClient redissonClient;
+ @Autowired
+ private ITjRulesService rulesService;
+
+
+ @GetMapping ("/ceshicc")
+ @ApiOperation (value = "娴嬭瘯璋冪敤瀛樺偍杩囩▼鑰楁椂鎺ュ彛")
+ @RepeatSubmit
+// @Transactional
+ public AjaxResult ceshicc() {
+
+ 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 ("/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);
+// }
+
+
+
@GetMapping ("/getOperationPermissionsByTjNum")
@ApiOperation (value = "(鍒濆椤甸潰 鍜� 鍖荤敓椤甸潰)鏍规嵁浣撴鍙疯幏鍙栨槸鍚﹀彲鎿嶄綔鏉冮檺鎺ュ彛 true鍙搷浣� 鍙嶄箣涓嶅彲")
@@ -135,17 +188,6 @@
}
}
return AjaxResult.success(false);
- }
-
-
-
- @GetMapping ("/ceshi")
- @ApiOperation (value = "娴嬭瘯璋冪敤lis瑙嗗浘鏁版嵁鎺ュ彛")
- @RepeatSubmit
-// @Transactional
- public AjaxResult ceshi() {
- List<Map<String, Object>> ccXZxYyLisJgSt = testMapper.getCcXZxYyLisJgSt();
- return AjaxResult.success(ccXZxYyLisJgSt);
}
@@ -287,7 +329,7 @@
public List<CsProVo> getCsProVos(String tjNumber,boolean sfzpacs) {
List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber,sfzpacs);
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
list.sort(new Comparator<CsProVo>() {
@Override
public int compare(CsProVo o1, CsProVo o2) {
@@ -599,27 +641,50 @@
}
}
}
-
}else {
return AjaxResult.error("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!");
}
}
}
-
-
return AjaxResult.success("鍚屾鎴愬姛");
-
-
- //鍚屾妫�鏌ラ」鐩粰redis缂撳瓨鐜板湪涓嶇敤浜�
-// asyncService.updateCheckType(order.getTjNumber());
}
-// else if(null !=sfkqdshitulianjie && sfkqdshitulianjie.equals("Y")){
-// List<Map<String,Object>> maps= testMapper.getCcXZxYyLisJgSt();
-// }
- //鍖栭獙
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
- //妫�鏌�
-// jcsqdService.saveLtkjExamJcsqd(order.getCardId());
+ else if(null !=sfkqdshitulianjie && sfkqdshitulianjie.equalsIgnoreCase("Y")){
+ List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(order.getTjNumber());
+ if(null != hysqdList && !hysqdList.isEmpty()){
+ for (LtkjHysqd hysqd : hysqdList) {
+ 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> hybgdList = testMapper.getCcXZxYyLtkjHybgdByLisVi(hysqd.getTmh());
+ ltkjHybgdService.saveBatch(hybgdList);
+ }
+ }
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ }
+ List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(order.getTjNumber());
+ if(null !=jcsqdList && !jcsqdList.isEmpty()){
+ jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId());
+ jcbgdService.deletedLtkjJcbgdByTjhAndTmh(order.getCardId());
+ jcsqdService.saveBatch(jcsqdList);
+ List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(order.getCardId());
+ if(null != jcbgdList && !jcbgdList.isEmpty())jcbgdService.saveBatch(jcbgdList);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ }
+// String tjNumber1 = order.getTjNumber();
+// log.info("鏌ヨ鍑烘潵鐨勪綋妫�鍙锋槸: " + tjNumber1);
+// log.info("浼犺繃鏉ョ殑鐨勪綋妫�鍙锋槸: "+tjNumber);
+ Map<String,Object> map=new HashMap<>();
+ map.put("tjnum",tjNumber);
+ testMapper.tjUpdateDetatilByVi(map);
+ }else {
+ //鍖栭獙
+ testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ }
+ //妫�鏌�
+ orderService.tjLispacstongbujianyi(null,null,null,null);
return AjaxResult.success("鍚屾鎴愬姛");
}
return AjaxResult.error("鏈煡鍒拌浜哄憳浣撴璁板綍");
@@ -1150,8 +1215,12 @@
@ApiParam (value = "鎬绘寤鸿") @RequestParam (required = false) String advice,
@ApiParam (value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam Integer checkStatus) {
- int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
- if (num > 0) return AjaxResult.error("鏈夊欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
+ String config = configService.selectConfigByKey("sfjcwjhyqxm");
+ if(null != config && config.equalsIgnoreCase("Y")){
+ 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);
@@ -1163,17 +1232,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("鎿嶄綔鎴愬姛");
}
@@ -1321,14 +1388,14 @@
List<TjOrderDetail> tjOrderDetails = detailService.addHuaYanTable(tjNumber);
- if (null != remarkList && remarkList.size() > 0) {
+ if (null != remarkList && !remarkList.isEmpty()) {
for (TjOrderRemark remark : remarkList) {
Map<String, Object> parent = new HashMap<>();
parent.put("checkAdvice", one.getCheckAdvice());
parent.put("parent", remark.getProName());
parent.put("parentId", remark.getProId().toString());
List<TjOrderDetail> dels = new ArrayList<>();
- if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
+ if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if (remark.getProId().equals(tjOrderDetail.getProId())) {
String ckfw = tjOrderDetail.getStanId();
@@ -1409,7 +1476,7 @@
List<TjOrderDetail> tjOrderDetails = detailService.addHuaYanAndCgTable(tjNumber);
- if (null != remarkList && remarkList.size() > 0) {
+ if (null != remarkList && !remarkList.isEmpty()) {
for (TjOrderRemark remark : remarkList) {
Map<String, Object> parent = new HashMap<>();
parent.put("checkAdvice", one.getCheckAdvice());
@@ -1418,7 +1485,7 @@
parent.put("xmlb", remark.getXmlb());
parent.put("", remark.getXmlb());
List<TjOrderDetail> dels = new ArrayList<>();
- if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
+ if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
String ckfw = tjOrderDetail.getStanId();
@@ -1444,7 +1511,7 @@
}else {
tjOrderDetail.setYcbz("");
}
- if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
+ if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().isEmpty()) {
tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
}
}else {
@@ -1456,7 +1523,6 @@
if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�")) tjOrderDetail.setYcbz("鈫�");
}
} catch (NumberFormatException ignored) {
- ignored.printStackTrace();
}
}else {
tjOrderDetail.setYcbz("");
@@ -1473,7 +1539,7 @@
} else {
parent.put("parentAdvice", null);
}
- if (dels.size() == 0) {
+ if (dels.isEmpty()) {
continue;
}
parent.put("sons", dels);
@@ -1559,4 +1625,73 @@
return AjaxResult.success(map);
}
+
+
+ @GetMapping ("/getzongjianyishengchakanyichangxiangmu")
+ @ApiOperation (value = "鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛")
+ public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
+ if (StrUtil.isNotBlank(tjNum)) {
+ return zongjianyishengchakanyichangxiangmu(tjNum);
+ }
+ return AjaxResult.error();
+ }
+
+ private AjaxResult zongjianyishengchakanyichangxiangmu(String tjNumber) {
+// asyncService.updateCheckType(tjNumber);
+ TjOrder one = orderService.getOrderByTjNum(tjNumber);
+
+ if (one == null) {
+ return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
+ }
+ List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
+ List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber);
+ List<Map<String, Object>> list = new ArrayList<>();
+ if (null != remarkList && !remarkList.isEmpty()) {
+ for (TjOrderRemark remark : remarkList) {
+ Map<String, Object> parent = new HashMap<>();
+ if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
+ List<TjOrderDetail> dels = new ArrayList<>();
+ 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);
+ }
+ }
+
+ dels.add(tjOrderDetail);
+ }
+ }
+ if(!dels.isEmpty()){
+ parent.put("proName",remark.getProName());
+ parent.put("jyjc",remark.getJyjc());
+ parent.put("sone",dels);
+ list.add(parent);
+ }
+ } else {
+ return AjaxResult.success("璇ヤ汉鍛樻棤寮傚父椤圭洰");
+ }
+ }
+ return AjaxResult.success(list);
+ }
+ return AjaxResult.success("璇ヤ汉鍛樻病鏈変綋妫�椤圭洰鏁版嵁锛�");
+ }
+
+ @GetMapping ("/chushenyemianchakanxiangmujieguo")
+ @ApiOperation (value = "鍒濆椤甸潰鏌ョ湅椤圭洰缁撴灉鎺ュ彛")
+ public AjaxResult chushenyemianchakanxiangmujieguo(@RequestParam String proId,@RequestParam String tjNum) {
+ List<Map<String,Object>> maps = projectService.tjCsXmjgcx(tjNum,proId);
+ return AjaxResult.success(maps);
+ }
+
+ @GetMapping ("/panduaniscunzaiweijian")
+ @ApiOperation (value = "鍒濆椤甸潰鏌ョ湅椤圭洰鍓嶅垽鏂槸鍚﹀叏閮ㄦ湭妫�鎺ュ彛")
+ public AjaxResult panduaniscunzaiweijian(@RequestParam String tjNum) {
+ int a = orderRemarkService.panduaniscunzaiweijian(tjNum);
+ return AjaxResult.success(a);
+ }
+
+
+
}
--
Gitblit v1.8.0