From 2c785c3d4513daea9deb5c7edbb17a9f17111d25 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期五, 21 二月 2025 17:49:03 +0800 Subject: [PATCH] zjh20250221 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPureToneTestController.java | 66 ++++++++++++++++++++++++++++++-- 1 files changed, 61 insertions(+), 5 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 46c1eda..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 @@ -11,9 +11,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ltkj.common.core.redis.RedisCache; import com.ltkj.framework.config.MatchUtils; -import com.ltkj.hosp.domain.TjCustomer; -import com.ltkj.hosp.domain.TjOrder; -import com.ltkj.hosp.domain.TjXdPicture; +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; @@ -26,7 +25,6 @@ import com.ltkj.common.core.controller.BaseController; import com.ltkj.common.core.domain.AjaxResult; import com.ltkj.common.enums.BusinessType; -import com.ltkj.hosp.domain.TjPureToneTest; import com.ltkj.common.utils.poi.ExcelUtil; import com.ltkj.common.core.page.TableDataInfo; @@ -38,7 +36,7 @@ */ @RestController @RequestMapping("/pureToneTest/pureToneTest") -@Api(tags = "绾煶鍚槇娴嬭瘯") +@Api(tags = "C==============绾煶鍚槇娴嬭瘯") public class TjPureToneTestController extends BaseController { @Resource private ITjPureToneTestService tjPureToneTestService; @@ -48,6 +46,58 @@ private ISysConfigService configService; @Resource private ITjOrderService orderService; + @Resource + private TjPureToneTestDetilService toneTestDetilService; + @Autowired + private ITjAskWorkLogService tjAskWorkLogService; + @Resource + private ITjOrderRemarkService remarkService; + + + @PostMapping("/saveTjPureToneTestDetil") + @ApiOperation(value = "淇濆瓨绾煶鍚槇缁撴灉娴嬪畾鍊兼帴鍙�") + 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(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("璇疯緭鍏ユ暟鎹�!"); + } + + @GetMapping("/getTjPureToneTestDetilList") + @ApiOperation(value = "鑾峰彇绾煶鍚槇缁撴灉娴嬪畾鍊兼帴鍙�") + 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); + } + /** @@ -91,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