From ea7e9351b88a5c8075b1abb8336bc4fc808fe896 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期五, 24 五月 2024 15:34:02 +0800 Subject: [PATCH] zjh 2024/05/24-1 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 128 +++++++++++++++++++++++++++++++++++------- 1 files changed, 105 insertions(+), 23 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 99df97c..f94d1cf 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 @@ -269,7 +269,7 @@ @ApiParam(value = "鐘舵�� 0鍚屾剰 1鎷掔粷 榛樿鍚屾剰") @RequestParam(defaultValue = "0") Integer status, @ApiParam(value = "椹冲洖鐞嗙敱") @RequestParam(required = false) String remark) { int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber); - if (num > 0) return AjaxResult.error("鏈夊欢鏈熼」鐩殏涓嶈兘瀹℃牳!"); + if (num > 0) return AjaxResult.error("璇锋鏌ユ槸鍚﹀瓨鍦ㄦ湭妫�鎴栧欢鏈熼」鐩�"); if (null != tjNumber) { Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId()); SysUser sysUser = userService.getById(userId); @@ -314,20 +314,7 @@ if ("Y".equals(getInfoFromSqlData)) { TjOrder order = orderService.getOrderByTjNum(tjNumber); if (null != order) { - List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId()); - if (one != null && one.size() > 0) { - DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name()); - ltkjHysqdService.saveBatch(one); - DynamicDataSourceContextHolder.clearDataSourceType(); - for (LtkjHysqd ltkjHysqd : one) { - List<LtkjHybgd> one1 = testMapper.getHybgdByTmh(ltkjHysqd.getTmh()); - if (one1 != null && one1.size() > 0) { - DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name()); - ltkjHybgdService.saveBatch(one1); - DynamicDataSourceContextHolder.clearDataSourceType(); - } - } - } + tbhyxm(order); // List<LtkjExamJcsqd> one2 = testMapper.getExamJcsqdTmh(tjNumber); // if (one2 != null && one2.size() > 0) { @@ -344,12 +331,34 @@ // } // } //鍚屾鍖栭獙椤圭洰 - testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()),order.getTjNumber(),UserHoder.getLoginUser().getUserId()); + testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId()); //鍚屾妫�鏌ラ」鐩� - testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()),order.getTjNumber(),UserHoder.getLoginUser().getUserId()); + testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId()); + asyncService.updateCheckType(order.getTjNumber()); } } return AjaxResult.success("鍚屾鎴愬姛"); + } + + private void tbhyxm(TjOrder order) { + List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId()); + if (one != null && one.size() > 0) { + for (LtkjHysqd ltkjHysqd : one) { + ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh()); + ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(ltkjHysqd.getTmh()); + LtkjHysqd hysqd = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh()); + if (hysqd == null) { + ltkjHysqdService.save(ltkjHysqd); + DynamicDataSourceContextHolder.clearDataSourceType(); + List<LtkjHybgd> one1 = testMapper.getHybgdByTmh(ltkjHysqd.getTmh()); + if (one1 != null && one1.size() > 0) { + DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name()); + ltkjHybgdService.saveBatch(one1); + DynamicDataSourceContextHolder.clearDataSourceType(); + } + } + } + } } @@ -456,6 +465,7 @@ // } // return getResult(page, pageSize, orderList, customerList, map); // } + String value = String.valueOf(compId); if (tjNumber == null) tjNumber = ""; if (compId == null) value = ""; @@ -519,18 +529,18 @@ /** - * 鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏 + * 鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏鈥斺�斺�斺�旈潪鍖栭獙椤圭洰 * * @param tjNumber * @return */ @GetMapping("/updateCheckType") - @ApiOperation(value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏") + @ApiOperation(value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏鈥斺�斺�斺�旈潪鍖栭獙椤圭洰") public AjaxResult updateCheckType(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) { - if (redisCache.hasKey("updateCheckType" + tjNumber)) { - List<Map<String, Object>> cacheMapValue = redisCache.getCacheMapValue("updateCheckType" + tjNumber, tjNumber); - return AjaxResult.success(cacheMapValue); - } +// if (redisCache.hasKey("updateCheckType" + tjNumber)) { +// List<Map<String, Object>> cacheMapValue = redisCache.getCacheMapValue("updateCheckType" + tjNumber, tjNumber); +// return AjaxResult.success(cacheMapValue); +// } return getAjaxResult(tjNumber); } @@ -556,6 +566,12 @@ if ("N".equals(project.getNeedReport())) { continue; } + + //鍒ゆ柇璇ラ」鐩槸鍚︽楠岀椤圭洰 2024/2/28g + if (project.getDeptId() == 241) { + continue; + } + if (null != project) { parent.put("parent", project.getProName()); parent.put("parentId", project.getProId().toString()); @@ -610,6 +626,72 @@ } + /** + * 鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏鈥斺�斺�斺�斿寲楠岄」鐩� + * + * @param tjNumber + * @return + */ + @GetMapping("/updateCheckTypeHuaYan") + @ApiOperation(value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏鈥斺�斺�斺�斿寲楠岄」鐩�") + public AjaxResult updateCheckTypeHuaYan(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) { +// asyncService.updateCheckType(tjNumber); + List<Map<String, Object>> list = new ArrayList<>(); + TjOrder one = orderService.getOrderByTjNum(tjNumber); + + if (one == null) { + return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒"); + } + tbhyxm(one); +// TjCustomer customer = customerService.getById(one.getUserId()); + List<TjOrderRemark> remarkList = orderRemarkService.addHuaYanTable(tjNumber); + List<TjOrderDetail> tjOrderDetails = detailService.addHuaYanTable(tjNumber); + + + if (null != remarkList && remarkList.size() > 0) { + 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) { + for (TjOrderDetail tjOrderDetail : tjOrderDetails) { + if(remark.getProId().equals(tjOrderDetail.getProId())){ + if(null !=tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")){ + tjOrderDetail.setProResult(tjOrderDetail.getProResult()+" ["+tjOrderDetail.getYcbz()+"]"); + } + dels.add(tjOrderDetail); + } + } + String summary = remark.getSummary(); + if (null != summary) { + String[] split = summary.split(";"); + parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(split)); + } else { + parent.put("parentAdvice", null); + } + if(dels.size()==0){ + continue; + } + parent.put("sons", dels); + parent.put("remark", remark.getRemark()); + if (remark.getDoctorName() != null && null != userService.getById(remark.getDoctorName())) { + parent.put("doctorName", userService.getById(remark.getDoctorName()).getNickName()); + } + + list.add(parent); + } else { + return AjaxResult.success("璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁"); + } + } + return AjaxResult.success(list); + } + return AjaxResult.success("璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁锛�"); + } + + @GetMapping("/getTm") @ApiOperation(value = "鑾峰彇鏉$爜") // @PreAuthorize("@ss.hasPermi('check:check:getTm')") -- Gitblit v1.8.0