From 1b7ed7edb09aaecf68ddf3396ee007bc6eadf52a Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 30 十二月 2024 17:04:09 +0800
Subject: [PATCH] zjh202412030
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 130 +++++++++++++++++++++++++++----------------
1 files changed, 82 insertions(+), 48 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 f8f75d5..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
@@ -120,13 +120,59 @@
private HisApiConfigService hisApiConfigService;
@Autowired
private RedissonClient redissonClient;
+ @Autowired
+ private ITjRulesService rulesService;
-// public void csdsrw() throws InterruptedException {
-// log.info("瀹氭椂浠诲姟寮�濮嬫墽琛�"+new Date());
-// Thread.sleep(1000*5);
-// log.info("瀹氭椂浠诲姟缁撴潫鎵ц"+new Date());
+ @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鍙搷浣� 鍙嶄箣涓嶅彲")
@@ -142,35 +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);
- }
-
-
- @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);
}
@@ -312,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) {
@@ -1203,7 +1220,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);
@@ -1215,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("鎿嶄綔鎴愬姛");
}
@@ -1373,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();
@@ -1612,11 +1627,6 @@
- /**
- * 鎬绘淇敼澶囨敞
- *
- * @return
- */
@GetMapping ("/getzongjianyishengchakanyichangxiangmu")
@ApiOperation (value = "鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛")
public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
@@ -1627,7 +1637,7 @@
}
private AjaxResult zongjianyishengchakanyichangxiangmu(String tjNumber) {
- asyncService.updateCheckType(tjNumber);
+// asyncService.updateCheckType(tjNumber);
TjOrder one = orderService.getOrderByTjNum(tjNumber);
if (one == null) {
@@ -1643,11 +1653,19 @@
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);
}
@@ -1660,4 +1678,20 @@
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