From 1630243ed75a92c60d0638e7d14477e4aadcf2b7 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 18 四月 2025 17:41:44 +0800
Subject: [PATCH] zjh20250418
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 430 +++++++++++++++++++++++++++++++----------------------
1 files changed, 249 insertions(+), 181 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 f958a35..ee54d64 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
@@ -1677,82 +1677,270 @@
@GetMapping("/getzongjianyishengchakanyichangxiangmu")
@ApiOperation(value = "鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛")
public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
- long l = System.currentTimeMillis();
- 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);
+ }
}
- String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
- jcycxmService.deletedByTjh(tjNum);
- configController.zongjianshengchengyichangxiangmu(tjNum, yqbm);
+ return AjaxResult.error();
+ } catch (Exception ex) {
+ //throw new RuntimeException(ex);
+ log.error(ex.getMessage());
+ return AjaxResult.error();
+ }
+ }
- LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrderYcxm::getTjh, tjNum);
- List<TjOrderYcxm> list = ycxmService.list(wq);
- if (null != list && !list.isEmpty()) {
- Collections.reverse(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);
+ private static AjaxResult getOrderYcxmList(List<TjOrderYcxm> list) {
+ 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);
+ }
+ return AjaxResult.success(maps);
+ } catch (Exception ex) {
+// throw new RuntimeException(ex);
+ log.error(ex.getMessage());
+ return AjaxResult.error();
+ }
+ }
+
+ 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);
+ String xb= customerService.getSexByTjh(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",xb);
+ 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);
+ }
}
- detail.setAdvices(btnrlist);
- dels.add(detail);
+ }
+ if (!tjOrderYcxms.isEmpty()) {
+ Collections.reverse(tjOrderYcxms);
+ return getOrderYcxmList(tjOrderYcxms);
}
- parent.put("proName", entry.getKey());
- parent.put("jyjc", entry.getValue().get(0).getJyjc());
- parent.put("sone", dels);
- maps.add(parent);
}
- List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
+ }
+ 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);
+ String xb= customerService.getSexByTjh(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());
- List<Map<String, Object>> collect = mapList.stream()
+ 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",xb);
+ 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()) {
- 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());
- System.out.println("鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛鎬昏�楁椂:" + (System.currentTimeMillis() - l));
- return AjaxResult.success(collect1);
- }
- System.out.println("鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛鎬昏�楁椂:" + (System.currentTimeMillis() - l));
- return AjaxResult.success(maps);
- } else {
- List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
- System.out.println("鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛鎬昏�楁椂:" + (System.currentTimeMillis() - l));
- return AjaxResult.success(mapList);
+ 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());
}
- return AjaxResult.error();
}
@GetMapping("/delzongjianyishengchakanyichangxiangmu")
@@ -1762,126 +1950,6 @@
return AjaxResult.success();
}
- /*private List<Map<String, Object>> zongjianyishengchakanyichangxiangmu(String tjNumber) {
-// asyncService.updateCheckType(tjNumber);
-
- 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()){
- 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);
- }
- }
- if(!dels.isEmpty()){
- parent.put("proName",remark.getProName());
- parent.put("jyjc",remark.getJyjc());
- parent.put("sone",dels);
- list.add(parent);
- }
- }
- }
-
- }
- return list;
- }*/
-
- private List<Map<String, Object>> zongjianyishengchakanyichangxiangmu(String tjNumber) {
-// asyncService.updateCheckType(tjNumber);
-
- String xb= customerService.getSexByTjh(tjNumber);
-
- 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()) {
- 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",xb);
- 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);
- }
- }
- }
-
- }
- return list;
- }
@GetMapping("/chushenyemianchakanxiangmujieguo")
@ApiOperation(value = "鍒濆椤甸潰鏌ョ湅椤圭洰缁撴灉鎺ュ彛")
--
Gitblit v1.8.0