From 9155df2aeab5b0d95c89dd928dbaefbfbaeae9d1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 九月 2024 17:10:35 +0800
Subject: [PATCH] zjh 2024-09-05
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
index 345a949..5d27952 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
@@ -41,17 +41,27 @@
private ITjCustomerService customerService;
@Resource
private ITjCustomerService tjCustomerService;
-
@Autowired
private ITjAskWorkLogService tjAskWorkLogService;
@Autowired
private ITjHarmTypeLogService tjHarmTypeLogService;
-
@Autowired
private ITjHarmTypeService tjHarmTypeService;
-
@Resource
private ITjOrderService tjOrderService;
+
+
+ /**
+ * 鏌ヨ闂瘖鍒楄〃
+ */
+ @GetMapping("/getZhengZhuang")
+ @ApiOperation(value = "鑾峰彇鐥囩姸鎺ュ彛闆�")
+ public AjaxResult getZhengZhuang() {
+ List<DictZhengzhuang> zhengZhuang = tjAskMedicalHistoryService.getZhengZhuang();
+ return AjaxResult.success(zhengZhuang);
+ }
+
+
/**
@@ -89,10 +99,11 @@
@GetMapping(value = "/getInfoById")
@ApiOperation(value = "鏍规嵁瀹㈡埛id鑾峰彇闂瘖璇︾粏淇℃伅")
public AjaxResult getInfoById(@RequestParam String tjNumber) {
- if (null != tjNumber && !"".equals(tjNumber)) {
- LambdaQueryWrapper<TjAskMedicalHistory> wq = new LambdaQueryWrapper<>();
- wq.eq(TjAskMedicalHistory::getTjNum, tjNumber);
- TjAskMedicalHistory one = tjAskMedicalHistoryService.getOne(wq);
+ if (null != tjNumber && !tjNumber.isEmpty()) {
+// LambdaQueryWrapper<TjAskMedicalHistory> wq = new LambdaQueryWrapper<>();
+// wq.eq(TjAskMedicalHistory::getTjNum, tjNumber);
+// TjAskMedicalHistory one = tjAskMedicalHistoryService.getOne(wq);
+ TjAskMedicalHistory one = tjAskMedicalHistoryService.selectTjAskMedicalHistoryByTjNum(tjNumber);
if (one != null) {
LambdaQueryWrapper<TjAskWorkLog> wqq = new LambdaQueryWrapper<>();
wqq.eq(TjAskWorkLog::getTjNumber, tjNumber);
@@ -115,17 +126,22 @@
wqq111.eq(TjAskHistorys::getAskId, one.getAskId());
final List<TjAskHistorys> list11 = historysService.list(wqq111);
one.setTjAskHistorysList(list11);
-
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNumber);
+ one.setTjLx(order.getTjCategory());
return AjaxResult.success(one);
}else {
TjAskMedicalHistory a = new TjAskMedicalHistory();
LambdaQueryWrapper<TjOrder> wqqq = new LambdaQueryWrapper<>();
wqqq.eq(TjOrder::getTjNumber, tjNumber);
- final TjOrder one1 = tjOrderService.getOne(wqqq);
- a.setCusId(one1.getUserId());
- TjCustomer byId11 = customerService.getById(a.getCusId());
- if (byId11 != null) {
- a.setCusName(MatchUtils.hideCusName(byId11.getCusName()));
+ final TjOrder order = tjOrderService.getOne(wqqq);
+ a.setCusId(order.getUserId());
+ a.setTjNum(order.getTjNumber());
+ a.setTjLx(order.getTjCategory());
+ TjCustomer customer = customerService.getById(a.getCusId());
+ if (customer != null) {
+ a.setCusName(customer.getCusName());
+ a.setCusIdCard(customer.getCusIdcard());
+ a.setCusSex(String.valueOf(customer.getCusSex()));
}
return AjaxResult.success(a);
}
@@ -195,7 +211,6 @@
} else {
b = tjAskMedicalHistoryService.save(tjAskMedicalHistory);
}
- //boolean b = tjAskMedicalHistoryService.saveOrUpdate(tjAskMedicalHistory);
if (b) {
List<TjAskHistorys> tjAskHistorysList = tjAskMedicalHistory.getTjAskHistorysList();
if (tjAskHistorysList != null && tjAskHistorysList.size() > 0) {
@@ -227,7 +242,7 @@
log.setCusName(tjAskMedicalHistory.getCusName());
log.setTjNumber(tjAskMedicalHistory.getTjNum());
log.setWorkId(askWorkLog.getId());
- tjHarmTypeLogService.saveOrUpdate(log);
+ tjHarmTypeLogService.save(log);
}
}
}
@@ -236,7 +251,7 @@
}
}
}
- return AjaxResult.success();
+ return AjaxResult.success(tjAskMedicalHistory);
}
return AjaxResult.error();
//return toAjax(tjAskMedicalHistoryService.updateTjAskMedicalHistory(tjAskMedicalHistory));
--
Gitblit v1.8.0