From 65659a03fa8d3ff95c725ea81dcb8c11291c2773 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期六, 09 十二月 2023 10:48:12 +0800
Subject: [PATCH] 1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java | 7 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHarmTypeController.java | 27 ++--
ltkj-admin/src/main/java/com/ltkj/web/controller/mall/WxTjAskMedicalHistoryController.java | 223 +++++++++++++++++++++++++++++-------
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmType.java | 46 ++++---
4 files changed, 228 insertions(+), 75 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/WxTjAskMedicalHistoryController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/WxTjAskMedicalHistoryController.java
index a7b22af..f4ffd0a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/WxTjAskMedicalHistoryController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/WxTjAskMedicalHistoryController.java
@@ -3,13 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.common.core.page.TableDataInfo;
import com.ltkj.framework.config.UserHoder;
-import com.ltkj.hosp.domain.TjAskHistorys;
-import com.ltkj.hosp.domain.TjAskMedicalHistory;
-import com.ltkj.hosp.domain.TjCustomer;
-import com.ltkj.hosp.service.ITjAskHistorysService;
-import com.ltkj.hosp.service.ITjAskMedicalHistoryService;
-import com.ltkj.hosp.service.ITjCustomerService;
+import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,13 +14,13 @@
import javax.annotation.Resource;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
* @Author: zjh
* @Date: 2023/7/26 08:53
*/
-
@RestController
@@ -40,6 +37,17 @@
@Resource
private ITjCustomerService tjCustomerService;
+ @Autowired
+ private ITjHarmTypeService tjHarmTypeService;
+
+ @Autowired
+ private ITjAskWorkLogService tjAskWorkLogService;
+ @Autowired
+ private ITjHarmTypeLogService tjHarmTypeLogService;
+
+ @Resource
+ private ITjOrderService tjOrderService;
+
/**
* 灏忕▼搴忔牴鎹鎴疯韩浠借瘉鍙疯幏鍙栭棶璇婅缁嗕俊鎭�
@@ -47,28 +55,59 @@
@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);
+ LambdaQueryWrapper<TjCustomer> wqqq = new LambdaQueryWrapper<>();
+ wqqq.eq(TjCustomer::getCusIdcard, cusIdCard);
+ TjCustomer customer = tjCustomerService.getOne(wqqq);
+ if (customer != null) {
+ LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrder::getUserId, customer.getCusId());
+ wq.orderByDesc(TjOrder::getCreateTime);
+ wq.last("limit 1");
+ TjOrder order = tjOrderService.getOne(wq);
- if (one1!=null){
- LambdaQueryWrapper<TjAskMedicalHistory> wq=new LambdaQueryWrapper<>();
- wq.eq(TjAskMedicalHistory::getCusId,one1.getCusId());
- TjAskMedicalHistory one = tjAskMedicalHistoryService.getOne(wq);
- if (one!=null){
- return AjaxResult.success(tjAskMedicalHistoryService.selectTjAskMedicalHistoryByAskId(one.getAskId()));
- }else {
- TjAskMedicalHistory a=new TjAskMedicalHistory();
- a.setCusId(one1.getCusId());
- TjCustomer byId = customerService.getById(a.getCusId());
- if (byId!=null){
- a.setCusName(byId.getCusName());
+ if (order != null) {
+ LambdaQueryWrapper<TjAskMedicalHistory> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjAskMedicalHistory::getCusId, order.getTjNumber());
+ TjAskMedicalHistory one = tjAskMedicalHistoryService.getOne(wq1);
+ if (one != null) {
+ one.setTjCategory(order.getTjCategory());
+ //鏌ヨ鐥呭彶璁板綍鍜岃亴涓氳褰�
+ LambdaQueryWrapper<TjAskWorkLog> wqq = new LambdaQueryWrapper<>();
+ wqq.eq(TjAskWorkLog::getTjNumber, order.getTjNumber());
+ 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();
+ a.setTjCategory(order.getTjCategory());
+ a.setCusId(customer.getCusId());
+ a.setTjNum(order.getTjNumber());
+ TjCustomer byId = customerService.getById(a.getCusId());
+ if (byId != null) {
+ a.setCusName(byId.getCusName());
+ }
+ return AjaxResult.success(a);
}
-
- return AjaxResult.success(a);
}
}
- return AjaxResult.error("鏌ユ棤姝や汉");
+ return AjaxResult.success("0");
}
@@ -78,29 +117,125 @@
@ApiOperation(value = "灏忕▼搴忕鏂板闂瘖璁板綍淇℃伅鎺ュ彛")
@PostMapping("/appEdit")
public AjaxResult appEdit(@RequestBody TjAskMedicalHistory tjAskMedicalHistory) {
- TjCustomer customer = customerService.getOne(new LambdaQueryWrapper<TjCustomer>().eq(TjCustomer::getCusIdcard, tjAskMedicalHistory.getCusIdCard()));
- if(null !=customer){
- LambdaQueryWrapper<TjAskMedicalHistory> wq=new LambdaQueryWrapper<>();
- wq.eq(TjAskMedicalHistory::getCusId,customer.getCusId());
- wq.isNull(TjAskMedicalHistory::getTjNum);
- tjAskMedicalHistoryService.remove(wq);
- tjAskMedicalHistory.setCusId(customer.getCusId());
- }
- tjAskMedicalHistory.setFromBy("灏忕▼搴忕");
- tjAskMedicalHistory.setCreateId(String.valueOf(UserHoder.getWxuser().getId()));
-// tjAskMedicalHistory.setUpdateId(String.valueOf(UserHoder.getWxuser().getId()));
- if (tjAskMedicalHistoryService.saveOrUpdate(tjAskMedicalHistory)){
- List<TjAskHistorys> tjAskHistorysList = tjAskMedicalHistory.getTjAskHistorysList();
- if (tjAskHistorysList!=null&&tjAskHistorysList.size()>0){
- for (TjAskHistorys tjAskHistorys : tjAskMedicalHistory.getTjAskHistorysList()) {
- tjAskHistorys.setAskId(tjAskMedicalHistory.getAskId());
- if (!historysService.saveOrUpdate(tjAskHistorys)){
- return AjaxResult.error();
+ LambdaQueryWrapper<TjAskMedicalHistory> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjAskMedicalHistory::getTjNum, tjAskMedicalHistory.getTjNum());
+ final TjAskMedicalHistory one = tjAskMedicalHistoryService.getOne(wq);
+ if (one==null){
+ tjAskMedicalHistory.setFromBy("灏忕▼搴忕");
+ tjAskMedicalHistory.setCreateId(String.valueOf(UserHoder.getWxuser().getId()));
+ if (tjAskMedicalHistoryService.save(tjAskMedicalHistory)) {
+ List<TjAskHistorys> tjAskHistorysList = tjAskMedicalHistory.getTjAskHistorysList();
+ if (tjAskHistorysList != null && tjAskHistorysList.size() > 0) {
+ //娣诲姞鐥呭彶
+ for (TjAskHistorys tjAskHistorys : tjAskMedicalHistory.getTjAskHistorysList()) {
+ tjAskHistorys.setAskId(tjAskMedicalHistory.getAskId());
+ if (!historysService.save(tjAskHistorys)) {
+ return AjaxResult.error();
+ }
+ }
+ //娣诲姞鑱屼笟鐥呭彶
+ final List<TjAskWorkLog> workLogs = tjAskMedicalHistory.getWorkLogs();
+ if (workLogs != null) {
+ for (TjAskWorkLog workLog : workLogs) {
+ workLog.setCusId(tjAskMedicalHistory.getCusId());
+ workLog.setCusName(tjAskMedicalHistory.getCusName());
+ workLog.setTjNumber(tjAskMedicalHistory.getTjNum());
+ final boolean save = tjAskWorkLogService.save(workLog);
+ if (!save) {
+ return AjaxResult.error();
+ }
+ List<String> harmTypeLogs = workLog.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(workLog.getId());
+ final boolean b = tjHarmTypeLogService.save(log);
+ if (!b) {
+ return AjaxResult.error();
+ }
+ }
+ }
+ }
+ }
}
}
+ return AjaxResult.success("娣诲姞鎴愬姛!");
}
- return AjaxResult.success("鎿嶄綔鎴愬姛!");
+ }else {
+ tjAskMedicalHistory.setFromBy("灏忕▼搴忕");
+ tjAskMedicalHistory.setUpdateId(String.valueOf(UserHoder.getWxuser().getId()));
+ if (tjAskMedicalHistoryService.updateById(tjAskMedicalHistory)) {
+ List<TjAskHistorys> tjAskHistorysList = tjAskMedicalHistory.getTjAskHistorysList();
+ if (tjAskHistorysList != null && tjAskHistorysList.size() > 0) {
+ //淇敼鐥呭彶
+ for (TjAskHistorys tjAskHistorys : tjAskMedicalHistory.getTjAskHistorysList()) {
+ tjAskHistorys.setAskId(tjAskMedicalHistory.getAskId());
+ if (!historysService.updateById(tjAskHistorys)) {
+ return AjaxResult.error();
+ }
+ }
+ //淇敼鑱屼笟鐥呭彶
+ final List<TjAskWorkLog> workLogs = tjAskMedicalHistory.getWorkLogs();
+ if (workLogs != null) {
+ for (TjAskWorkLog workLog : workLogs) {
+ workLog.setCusId(tjAskMedicalHistory.getCusId());
+ workLog.setCusName(tjAskMedicalHistory.getCusName());
+ workLog.setTjNumber(tjAskMedicalHistory.getTjNum());
+ final boolean save = tjAskWorkLogService.updateById(workLog);
+ if (!save) {
+ return AjaxResult.error();
+ }
+ List<String> harmTypeLogs = workLog.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(workLog.getId());
+ final boolean b = tjHarmTypeLogService.updateById(log);
+ if (!b) {
+ return AjaxResult.error();
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ return AjaxResult.success("淇敼鎴愬姛!");
+ }
}
return AjaxResult.error("鎿嶄綔澶辫触!");
}
+
+ /**
+ * 鏌ヨ鑱屼笟鐥呭垪琛�
+ */
+ @GetMapping("/getHarmTypeList")
+ public AjaxResult getHarmTypeList(TjHarmType tjHarmType) {
+ LambdaQueryWrapper<TjHarmType> wq = new LambdaQueryWrapper<>();
+ if (tjHarmType.getHarmCode() != null) {
+ wq.like(TjHarmType::getHarmCode, tjHarmType.getHarmCode());
+ }
+ if (tjHarmType.getHarmType() != null) {
+ wq.like(TjHarmType::getHarmType, tjHarmType.getHarmType());
+ }
+ if (tjHarmType.getHarmPinYin() != null) {
+ wq.like(TjHarmType::getHarmPinYin, tjHarmType.getHarmPinYin());
+ }
+ List<TjHarmType> list = tjHarmTypeService.list(wq);
+ return AjaxResult.success(list);
+ }
+
+
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHarmTypeController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHarmTypeController.java
index 46060a9..724123d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHarmTypeController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHarmTypeController.java
@@ -4,16 +4,10 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.ltkj.common.annotation.Log;
import com.ltkj.common.core.controller.BaseController;
import com.ltkj.common.core.domain.AjaxResult;
@@ -41,8 +35,17 @@
@GetMapping("/list")
public TableDataInfo list(TjHarmType tjHarmType) {
startPage();
-// List<TjHarmType> list = tjHarmTypeService.list();
- List<TjHarmType> list = tjHarmTypeService.selectTjHarmTypeList(tjHarmType);
+ LambdaQueryWrapper<TjHarmType> wq=new LambdaQueryWrapper<>();
+ if (tjHarmType.getHarmCode()!=null){
+ wq.like(TjHarmType::getHarmCode,tjHarmType.getHarmCode());
+ }
+ if (tjHarmType.getHarmType()!=null){
+ wq.like(TjHarmType::getHarmType,tjHarmType.getHarmType());
+ }
+ if (tjHarmType.getHarmPinYin()!=null){
+ wq.like(TjHarmType::getHarmPinYin,tjHarmType.getHarmPinYin());
+ }
+ List<TjHarmType> list = tjHarmTypeService.list(wq);
return getDataTable(list);
}
@@ -87,8 +90,8 @@
* 鍒犻櫎鑱屼笟鐥�
*/
@Log(title = "鑱屼笟鐥�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{aids}")
- public AjaxResult remove(@PathVariable String[] aids) {
+ @DeleteMapping("/remove")
+ public AjaxResult remove(@RequestBody String[] aids) {
return toAjax(tjHarmTypeService.removeByIds(Arrays.asList(aids)));
}
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java
index 881ab7c..0456d99 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java
@@ -222,4 +222,11 @@
@Excel(name = "鎺ヨЕ姣掔墿")
private String contactPoison;
+
+ /**
+ * 浣撴绫诲埆
+ */
+ @TableField(exist = false)
+ private String tjCategory;
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmType.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmType.java
index ab533bb..0e6b5ee 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmType.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmType.java
@@ -7,6 +7,7 @@
import com.ltkj.common.annotation.Excel;
import com.ltkj.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -18,10 +19,10 @@
* @date 2023-12-06
*/
@Data
-@ApiModel(value = "闂瘖鑱屼笟鍙茶褰曞璞�")
+@ApiModel(value = "鑱屼笟鐥呭璞�")
@AllArgsConstructor
@NoArgsConstructor
-public class TjHarmType {
+public class TjHarmType extends BaseEntity{
private static final long serialVersionUID = 1L;
/**
@@ -32,51 +33,58 @@
private String aid;
/**
- * $column.columnComment
+ * 鑱屼笟鐥呮嫾闊崇爜
*/
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @Excel(name = "鑱屼笟鐥呮嫾闊崇爜")
+ @ApiModelProperty(value = "鑱屼笟鐥呮嫾闊崇爜")
private String harmPinYin;
/**
- * $column.columnComment
+ * 鑱屼笟鐥呯被鍨�
*/
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @Excel(name = "鑱屼笟鐥呯被鍨�")
+ @ApiModelProperty(value = "鑱屼笟鐥呯被鍨�")
private String harmType;
/**
- * $column.columnComment
+ * 鎺掑簭
*/
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @Excel(name = "鎺掑簭")
+ @ApiModelProperty(value = "鎺掑簭")
private Long sort;
/**
- * $column.columnComment
+ * 璇︾粏淇℃伅
*/
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @Excel(name = "璇︾粏淇℃伅")
+ @ApiModelProperty(value = "璇︾粏淇℃伅")
private String harmInfo;
/**
- * $column.columnComment
+ * 缂栫爜
*/
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @Excel(name = "缂栫爜")
+ @ApiModelProperty(value = "缂栫爜")
private String externalCode;
/**
- * $column.columnComment
+ * 缂栫爜
*/
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @Excel(name = "缂栫爜")
+ @ApiModelProperty(value = "缂栫爜")
private String harmCode;
/**
- * $column.columnComment
+ * 绫诲瀷
*/
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @Excel(name = "绫诲瀷")
+ @ApiModelProperty(value = "绫诲瀷")
private String type;
-
/**
- * $column.columnComment
+ * 闃叉姢鎺柦
*/
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @Excel(name = "闃叉姢鎺柦")
+ @ApiModelProperty(value = "闃叉姢鎺柦")
private String protection;
--
Gitblit v1.8.0