From d5cd702a6985a208dae4a2e532c984252fbca4d4 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期一, 06 一月 2025 17:27:26 +0800 Subject: [PATCH] 20250106 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java index 4969ee3..b61a155 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java @@ -2,11 +2,13 @@ import java.io.*; import java.math.BigDecimal; +import java.sql.Struct; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; import cn.hutool.core.date.DateUtil; +import cn.hutool.extra.pinyin.PinyinUtil; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; @@ -1638,6 +1640,7 @@ List<TjRules> rulesList = tjRulesService.getTjRulesListByTjNumAndProId(tjNumber, tjOrderDetail.getProId()); tjOrderDetail.setRulesList(rulesList); tjOrderDetail.setProject(project); + tjOrderDetail.setResultType(project.getResultType()); if (null != remark.getDoctorName()) { SysUser byId = userService.getById(remark.getDoctorName()); if (byId != null) { @@ -1784,4 +1787,21 @@ return success(depts); } + @GetMapping("/getxmjgz") + @ApiOperation(value = "鍖荤敓妫�鏌ュ鑾峰彇椤圭洰瑙勫垯鍊�") + public AjaxResult getxmjgz(@RequestParam String proId,@RequestParam(required = false) String xmgz) { + LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>(); + wq.eq(TjRules::getProId, proId); + if(StringUtil.isNotBlank(xmgz))wq.like(TjRules::getRuleStr,xmgz); + List<TjRules> list = tjRulesService.list(wq); + if(null !=list && !list.isEmpty()){ + for (TjRules tjRules : list) { + if(null !=tjRules){ + tjRules.setJm(PinyinUtil.getFirstLetter(tjRules.getRuleStr(),"")); + } + } + } + return AjaxResult.success(list); + } + } -- Gitblit v1.8.0