From 4f1eae9865fca2831ea2966d003b2c57222e036d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 27 三月 2025 18:01:35 +0800
Subject: [PATCH] zjh20250327
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java | 10
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 133 ++++++-----
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java | 6
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 6
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 400 +++++++++++++++++++++++-------------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java | 44 ++--
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java | 7
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java | 4
8 files changed, 378 insertions(+), 232 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index 8821a60..e1032bd 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -1032,7 +1032,8 @@
StringBuilder builder = new StringBuilder();
if (StrUtil.isBlank(result.replaceAll("\n", "").trim())) continue;
- builder.append(" (").append(index).append(")").append(detail.getJcxm()).append(": ").append(result).append("\n");
+ builder.append(" (").append(index).append(")").append(detail.getJcxm()).append(": ")
+ .append(result.replaceAll("\n", "").trim()).append("\n");
index++;
result = builder.toString();
@@ -1192,7 +1193,8 @@
if (StrUtil.isNotBlank(result)) {
StringBuilder builder = new StringBuilder();
if (StrUtil.isBlank(result.replaceAll("\n", "").trim())) continue;
- builder.append(" (").append(index1).append(")").append(detail.getJcxm()).append(": ").append(result).append("\n");
+ builder.append(" (").append(index1).append(")").append(detail.getJcxm()).append(": ")
+ .append(result.replaceAll("\n", "").trim()).append("\n");
index1++;
result = builder.toString();
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 d6edbfa..284b8fb 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
@@ -1652,81 +1652,270 @@
@GetMapping("/getzongjianyishengchakanyichangxiangmu")
@ApiOperation(value = "鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛")
public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
- if (StrUtil.isNotBlank(tjNum)) {
- TjOrder one = orderService.getOrderByTjNum(tjNum);
+ try {
+ if (StrUtil.isNotBlank(tjNum)) {
+ TjOrder one = orderService.getOrderByTjNum(tjNum);
- if (one == null) {
- return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
+ if (one == null) {
+ return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
+ }
+ yichangxiangmu(tjNum);
+ LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderYcxm::getTjh, tjNum);
+ List<TjOrderYcxm> list = ycxmService.list(wq);
+ if (null != list && !list.isEmpty()) {
+ Collections.reverse(list);
+ return getOrderYcxmList(list);
+ } else {
+ return zongjianyishengchakanyichangxiangmu(tjNum);
+ }
}
-
- LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrderYcxm::getTjh, tjNum);
- List<TjOrderYcxm> list = ycxmService.list(wq);
- if (null != list && !list.isEmpty()) {
- Collections.reverse(list);
- return getOrderYcxmList(list);
- } else {
- return zongjianyishengchakanyichangxiangmu(tjNum);
- }
+ return AjaxResult.error();
+ } catch (Exception ex) {
+ //throw new RuntimeException(ex);
+ log.error(ex.getMessage());
+ return AjaxResult.error();
}
- return AjaxResult.error();
}
private static AjaxResult getOrderYcxmList(List<TjOrderYcxm> list) {
- Map<String, List<TjOrderYcxm>> map = list.stream().collect(Collectors.groupingBy(TjOrderYcxm::getParentName));
- List<Map<String, Object>> maps = new ArrayList<>();
- for (Map.Entry<String, List<TjOrderYcxm>> entry : map.entrySet()) {
- Map<String, Object> parent = new HashMap<>();
- List<TjOrderDetail> dels = new ArrayList<>();
- for (TjOrderYcxm ycxm : entry.getValue()) {
- TjOrderDetail detail = new TjOrderDetail();
- detail.setOrderDetailId(Long.valueOf(ycxm.getId()));
- detail.setProName(ycxm.getJcxm());
- detail.setProResult(ycxm.getJcjg());
- detail.setStanId(ycxm.getCkfw());
- detail.setProAdvice(ycxm.getDw());
- List<Map<String, Object>> btnrlist = new ArrayList<>();
- String jynr = ycxm.getJynr();
- JSONArray array = JSONUtil.parseArray(jynr);
- for (Object object : array) {
- Map<String, Object> objectMap = new HashMap<>();
- JSONObject jsonObject = (JSONObject) object;
- String bt = jsonObject.getStr("bt");
- String nr = jsonObject.getStr("nr");
- objectMap.put("bt", bt);
- objectMap.put("nr", nr);
- if (null != bt || null != nr) btnrlist.add(objectMap);
- }
- detail.setAdvices(btnrlist);
- dels.add(detail);
+ try {
+ List<Map<String, Object>> maps = getYcxmMapList(list);
+ if (!maps.isEmpty()) {
+ List<Map<String, Object>> collect1 = maps.stream()
+ .sorted((map1, map2) -> map2.get("proName").toString().compareTo(map1.get("proName").toString()))
+ .collect(Collectors.toList());
+ return AjaxResult.success(collect1);
}
-
- parent.put("proName", entry.getKey());
- parent.put("jyjc", entry.getValue().get(0).getJyjc());
- parent.put("sone", dels);
- maps.add(parent);
+ return AjaxResult.success(maps);
+ } catch (Exception ex) {
+// throw new RuntimeException(ex);
+ log.error(ex.getMessage());
+ return AjaxResult.error();
}
- // List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
-
-
-// List<Map<String, Object>> collect = mapList.stream()
-// .filter(b -> maps.stream()
-// .noneMatch(a -> a.get("proName").equals(b.get("proName")))) // 杩囨护鎺夊湪 maps 涓瓨鍦ㄧ殑鐩稿悓鍏冪礌
-// .collect(Collectors.toList());
-
-
-// if(!collect.isEmpty()){
-// maps.addAll(collect);
-// }
- if (!maps.isEmpty()) {
- List<Map<String, Object>> collect1 = maps.stream()
- .sorted((map1, map2) -> map2.get("proName").toString().compareTo(map1.get("proName").toString()))
- .collect(Collectors.toList());
- return AjaxResult.success(collect1);
- }
- return AjaxResult.success(maps);
}
+ private static List<Map<String, Object>> getYcxmMapList(List<TjOrderYcxm> list) {
+ try {
+ Map<String, List<TjOrderYcxm>> map = list.stream().collect(Collectors.groupingBy(TjOrderYcxm::getParentName));
+ List<Map<String, Object>> maps = new ArrayList<>();
+ for (Map.Entry<String, List<TjOrderYcxm>> entry : map.entrySet()) {
+ Map<String, Object> parent = new HashMap<>();
+ List<TjOrderDetail> dels = new ArrayList<>();
+ for (TjOrderYcxm ycxm : entry.getValue()) {
+ TjOrderDetail detail = new TjOrderDetail();
+ detail.setOrderDetailId(Long.valueOf(ycxm.getId()));
+ detail.setProName(ycxm.getJcxm());
+ detail.setProResult(ycxm.getJcjg());
+ detail.setStanId(ycxm.getCkfw());
+ detail.setProAdvice(ycxm.getDw());
+ List<Map<String, Object>> btnrlist = new ArrayList<>();
+ String jynr = ycxm.getJynr();
+ JSONArray array = JSONUtil.parseArray(jynr);
+ for (Object object : array) {
+ Map<String, Object> objectMap = new HashMap<>();
+ JSONObject jsonObject = (JSONObject) object;
+ String bt = jsonObject.getStr("bt");
+ String nr = jsonObject.getStr("nr");
+ objectMap.put("bt", bt);
+ objectMap.put("nr", nr);
+ if (null != bt || null != nr) btnrlist.add(objectMap);
+ }
+ detail.setAdvices(btnrlist);
+ dels.add(detail);
+ }
+
+ parent.put("proName", entry.getKey());
+ parent.put("jyjc", entry.getValue().get(0).getJyjc());
+ parent.put("sone", dels);
+ maps.add(parent);
+ }
+ return maps;
+ } catch (NumberFormatException ex) {
+// throw new RuntimeException(ex);
+ log.error(ex.getMessage());
+ return null;
+ }
+ }
+
+ private AjaxResult zongjianyishengchakanyichangxiangmu(String tjNumber) {
+ List<Map<String, Object>> list = new ArrayList<>();
+ try {
+ List<TjOrderYcxm> tjOrderYcxms = new ArrayList<>();
+ TjOrder order = orderService.getOrderByTjNum(tjNumber);
+ if (null != order) {
+ List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
+ List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber);
+ LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderYcxm::getTjh, tjNumber);
+ List<TjOrderYcxm> ycxmList = ycxmService.list(wq);
+ 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()) {
+ if (!tjOrderDetail.getDeptId().equals("2")) {
+ List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
+ , tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", ""), tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
+ , tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
+ .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);
+ }
+
+ }
+ if (null == ycxmList || ycxmList.isEmpty()) {
+ TjOrderYcxm ycxm = new TjOrderYcxm();
+ ycxm.setTjh(tjNumber);
+ ycxm.setParentName(remark.getProName());
+ ycxm.setJcxm(tjOrderDetail.getProName());
+ ycxm.setJcjg(tjOrderDetail.getProResult());
+ ycxm.setCkfw(tjOrderDetail.getStanId());
+ ycxm.setDw(tjOrderDetail.getProAdvice());
+ ycxm.setJynr(JSONUtil.toJsonStr(tjOrderDetail.getAdvices()));
+ ycxm.setJyjc(remark.getJyjc());
+ if (ycxmService.save(ycxm)) {
+ tjOrderYcxms.add(ycxm);
+ }
+ }
+ dels.add(tjOrderDetail);
+ }
+ }
+ if (!dels.isEmpty()) {
+ parent.put("proName", remark.getProName());
+ parent.put("jyjc", remark.getJyjc());
+ parent.put("sone", dels);
+ list.add(parent);
+ }
+ }
+ }
+ if (!tjOrderYcxms.isEmpty()) {
+ Collections.reverse(tjOrderYcxms);
+ return getOrderYcxmList(tjOrderYcxms);
+ }
+
+ }
+ }
+ return AjaxResult.success(list);
+ } catch (Exception ex) {
+// throw new RuntimeException(ex);
+ log.error(ex.getMessage());
+ return AjaxResult.success(list);
+ }
+ }
+
+ private void yichangxiangmu(String tjNumber) {
+ try {
+ List<TjOrderYcxm> tjOrderYcxmList= ycxmService.selectListByTjh(tjNumber);
+
+ if(null !=tjOrderYcxmList && !tjOrderYcxmList.isEmpty()){
+
+ List<Map<String, Object>> list = new ArrayList<>();
+ TjOrder order = orderService.getOrderByTjNum(tjNumber);
+ if (null != order) {
+ List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
+ List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber);
+ 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()) {
+ if (!tjOrderDetail.getDeptId().equals("2")) {
+ List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
+ , tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", ""), tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
+ , tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
+ .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 = 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);
+ }
+ }
+ if (!dels.isEmpty()) {
+ parent.put("proName", remark.getProName());
+ parent.put("jyjc", remark.getJyjc());
+ parent.put("sone", dels);
+ list.add(parent);
+ }
+ }
+ }
+ }
+ }
+ List<Map<String, Object>> maps = getYcxmMapList(tjOrderYcxmList);
+ List<Map<String, Object>> collect = list.stream()
+ .filter(b -> maps.stream()
+ .noneMatch(a -> a.get("proName").equals(b.get("proName")))) // 杩囨护鎺夊湪 maps 涓瓨鍦ㄧ殑鐩稿悓鍏冪礌
+ .collect(Collectors.toList());
+
+ if(!collect.isEmpty()){
+ for (Map<String, Object> map : collect) {
+ for (TjOrderDetail detail : (List<TjOrderDetail>) map.get("sone")) {
+ TjOrderYcxm ycxm = new TjOrderYcxm();
+ ycxm.setTjh(tjNumber);
+ ycxm.setParentName(map.get("proName").toString());
+ ycxm.setJcxm(detail.getProName());
+ ycxm.setJcjg(detail.getProResult());
+ ycxm.setCkfw(detail.getStanId());
+ ycxm.setDw(detail.getProAdvice());
+ ycxm.setJynr(JSONUtil.toJsonStr(detail.getAdvices()));
+ ycxm.setJyjc(map.get("jyjc").toString());
+ ycxmService.save(ycxm);
+ }
+ }
+ }
+ }
+
+ } catch (Exception ex) {
+ log.error(ex.getMessage());
+ }
+ }
@GetMapping("/delzongjianyishengchakanyichangxiangmu")
@ApiOperation(value = "鎬绘鍒犻櫎寮傚父椤圭洰鎺ュ彛")
@@ -1735,88 +1924,7 @@
return AjaxResult.success();
}
- private AjaxResult zongjianyishengchakanyichangxiangmu(String tjNumber) {
- List<Map<String, Object>> list = new ArrayList<>();
- List<TjOrderYcxm> tjOrderYcxms = new ArrayList<>();
- TjOrder order = orderService.getOrderByTjNum(tjNumber);
- if (null != order) {
- List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
- List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber);
- LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrderYcxm::getTjh, tjNumber);
- List<TjOrderYcxm> ycxmList = ycxmService.list(wq);
- 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()) {
- if (!tjOrderDetail.getDeptId().equals("2")) {
- List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
- , tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", ""), tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
- , tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
- .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);
- }
-
- }
- if (null == ycxmList || ycxmList.isEmpty()) {
- TjOrderYcxm ycxm = new TjOrderYcxm();
- ycxm.setTjh(tjNumber);
- ycxm.setParentName(remark.getProName());
- ycxm.setJcxm(tjOrderDetail.getProName());
- ycxm.setJcjg(tjOrderDetail.getProResult());
- ycxm.setCkfw(tjOrderDetail.getStanId());
- ycxm.setDw(tjOrderDetail.getProAdvice());
- ycxm.setJynr(JSONUtil.toJsonStr(tjOrderDetail.getAdvices()));
- ycxm.setJyjc(remark.getJyjc());
- if (ycxmService.save(ycxm)) {
- tjOrderYcxms.add(ycxm);
- }
- }
- dels.add(tjOrderDetail);
- }
- }
- if (!tjOrderYcxms.isEmpty()) {
- Collections.reverse(tjOrderYcxms);
- return getOrderYcxmList(tjOrderYcxms);
- }
- if (!dels.isEmpty()) {
- parent.put("proName", remark.getProName());
- parent.put("jyjc", remark.getJyjc());
- parent.put("sone", dels);
- list.add(parent);
- }
- }
- }
-
- }
- }
- return AjaxResult.success(list);
- }
@GetMapping("/chushenyemianchakanxiangmujieguo")
@ApiOperation(value = "鍒濆椤甸潰鏌ョ湅椤圭洰缁撴灉鎺ュ彛")
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 9d7cdf1..71aee5b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1351,20 +1351,23 @@
// 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs
+ //瀵煎叆浜哄憳鏄惁鏀惰垂
+ String drrysfsf = configService.selectConfigByKey("drrysfsf");
+
+
if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
- log.info("绛惧埌鐧昏杩涘叆鏈敹璐规柟娉�");
- // 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
- tjFlowingWater.setPayStasus(1L);
- newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
- tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
- sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
- remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
- List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
- xdPictureService.saveBatch(xdPictureList);
- List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
- log.info("绛惧埌鐧昏:閲囨牱鏁版嵁鏌ヨ涓暟"+detailList.size());
- addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
- return AjaxResult.success(tjNumber);
+ if(StringUtil.isNotBlank(drrysfsf) && drrysfsf.equalsIgnoreCase("Y")){
+ if(null != tjReservation){
+ return isUseLisAndPacsRegister(tjOrder, tjCustomer, tjReservation, tjFlowingWater, sysUser, discount, tjNumber);
+ }else {
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ AjaxResult error = isRequestCommonHisApi(tjOrder, tjCustomer, tjFlowingWater);
+ if (error != null) return error;
+ return AjaxResult.success(tjNumber);
+ }
+ }
+ return isUseLisAndPacsRegister(tjOrder, tjCustomer, tjReservation, tjFlowingWater, sysUser, discount, tjNumber);
+
} else {
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
AjaxResult error = isRequestCommonHisApi(tjOrder, tjCustomer, tjFlowingWater);
@@ -1380,6 +1383,66 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error();
}
+
+ private AjaxResult isUseLisAndPacsRegister(TjOrder tjOrder, TjCustomer tjCustomer, TjReservation tjReservation, TjFlowingWater tjFlowingWater, SysUser sysUser, BigDecimal discount, String tjNumber) {
+ log.info("绛惧埌鐧昏杩涘叆鏈敹璐规柟娉�");
+ // 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
+ tjFlowingWater.setPayStasus(1L);
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
+ List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
+ xdPictureService.saveBatch(xdPictureList);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+ log.info("绛惧埌鐧昏:閲囨牱鏁版嵁鏌ヨ涓暟"+detailList.size());
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+ return AjaxResult.success(tjNumber);
+ }
+
+ public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
+ tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
+ if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
+ tjOrderDetailService.saveJSYTjOrderDetailsByCusId(tjCustomer.getCusIdcard(),
+ String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId(), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ } else {
+ tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
+ }
+
+ tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
+
+ //娣诲姞remark琛ㄦ暟鎹�
+ if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
+ remarkService.saveJSYTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
+
+ } else {
+ remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
+
+ }
+ //鍒ゆ柇鏄惁浜ら挶
+ if ("1".equals(tjOrder.getTjType())) {
+ if (null != tjReservation && tjReservation.getPayType() == 1) {
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
+ List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
+ xdPictureService.saveBatch(xdPictureList);
+ }
+ }
+ if (tjFlowingWater.getPayStasus() == 1L) {
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
+ tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
+ tjFlowingWater.setPayType(4L);
+ tjFlowingWaterService.updateById(tjFlowingWater);
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
+// asyncService.addTjChargingStandard(tjOrder, transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(), tjOrder.getCardId()), sysUser);
+ List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
+ xdPictureService.saveBatch(xdPictureList);
+ }
+ }
+
private AjaxResult isRequestCommonHisApi(TjOrder tjOrder, TjCustomer tjCustomer, TjFlowingWater tjFlowingWater) {
String s = configService.selectConfigByKey("is_request_common_his_api");
@@ -2836,50 +2899,6 @@
map.put("huizong", huiZong);
map.put("info", info);
return AjaxResult.success().put("data", map);
- }
-
-
- public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
- tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
- if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
- tjOrderDetailService.saveJSYTjOrderDetailsByCusId(tjCustomer.getCusIdcard(),
- String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId(), String.valueOf(tjFlowingWater.getTjSerialNumber()));
- } else {
- tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
- }
-
- tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
-
- //娣诲姞remark琛ㄦ暟鎹�
- if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
- remarkService.saveJSYTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
-
- } else {
- remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
-
- }
- //鍒ゆ柇鏄惁浜ら挶
- if ("1".equals(tjOrder.getTjType())) {
- if (null != tjReservation && tjReservation.getPayType() == 1) {
- tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
- sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
- remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
- List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
- xdPictureService.saveBatch(xdPictureList);
- }
- }
- if (tjFlowingWater.getPayStasus() == 1L) {
- tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
- sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
- tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
- tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
- tjFlowingWater.setPayType(4L);
- tjFlowingWaterService.updateById(tjFlowingWater);
- remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
-// asyncService.addTjChargingStandard(tjOrder, transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(), tjOrder.getCardId()), sysUser);
- List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
- xdPictureService.saveBatch(xdPictureList);
- }
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java
index c4d8bb4..df39707 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java
@@ -45,7 +45,7 @@
/**
* 鏌ヨ浣撴椤圭洰寤鸿瑙勫垯鏂拌〃鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('hosp:advicerules:list')")
+// @PreAuthorize("@ss.hasPermi('hosp:advicerules:list')")
@GetMapping("/list")
@ApiOperation(value = "鏌ヨ浣撴椤圭洰寤鸿瑙勫垯鏂拌〃鍒楄〃")
public TableDataInfo list(TjProAdvicerules tjProAdvicerules) {
@@ -57,7 +57,7 @@
/**
* 瀵煎嚭浣撴椤圭洰寤鸿瑙勫垯鏂拌〃鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('hosp:advicerules:export')")
+// @PreAuthorize("@ss.hasPermi('hosp:advicerules:export')")
@Log(title = "浣撴椤圭洰寤鸿瑙勫垯鏂拌〃", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation(value = "瀵煎嚭浣撴椤圭洰寤鸿瑙勫垯鏂拌〃鍒楄〃")
@@ -109,7 +109,7 @@
/**
* 鑾峰彇浣撴椤圭洰寤鸿瑙勫垯鏂拌〃璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('hosp:advicerules:query')")
+// @PreAuthorize("@ss.hasPermi('hosp:advicerules:query')")
@GetMapping(value = "/{id}")
@ApiOperation(value = "鑾峰彇浣撴椤圭洰寤鸿瑙勫垯鏂拌〃璇︾粏淇℃伅")
public AjaxResult getInfo(@PathVariable("id") Long id) {
@@ -119,7 +119,7 @@
/**
* 鏂板浣撴椤圭洰寤鸿瑙勫垯鏂拌〃
*/
- @PreAuthorize("@ss.hasPermi('hosp:advicerules:add')")
+// @PreAuthorize("@ss.hasPermi('hosp:advicerules:add')")
@Log(title = "浣撴椤圭洰寤鸿瑙勫垯鏂拌〃", businessType = BusinessType.INSERT)
@PostMapping
@ApiOperation(value = "鏂板浣撴椤圭洰寤鸿瑙勫垯鏂拌〃")
@@ -137,7 +137,7 @@
/**
* 淇敼浣撴椤圭洰寤鸿瑙勫垯鏂拌〃
*/
- @PreAuthorize("@ss.hasPermi('hosp:advicerules:edit')")
+// @PreAuthorize("@ss.hasPermi('hosp:advicerules:edit')")
@Log(title = "浣撴椤圭洰寤鸿瑙勫垯鏂拌〃", businessType = BusinessType.UPDATE)
@PutMapping
@ApiOperation(value = "淇敼浣撴椤圭洰寤鸿瑙勫垯鏂拌〃")
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
index 4271cb5..16c8c62 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
@@ -217,30 +217,30 @@
TjProject project = projectService.getById(proId);
TjOrder order = orderService.getOrderByTjNum(tjNum);
if(null !=project && null !=order){
- TjProject pproject = projectService.getById(project.getProParentId());
- List<Map<String, Object>> tjproGzJy = projectService.getTjproGzJy(tjNum, proId, keyNum, 0);
- if(null !=tjproGzJy && !tjproGzJy.isEmpty()){
+ TjProject pproject = projectService.getById(project.getProParentId());
+ List<Map<String, Object>> tjproGzJy = projectService.getTjproGzJy(tjNum, proId, keyNum, 0);
+ if(null !=tjproGzJy && !tjproGzJy.isEmpty()){
// proGzjyService.remove(new LambdaQueryWrapper<TjProGzjy>().eq(TjProGzjy::getProId,proId).eq(TjProGzjy::getTjNumber,tjNum));
- proGzjyService.deletedByTjNumAndProId(proId,tjNum);
- for (Map<String, Object> map : tjproGzJy) {
- Object bz = map.get("bz");
- Object bt = map.get("bt");
- Object nr = map.get("nr");
- TjProGzjy proGzjy=new TjProGzjy();
- proGzjy.setTjNumber(tjNum);
- proGzjy.setOrderId(order.getOrderId());
- proGzjy.setProId(Long.valueOf(proId));
- proGzjy.setProName(project.getProName());
- proGzjy.setProPrentId(project.getProParentId());
- proGzjy.setProPrentName(pproject.getProName());
- proGzjy.setProJgz(keyNum);
- if(null !=bz)proGzjy.setBz(bz.toString());
- if(null !=bt)proGzjy.setBt(bt.toString());
- if(null !=nr)proGzjy.setJy(nr.toString());
- proGzjyService.save(proGzjy);
+ proGzjyService.deletedByTjNumAndProId(proId,tjNum);
+ for (Map<String, Object> map : tjproGzJy) {
+ Object bz = map.get("bz");
+ Object bt = map.get("bt");
+ Object nr = map.get("nr");
+ TjProGzjy proGzjy=new TjProGzjy();
+ proGzjy.setTjNumber(tjNum);
+ proGzjy.setOrderId(order.getOrderId());
+ proGzjy.setProId(Long.valueOf(proId));
+ proGzjy.setProName(project.getProName());
+ proGzjy.setProPrentId(project.getProParentId());
+ proGzjy.setProPrentName(pproject.getProName());
+ proGzjy.setProJgz(keyNum);
+ if(null !=bz)proGzjy.setBz(bz.toString());
+ if(null !=bt)proGzjy.setBt(bt.toString());
+ if(null !=nr)proGzjy.setJy(nr.toString());
+ proGzjyService.save(proGzjy);
+ }
}
- }
- return AjaxResult.success(tjproGzJy);
+ return AjaxResult.success(tjproGzJy);
}
return AjaxResult.success();
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java
index a6952d6..84e7cb9 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java
@@ -4,6 +4,9 @@
import com.ltkj.hosp.domain.TjOrderYcxm;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
* ClassName: TjOrderYcxmMapper <br/>
@@ -17,4 +20,7 @@
@Delete("DELETE FROM tj_order_ycxm WHERE tjh=#{tjh}")
void delOrderYcXmJyByTjh(String tjh);
+
+ @Select("select * FROM tj_order_ycxm WHERE tjh=#{tjNumber}")
+ List<TjOrderYcxm> selectListByTjh(String tjNumber);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java
index 1ab3e3e..0b89b95 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.hosp.domain.TjOrderYcxm;
+import java.util.List;
+
/**
* ClassName: TjOrderYcxmService <br/>
* Description: <br/>
@@ -13,4 +15,6 @@
public interface TjOrderYcxmService extends IService<TjOrderYcxm> {
void delOrderYcXmJyByTjh(String tjh);
+
+ List<TjOrderYcxm> selectListByTjh(String tjNumber);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java
index 2713bed..2f96343 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java
@@ -7,6 +7,8 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
/**
* ClassName: TjOrderYcxmServiceImpl <br/>
@@ -24,4 +26,9 @@
public void delOrderYcXmJyByTjh(String tjh) {
mapper.delOrderYcXmJyByTjh(tjh);
}
+
+ @Override
+ public List<TjOrderYcxm> selectListByTjh(String tjNumber) {
+ return mapper.selectListByTjh(tjNumber);
+ }
}
--
Gitblit v1.8.0