From 121a2eda372f4149864117b881e8c334dc6e6c54 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期五, 15 九月 2023 12:00:24 +0800
Subject: [PATCH] 1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 131 ++++++++++++++++---------------------------
1 files changed, 50 insertions(+), 81 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 ee7de4a..051fd14 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
@@ -72,26 +72,21 @@
private ISysDeptService deptService;
-
@GetMapping("/getOperationPermissionsByTjNum")
@ApiOperation(value = "(鍒濆椤甸潰 鍜� 鍖荤敓椤甸潰)鏍规嵁浣撴鍙疯幏鍙栨槸鍚﹀彲鎿嶄綔鏉冮檺鎺ュ彛 true鍙搷浣� 鍙嶄箣涓嶅彲")
public AjaxResult getOperationPermissionsByTjNum(@ApiParam(value = "浣撴鍙�") @RequestParam String tjNumber) {
TjOrder order = orderService.getOrderByTjNum(tjNumber);
- if(null !=order){
+ if (null != order) {
Integer status = order.getStatus();
- if(status<300){
+ if (status < 300) {
return AjaxResult.success(true);
}
- if(status>300){
+ if (status > 300) {
return AjaxResult.success(false);
}
}
return AjaxResult.success(false);
}
-
-
-
-
@GetMapping("/getCsList")
@@ -161,7 +156,7 @@
}
//鏉′欢鏌ヨ
- if(null != tjNumber || null !=compId || (null !=beginTime && null !=endTime)){
+ if (null != tjNumber || null != compId || (null != beginTime && null != endTime)) {
orderList = orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
return getResult(page, pageSize, orderList, customerList, map);
}
@@ -185,7 +180,6 @@
}
-
/**
* 鍒濆
*/
@@ -200,7 +194,7 @@
vo.setDeptName(deptService.getById(remark.getDeptId()).getDeptName());
vo.setProName(projectService.getById(remark.getProId()).getProName());
vo.setType(remark.getType());
- if(null !=remark.getDoctorName()){
+ if (null != remark.getDoctorName()) {
vo.setDoctorName(userService.getById(remark.getDoctorName()).getNickName());
vo.setBcdoctorName(userService.getById(remark.getDoctorName()).getNickName());
}
@@ -215,7 +209,7 @@
Collections.sort(list, new Comparator<CsProVo>() {
@Override
public int compare(CsProVo o1, CsProVo o2) {
- return o1.getType()-o2.getType();
+ return o1.getType() - o2.getType();
}
});
}
@@ -227,7 +221,7 @@
* 鍒濆
*/
@GetMapping("/confirmOrder")
- @ApiOperation(value = "鍒濆(骞朵慨鏀圭姸鎬�)鎺ュ彛")
+ @ApiOperation(value = "鍒濆(骞朵慨鏀圭姸鎬�)鎺ュ彛")
// @PreAuthorize("@ss.hasPermi('check:check:confirmOrder')")
@Transactional
public AjaxResult confirmOrder(@ApiParam(value = "tjNumber") @RequestParam String tjNumber,
@@ -245,9 +239,9 @@
tjOrder.setConfirmTime(new DateTime());
tjOrder.setConfirmDoctor(sysUser.getNickName());
tjOrder.setConfirmStatus(remark);
- if(status==0){
+ if (status == 0) {
tjOrder.setStatus(TjConstants.TJ_CHECK);
- }else {
+ } else {
tjOrder.setStatus(TjConstants.TJ_REFUSED);
}
if (orderService.updateById(tjOrder)) {
@@ -346,7 +340,7 @@
}
//鏉′欢鏌ヨ
- if(null != tjNumber || null !=compId || (null !=beginTime && null !=endTime)){
+ if (null != tjNumber || null != compId || (null != beginTime && null != endTime)) {
//鍒ゆ柇鏄惁寮�鍚垵瀹�
if ("Y".equals(config)) {
orderList = orderService.getCsTjOrderList1(tjNumber, checkStatus, compId, beginTimes, endTimes);
@@ -440,20 +434,17 @@
@ApiOperation(value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏")
// @PreAuthorize("@ss.hasPermi('check:check:updateCheckType')")
public AjaxResult updateCheckType(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
+ final long l = System.currentTimeMillis();
List<Map<String, Object>> list = new ArrayList<>();
- LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjOrder::getTjNumber, tjNumber);
- TjOrder one = orderService.getOne(wq1);
+ TjOrder one = orderService.getOrderByTjNum(tjNumber);
+
if (one == null) {
return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
}
- LambdaQueryWrapper<TjCustomer> wq22 = new LambdaQueryWrapper<>();
- wq22.eq(TjCustomer::getCusId, one.getUserId());
- TjCustomer customer = customerService.getOne(wq22);
- LambdaQueryWrapper<TjOrderRemark> wqm = new LambdaQueryWrapper<>();
- wqm.eq(TjOrderRemark::getTjNumber, tjNumber);
- wqm.eq(TjOrderRemark::getType, 1);
- List<TjOrderRemark> remarkList = orderRemarkService.list(wqm);
+
+ TjCustomer customer = customerService.getById(one.getUserId());
+ List<TjOrderRemark> remarkList = orderRemarkService.getRemarkListByTjNumAndType(tjNumber);
+
if (null != remarkList && remarkList.size() > 0) {
for (TjOrderRemark remark : remarkList) {
Map<String, Object> parent = new HashMap<>();
@@ -463,66 +454,43 @@
parent.put("parent", project.getProName());
parent.put("parentId", project.getProId().toString());
}
- LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>();
- wq2.eq(TjProject::getProParentId, remark.getProId());
- List<Long> sonsTjProjectList = projectService.list(wq2).stream().map(TjProject::getProId).collect(Collectors.toList());
- if (sonsTjProjectList.size() > 0) {
- LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrderDetail::getOrderId, one.getOrderId());
- wq.in(TjOrderDetail::getProId, sonsTjProjectList);
- List<TjOrderDetail> tjOrderDetails = detailService.list(wq);
- if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
- for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
- LambdaQueryWrapper<TjProject> wqqqq = new LambdaQueryWrapper<>();
- wqqqq.eq(TjProject::getProId, tjOrderDetail.getProId());
- tjOrderDetail.setProject(projectService.getOne(wqqqq));
- LambdaQueryWrapper<TjStandard> wq6 = new LambdaQueryWrapper<>();
- wq6.eq(TjStandard::getProId, tjOrderDetail.getProId());
- List<TjStandard> list2 = tjStandardService.list(wq6);
- if (list2.size() == 0) {
- tjOrderDetail.setStandard(new TjStandard());
- } else if (list2.size() == 1) {
- tjOrderDetail.setStandard(list2.get(0));
- } else {
- for (TjStandard tjStandard : list2) {
- LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
- if (tjStandard.getTjSex() != null) {
- wq8.eq(TjStandard::getTjSex, customer.getCusSex());
- }
- if (tjStandard.getTjType() != null) {
- wq8.eq(TjStandard::getTjType, StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday())));
- }
- tjOrderDetail.setStandard(tjStandardService.getOne(wq8));
- }
- }
- }
- String summary = remark.getSummary();
- if (null != summary) {
- String[] split = summary.split(";");
- LambdaQueryWrapper<TjAdvice> wq3 = new LambdaQueryWrapper<>();
- wq3.in(TjAdvice::getId, Arrays.asList(split));
- List<TjAdvice> advices = tjAdviceService.list(wq3);
- if (null != advices && advices.size() > 0) {
- StringBuilder string = new StringBuilder();
- for (TjAdvice advice : advices) {
- string.append(advice.getTitle()).append(";");
- }
- parent.put("parentAdvice", string);
- }
+ List<TjOrderDetail> tjOrderDetails = detailService.getDetailByOrderIdAndParId(one.getOrderId(), remark.getProId());
+ if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
+ for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
+ final TjProject byId = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
+ tjOrderDetail.setProject(byId);
+ List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
+ if (list2.size() == 0) {
+ tjOrderDetail.setStandard(new TjStandard());
+ } else if (list2.size() == 1) {
+ tjOrderDetail.setStandard(list2.get(0));
} else {
- parent.put("parentAdvice", null);
+ final int ageType = StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday()));
+ TjStandard tjStandard1=tjStandardService.getListBySexAndType(customer.getCusSex(),ageType, String.valueOf(tjOrderDetail.getProId()));
+ tjOrderDetail.setStandard(tjStandard1);
}
- parent.put("sons", tjOrderDetails);
- 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("璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁");
}
+ String summary = remark.getSummary();
+ if (null != summary) {
+ String[] split = summary.split(";");
+ parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(Arrays.asList(split)));
+
+ } else {
+ parent.put("parentAdvice", null);
+ }
+ parent.put("sons", tjOrderDetails);
+ 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("璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁");
}
+// }
}
+ final long l1 = System.currentTimeMillis();
+ System.out.println("++++++++++++++++++++++++++++++++++++++++++==============="+(l1-l));
return AjaxResult.success(list);
}
return AjaxResult.success("璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁锛�");
@@ -538,6 +506,7 @@
/**
* 鎬绘淇敼澶囨敞
+ *
* @return
*/
@PostMapping("/checkUpdateOrderRemark")
--
Gitblit v1.8.0