From c545063654fda09763ef9199ad4a8ce42efc0b12 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 10 一月 2024 17:53:51 +0800
Subject: [PATCH] zjh 2024/01/10--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPureToneTestController.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPureToneTestController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPureToneTestController.java
index 0f778a5..ce4fb22 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPureToneTestController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPureToneTestController.java
@@ -12,6 +12,7 @@
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.dto.SaveTjPureToneTestDetil;
import com.ltkj.hosp.service.*;
import com.ltkj.system.service.ISysConfigService;
import io.swagger.annotations.Api;
@@ -47,18 +48,31 @@
private ITjOrderService orderService;
@Resource
private TjPureToneTestDetilService toneTestDetilService;
+ @Autowired
+ private ITjAskWorkLogService tjAskWorkLogService;
+ @Resource
+ private ITjOrderRemarkService remarkService;
@PostMapping("/saveTjPureToneTestDetil")
@ApiOperation(value = "淇濆瓨绾煶鍚槇缁撴灉娴嬪畾鍊兼帴鍙�")
- public AjaxResult saveTjPureToneTestDetil(@RequestBody List<TjPureToneTestDetil> pureToneTestDetils) {
- if(null !=pureToneTestDetils && pureToneTestDetils.size()>0){
- String pureTestId = pureToneTestDetils.get(0).getPureTestId();
+ public AjaxResult saveTjPureToneTestDetil(@RequestBody SaveTjPureToneTestDetil detil) {
+ if(null !=detil.getPureToneTestDetils() && detil.getPureToneTestDetils().size()>0){
+ String pureTestId = detil.getPureToneTestDetils().get(0).getPureTestId();
if(null==pureTestId){
return AjaxResult.error("鍙傛暟鏍煎紡鏈夎璇锋鏌ユ牳瀵�!");
}
toneTestDetilService.deletedTjPureToneTestDetilByPureTestId(pureTestId);
- toneTestDetilService.saveBatch(pureToneTestDetils);
+ toneTestDetilService.saveBatch(detil.getPureToneTestDetils());
+ String selectConfigByKey = configService.selectConfigByKey("cyty_pro_id");
+ if(null !=selectConfigByKey){
+ TjOrderRemark orderRemark = remarkService.getTjOrderRemarkByTjNumAndProParentId(detil.getTjNum(),selectConfigByKey);
+ if(null !=orderRemark){
+ orderRemark.setRemark(detil.getRemark());
+ orderRemark.setDoctorName(detil.getDoctorName());
+ remarkService.updateById(orderRemark);
+ }
+ }
return AjaxResult.success();
}
return AjaxResult.error("璇疯緭鍏ユ暟鎹�!");
@@ -66,8 +80,22 @@
@GetMapping("/getTjPureToneTestDetilList")
@ApiOperation(value = "鑾峰彇绾煶鍚槇缁撴灉娴嬪畾鍊兼帴鍙�")
- public AjaxResult getTjPureToneTestDetilList(@RequestParam String pureTestId) {
- return AjaxResult.success(toneTestDetilService.list(new LambdaQueryWrapper<TjPureToneTestDetil>().eq(TjPureToneTestDetil::getPureTestId,pureTestId)));
+ public AjaxResult getTjPureToneTestDetilList(@RequestParam String pureTestId,@RequestParam String tjNum) {
+ Map<String,Object> map=new HashMap<>();
+ map.put("detilList",null);
+ map.put("remark",null);
+ map.put("doctorName",null);
+ String selectConfigByKey = configService.selectConfigByKey("cyty_pro_id");
+ if(null !=selectConfigByKey){
+ TjOrderRemark orderRemark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNum,selectConfigByKey);
+ if(null !=orderRemark){
+ map.put("remark",orderRemark.getRemark());
+ map.put("doctorName",orderRemark.getDoctorName());
+ }
+ }
+ List<TjPureToneTestDetil> detilList = toneTestDetilService.list(new LambdaQueryWrapper<TjPureToneTestDetil>().eq(TjPureToneTestDetil::getPureTestId, pureTestId));
+ map.put("detilList",detilList);
+ return AjaxResult.success(map);
}
@@ -113,6 +141,12 @@
customer.setTjTime(order.getCreateTime());
customer.setTjType(order.getTjCategory());
}
+ LambdaQueryWrapper<TjAskWorkLog> wqq = new LambdaQueryWrapper<>();
+ wqq.eq(TjAskWorkLog::getTjNumber, customer.getTjNumber());
+ List<TjAskWorkLog> workLogs = tjAskWorkLogService.list(wqq);
+ if(null !=workLogs && workLogs.size()>0){
+ customer.setWorkLogs(workLogs);
+ }
map.put("list",entry.getValue());
map.put("customer",customer);
map.put("picturePath",configService.selectConfigByKey("TjPureToneTest"));
--
Gitblit v1.8.0