From c42f62b32bac302a7ac9fcde7489f7c5fc6e11aa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 06 十二月 2024 15:35:17 +0800
Subject: [PATCH] zjh20241205-3
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java | 225 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 149 insertions(+), 76 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 d5f7705..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,22 +126,27 @@
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);
}
}
- return AjaxResult.success();
+ return AjaxResult.error("鏌ユ棤姝や汉");
}
/**
@@ -195,6 +211,125 @@
} else {
b = tjAskMedicalHistoryService.save(tjAskMedicalHistory);
}
+ if (b) {
+ List<TjAskHistorys> tjAskHistorysList = tjAskMedicalHistory.getTjAskHistorysList();
+ if (tjAskHistorysList != null && tjAskHistorysList.size() > 0) {
+ for (TjAskHistorys tjAskHistorys : tjAskMedicalHistory.getTjAskHistorysList()) {
+ tjAskHistorys.setAskId(tjAskMedicalHistory.getAskId());
+ boolean b1 = historysService.saveOrUpdate(tjAskHistorys);
+ if (!b1) {
+ return AjaxResult.error();
+ }
+ }
+ }
+
+ List<TjAskWorkLog> askWorkLogs = tjAskMedicalHistory.getWorkLogs();
+ if (askWorkLogs != null && askWorkLogs.size() > 0) {
+ for (TjAskWorkLog askWorkLog : askWorkLogs) {
+ askWorkLog.setCusId(tjAskMedicalHistory.getCusId());
+ askWorkLog.setCusName(tjAskMedicalHistory.getCusName());
+ askWorkLog.setTjNumber(tjAskMedicalHistory.getTjNum());
+ askWorkLog.setAskId(tjAskMedicalHistory.getAskId());
+ boolean b1 = tjAskWorkLogService.saveOrUpdate(askWorkLog);
+ List<String> harmTypeLogs = askWorkLog.getHarmTypeLogs();
+ if (harmTypeLogs != null) {
+ for (String harmTypeLog : harmTypeLogs) {
+ final TjHarmType byId = tjHarmTypeService.getById(harmTypeLog);
+ if (byId != null) {
+ TjHarmTypeLog log = new TjHarmTypeLog();
+ log.setAid(byId.getAid());
+ log.setCusId(tjAskMedicalHistory.getCusId());
+ log.setCusName(tjAskMedicalHistory.getCusName());
+ log.setTjNumber(tjAskMedicalHistory.getTjNum());
+ log.setWorkId(askWorkLog.getId());
+ tjHarmTypeLogService.save(log);
+ }
+ }
+ }
+ if (!b1) {
+ return AjaxResult.error();
+ }
+ }
+ }
+ return AjaxResult.success(tjAskMedicalHistory);
+ }
+ return AjaxResult.error();
+ //return toAjax(tjAskMedicalHistoryService.updateTjAskMedicalHistory(tjAskMedicalHistory));
+ }
+
+
+ /**
+ * 灏忕▼搴忔牴鎹鎴疯韩浠借瘉鍙疯幏鍙栭棶璇婅缁嗕俊鎭�
+ */
+ @GetMapping(value = "/appGetInfoById")
+ @ApiOperation(value = "灏忕▼搴忔牴鎹綋妫�鍙疯幏鍙栭棶璇婅缁嗕俊鎭�")
+ public AjaxResult appGetInfoById(@RequestParam("tjNumber") String tjNumber) {
+ if (null != tjNumber && !"".equals(tjNumber)) {
+ LambdaQueryWrapper<TjAskMedicalHistory> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjAskMedicalHistory::getTjNum, tjNumber);
+ TjAskMedicalHistory one = tjAskMedicalHistoryService.getOne(wq);
+ if (one != null) {
+ LambdaQueryWrapper<TjAskWorkLog> wqq = new LambdaQueryWrapper<>();
+ wqq.eq(TjAskWorkLog::getTjNumber, tjNumber);
+ final List<TjAskWorkLog> list = tjAskWorkLogService.list(wqq);
+ one.setWorkLogs(list);
+
+ for (TjAskWorkLog askWorkLog : list) {
+ LambdaQueryWrapper<TjHarmTypeLog> wqq1 = new LambdaQueryWrapper<>();
+ wqq1.eq(TjHarmTypeLog::getWorkId, askWorkLog.getId());
+ final List<TjHarmTypeLog> list1 = tjHarmTypeLogService.list(wqq1);
+
+ List<String> skuNos = list1.stream()
+ .map(TjHarmTypeLog::getAid)
+ .collect(Collectors.toList());
+
+ askWorkLog.setHarmTypeLogs(skuNos);
+ }
+
+ LambdaQueryWrapper<TjAskHistorys> wqq111 = new LambdaQueryWrapper<>();
+ wqq111.eq(TjAskHistorys::getAskId, one.getAskId());
+ final List<TjAskHistorys> list11 = historysService.list(wqq111);
+ one.setTjAskHistorysList(list11);
+
+ 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()));
+ }
+ return AjaxResult.success(a);
+ }
+ }
+ return AjaxResult.error("鏌ユ棤姝や汉");
+
+ }
+
+ /**
+ * 灏忕▼搴忎慨鏀归棶璇�
+ */
+ @ApiOperation(value = "灏忕▼搴忎慨鏀归棶璇�")
+ @PostMapping("/appEdit")
+ public AjaxResult appEdit(@RequestBody TjAskMedicalHistory tjAskMedicalHistory) {
+ LambdaQueryWrapper<TjAskWorkLog> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjAskWorkLog::getTjNumber, tjAskMedicalHistory.getTjNum());
+ tjAskWorkLogService.remove(wq);
+ LambdaQueryWrapper<TjHarmTypeLog> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjHarmTypeLog::getTjNumber, tjAskMedicalHistory.getTjNum());
+ tjHarmTypeLogService.remove(wq1);
+
+
+ boolean b = false;
+ tjAskMedicalHistory.setFromBy("PC绔�");
+ if (tjAskMedicalHistory.getAskId() != null) {
+ b = tjAskMedicalHistoryService.updateById(tjAskMedicalHistory);
+ } else {
+ b = tjAskMedicalHistoryService.save(tjAskMedicalHistory);
+ }
//boolean b = tjAskMedicalHistoryService.saveOrUpdate(tjAskMedicalHistory);
if (b) {
List<TjAskHistorys> tjAskHistorysList = tjAskMedicalHistory.getTjAskHistorysList();
@@ -231,68 +366,6 @@
}
}
}
- if (!b1) {
- return AjaxResult.error();
- }
- }
- }
- return AjaxResult.success();
- }
- return AjaxResult.error();
- //return toAjax(tjAskMedicalHistoryService.updateTjAskMedicalHistory(tjAskMedicalHistory));
- }
-
-
- /**
- * 灏忕▼搴忔牴鎹鎴疯韩浠借瘉鍙疯幏鍙栭棶璇婅缁嗕俊鎭�
- */
- @GetMapping(value = "/appGetInfoById")
- @ApiOperation(value = "灏忕▼搴忔牴鎹鎴疯韩浠借瘉鍙疯幏鍙栭棶璇婅缁嗕俊鎭�")
- public AjaxResult appGetInfoById(@RequestParam("cusIdCard") String cusIdCard) {
- LambdaQueryWrapper<TjCustomer> wqqq = new LambdaQueryWrapper<>();
- wqqq.eq(TjCustomer::getCusIdcard, cusIdCard);
- TjCustomer one1 = tjCustomerService.getOne(wqqq);
-
- if (one1 != null) {
- LambdaQueryWrapper<TjAskMedicalHistory> wq = new LambdaQueryWrapper<>();
- wq.eq(TjAskMedicalHistory::getCusId, one1.getCusId());
- TjAskMedicalHistory one = tjAskMedicalHistoryService.getOne(wq);
- if (one != null) {
- return success(tjAskMedicalHistoryService.selectTjAskMedicalHistoryByAskId(one.getAskId()));
- } else {
- TjAskMedicalHistory a = new TjAskMedicalHistory();
- a.setCusId(Long.valueOf(one1.getCusId()));
- TjCustomer byId = customerService.getById(a.getCusId());
- if (byId != null) {
- a.setCusName(byId.getCusName());
- }
-
- return AjaxResult.success(a);
- }
- }
- return AjaxResult.error("鏌ユ棤姝や汉");
-
- }
-
- /**
- * 灏忕▼搴忎慨鏀归棶璇�
- */
- @ApiOperation(value = "灏忕▼搴忎慨鏀归棶璇�")
- @PostMapping("/appEdit")
- public AjaxResult appEdit(@RequestBody TjAskMedicalHistory tjAskMedicalHistory) {
- boolean b = false;
- tjAskMedicalHistory.setFromBy("灏忕▼搴忕");
- if (tjAskMedicalHistory.getAskId() != null) {
- b = tjAskMedicalHistoryService.updateById(tjAskMedicalHistory);
- } else {
- b = tjAskMedicalHistoryService.save(tjAskMedicalHistory);
- }
- if (b) {
- List<TjAskHistorys> tjAskHistorysList = tjAskMedicalHistory.getTjAskHistorysList();
- if (tjAskHistorysList != null && tjAskHistorysList.size() > 0) {
- for (TjAskHistorys tjAskHistorys : tjAskMedicalHistory.getTjAskHistorysList()) {
- tjAskHistorys.setAskId(tjAskMedicalHistory.getAskId());
- boolean b1 = historysService.saveOrUpdate(tjAskHistorys);
if (!b1) {
return AjaxResult.error();
}
--
Gitblit v1.8.0