From d70e0a3a1b352f2f81271d50ea539f4df715bf4e Mon Sep 17 00:00:00 2001 From: zhaowenxuan <chacca165@163.com> Date: 星期一, 20 一月 2025 11:13:33 +0800 Subject: [PATCH] 增加药品请求表 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 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 8c0038e..f185fb7 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 @@ -771,6 +771,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()) @@ -837,6 +838,7 @@ 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()); @@ -900,6 +902,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); @@ -1654,10 +1657,25 @@ 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(),tjNumber); + 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) { + Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s); + 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