From cf37087d3a1bd7247e0fa7acc4c3c6c1e30ea01b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 17 七月 2025 17:56:31 +0800
Subject: [PATCH] zjh20250717
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 173 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 85 insertions(+), 88 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 bd54ce1..d7fde73 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
@@ -23,6 +23,7 @@
import com.ltkj.framework.config.UserHoder;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.dto.CheckUpdateStatusDto;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.*;
@@ -1015,7 +1016,7 @@
if (shys == null) shys = "";
if (beginTime == null) beginTime = "";
if (endTime == null) endTime = "";
- return AjaxResult.success(orderService.getCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name,shys,tjCategory));
+ return AjaxResult.success(orderService.getCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name, shys, tjCategory));
}
@@ -1137,49 +1138,35 @@
* @param checkStatus
* @return
*/
- @PutMapping("/getTjdetailList")
+ @PostMapping("/getTjdetailList")
@ApiOperation(value = "鏍规嵁浣撴璁㈠崟鍙疯幏鍙栦綋妫�璇︽儏淇℃伅(骞朵慨鏀圭姸鎬�)鎺ュ彛")
-// @PreAuthorize("@ss.hasPermi('check:check:getTjdetailList')")
- public AjaxResult getTjdetailList(@ApiParam(value = "浣撴tjNumber") @RequestParam String tjNumber,
- @ApiParam(value = "鎬绘寤鸿") @RequestParam(required = false) String advice,
- @ApiParam(value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam Integer checkStatus,
- @ApiParam(value = "鑱屼笟缁撹") @RequestParam(required = false) String zhiyeJl,
- @ApiParam(value = "鑱屼笟缁撴灉") @RequestParam(required = false) String zhiyeJg) {
+ public AjaxResult getTjdetailList(@RequestBody CheckUpdateStatusDto dto) {
String config = configService.selectConfigByKey("sfjcwjhyqxm");
if (null != config && config.equalsIgnoreCase("Y")) {
- int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
+ int num = orderRemarkService.getTjYqOrderRemarkByTjNum(dto.getTjNumber());
if (num > 0) return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
}
Date date = new Date();
- if (null != tjNumber) {
+ if (null != dto.getTjNumber()) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjOrder::getTjNumber, tjNumber);
+ wq1.eq(TjOrder::getTjNumber, dto.getTjNumber());
TjOrder tjOrder = orderService.getOne(wq1);
if (null != tjOrder) {
- tjOrder.setCheckAdvice(advice);
- tjOrder.setCheckStatus(checkStatus);
+ tjOrder.setCheckAdvice(dto.getAdvice());
+ tjOrder.setCheckStatus(dto.getCheckStatus());
tjOrder.setStatus(TjConstants.TJ_CHECK);
tjOrder.setCheckDoctor(sysUser.getNickName());
tjOrder.setCheckTime(date);
tjOrder.setStatus(401);
tjOrder.setFinishTime(date);
- if (StrUtil.isNotBlank(zhiyeJl))
- tjOrder.setZhiyeJl(zhiyeJl);
- if (StrUtil.isNotBlank(zhiyeJg))
- tjOrder.setZhiyeJg(zhiyeJg);
+ if (StrUtil.isNotBlank(dto.getZhiyeJl()))
+ tjOrder.setZhiyeJl(dto.getZhiyeJl());
+ if (StrUtil.isNotBlank(dto.getZhiyeJg()))
+ tjOrder.setZhiyeJg(dto.getZhiyeJg());
if (orderService.updateById(tjOrder)) {
- TjCustomer customer = customerService.getById(tjOrder.getUserId());
- if (null != customer) {
- customer.setCusNumber(customer.getCusNumber() + 1);
- customer.setCardId("0");
- if (customerService.updateById(customer)) {
- asyncService.updateCheckType(tjNumber);
- return AjaxResult.success("鎿嶄綔鎴愬姛");
- }
- return AjaxResult.error("鎿嶄綔澶辫触");
- }
+ return AjaxResult.success("鎿嶄綔鎴愬姛");
}
return AjaxResult.error("鎿嶄綔澶辫触");
}
@@ -1417,7 +1404,7 @@
parent.put("parent", remark.getProName());
parent.put("parentId", remark.getProsId());
parent.put("xmlb", remark.getXmlb());
- parent.put("zhiyejl",one.getZhiyeJl());
+ parent.put("zhiyejl", one.getZhiyeJl());
parent.put("zhiyejg", one.getZhiyeJg());
parent.put("", remark.getXmlb());
List<TjOrderDetail> dels = new ArrayList<>();
@@ -1672,7 +1659,7 @@
List<TjOrderYcxm> tjOrderYcxms = new ArrayList<>();
TjOrder order = orderService.getOrderByTjNum(tjNumber);
if (null != order) {
- String xb= customerService.getSexByTjh(order.getTjNumber());
+ String xb = customerService.getSexByTjh(order.getTjNumber());
List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber);
LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
@@ -1690,8 +1677,8 @@
String replacedAll = tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "")
.replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "").replaceAll("鈼�", "");
- List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(replacedAll,replacedAll,
- tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber,replacedAll, tjOrderDetail.getProResult());
+ List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(replacedAll, replacedAll,
+ tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber, replacedAll, tjOrderDetail.getProResult());
if (null != maps && !maps.isEmpty()) {
@@ -1700,14 +1687,14 @@
} else {
String regex = configService.selectConfigByKey("jcycjgfgzz");
- if(StringUtil.isBlank(regex)) regex="銆倈锛泑;|,|锛�";
+ if (StringUtil.isBlank(regex)) regex = "銆倈锛泑;|,|锛�";
String[] split = tjOrderDetail.getProResult().replaceAll("\n", "").split(regex);
List<Map<String, Object>> mapList = new ArrayList<>();
for (String s : split) {
- if(StringUtil.isNotBlank(s)){
- s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "").replaceAll(" ","")
+ if (StringUtil.isNotBlank(s)) {
+ s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "").replaceAll(" ", "")
.replaceAll("[0-9]", "");
- Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s.replaceAll(" ",""), "0",xb);
+ Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s.replaceAll(" ", ""), "0", xb);
if (null != maps && !maps.isEmpty()) {
Object bt = maps.get("bt");
Object nr = maps.get("nr");
@@ -1762,72 +1749,73 @@
private void yichangxiangmu(String tjNumber) {
try {
- List<TjOrderYcxm> tjOrderYcxmList= ycxmService.selectListByTjh(tjNumber);
+ List<TjOrderYcxm> tjOrderYcxmList = ycxmService.selectListByTjh(tjNumber);
- if(null !=tjOrderYcxmList && !tjOrderYcxmList.isEmpty()){
+ if (null != tjOrderYcxmList && !tjOrderYcxmList.isEmpty()) {
- List<Map<String, Object>> list = new ArrayList<>();
- TjOrder order = orderService.getOrderByTjNum(tjNumber);
- if (null != order) {
- String xb= customerService.getSexByTjh(order.getTjNumber());
- 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")) {
- String replacedAll = tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "").replaceAll("鈼�", "");
+ List<Map<String, Object>> list = new ArrayList<>();
+ TjOrder order = orderService.getOrderByTjNum(tjNumber);
+ if (null != order) {
+ String xb = customerService.getSexByTjh(order.getTjNumber());
+ 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")) {
+ String replacedAll = tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "").replaceAll("鈼�", "");
- List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
- ,replacedAll,tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber,replacedAll, tjOrderDetail.getProResult());
+ List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
+ , replacedAll, tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber, replacedAll, 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", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "");;
- 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(maps);
}
- }
- tjOrderDetail.setAdvices(mapList);
- }
+ } else {
+ String[] split = tjOrderDetail.getProResult().split("銆倈,|锛�");
+ List<Map<String, Object>> mapList = new ArrayList<>();
+ for (String s : split) {
+ s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "");
+ ;
+ 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);
}
- dels.add(tjOrderDetail);
}
- }
- if (!dels.isEmpty()) {
- parent.put("proName", remark.getProName());
- parent.put("jyjc", remark.getJyjc());
- parent.put("sone", dels);
- list.add(parent);
+ 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()){
+ if (!collect.isEmpty()) {
for (Map<String, Object> map : collect) {
for (TjOrderDetail detail : (List<TjOrderDetail>) map.get("sone")) {
TjOrderYcxm ycxm = new TjOrderYcxm();
@@ -1856,7 +1844,6 @@
ycxmService.removeById(id);
return AjaxResult.success();
}
-
@GetMapping("/chushenyemianchakanxiangmujieguo")
@@ -1910,21 +1897,23 @@
/**
* 鏌ヨ澶嶆煡椤圭洰鍒楄〃
+ *
* @param tjNum 浣撴鍙�
- * @param type 澶嶆煡鐘舵�� 0鏈鏌ョ姸鎬� 1澶嶆煡鐘舵��
+ * @param type 澶嶆煡鐘舵�� 0鏈鏌ョ姸鎬� 1澶嶆煡鐘舵��
* @return
*/
@GetMapping("/getFcList")
- public AjaxResult getFcList(@RequestParam("tjNum") String tjNum,@RequestParam("type") Integer type){
+ public AjaxResult getFcList(@RequestParam("tjNum") String tjNum, @RequestParam("type") Integer type) {
TjOrder order = orderService.getOrderByTjNum(tjNum);
if (order == null)
return AjaxResult.error();
- List<ProFcListVo> list = detailService.getFcList(order.getOrderId(),type);
+ List<ProFcListVo> list = detailService.getFcList(order.getOrderId(), type);
return AjaxResult.success(list);
}
/**
* 澶嶆煡椤圭洰鎻愪氦
+ *
* @param json
* @return
*/
@@ -1943,18 +1932,26 @@
}
+ @GetMapping("/zongjianyishengHuiFuyichangxiangmuanniu")
+ @ApiOperation(value = "鎬绘鎭㈠寮傚父椤圭洰鎸夐挳鎺ュ彛")
+ public AjaxResult zongjianyishengHuiFuyichangxiangmuanniu(@RequestParam String id) {
+
+ int a = ycxmService.zongjianyishengHuiFuyichangxiangmuanniu(id);
+ return AjaxResult.success(a);
+ }
+
@GetMapping("/csymxmxzqtyybcjk")
@ApiOperation(value = "鍒濆椤甸潰椤圭洰閫夋嫨鍏朵粬鍘熷洜淇濆瓨鎺ュ彛")
@Transactional
- public AjaxResult csymxmxzqtyybcjk(@RequestParam @ApiParam("浣撴鍙�") String tjNum,@RequestParam @ApiParam("椤圭洰ID") String proId,
+ public AjaxResult csymxmxzqtyybcjk(@RequestParam @ApiParam("浣撴鍙�") String tjNum, @RequestParam @ApiParam("椤圭洰ID") String proId,
@RequestParam @ApiParam("鍘熷洜") String yy) {
try {
String czydm = SecurityUtils.getUsername();
String czy = SecurityUtils.getLoginUser().getUser().getNickName();
TjProject tjProject = projectService.getById(proId);
- if(null != tjProject){
+ if (null != tjProject) {
SysDept dept = deptService.getById(tjProject.getDeptId());
LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
@@ -1963,7 +1960,7 @@
TjOrderRemark remark = orderRemarkService.getOne(wq);
remark.setType(1);
if (orderRemarkService.updateById(remark)) {
- orderRemarkService.csymxmxzqtyybcjk(tjNum,proId,yy,dept.getOrgType(),czy,czydm);
+ orderRemarkService.csymxmxzqtyybcjk(tjNum, proId, yy, dept.getOrgType(), czy, czydm);
return AjaxResult.success();
}
}
--
Gitblit v1.8.0