From 1b7ed7edb09aaecf68ddf3396ee007bc6eadf52a Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 30 十二月 2024 17:04:09 +0800
Subject: [PATCH] zjh202412030

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPureToneTestController.java |   90 ++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 76 insertions(+), 14 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 81a47fd..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,11 +11,9 @@
 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.TjXdPicture;
-import com.ltkj.hosp.service.ITjCustomerService;
-import com.ltkj.hosp.service.ITjProjectService;
-import com.ltkj.hosp.service.TjAsyncService;
+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;
 import io.swagger.annotations.ApiOperation;
@@ -27,8 +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.hosp.service.ITjPureToneTestService;
 import com.ltkj.common.utils.poi.ExcelUtil;
 import com.ltkj.common.core.page.TableDataInfo;
 
@@ -40,7 +36,7 @@
  */
 @RestController
 @RequestMapping("/pureToneTest/pureToneTest")
-@Api(tags = "绾煶鍚槇娴嬭瘯")
+@Api(tags = "C==============绾煶鍚槇娴嬭瘯")
 public class TjPureToneTestController extends BaseController {
     @Resource
     private ITjPureToneTestService tjPureToneTestService;
@@ -48,12 +44,66 @@
     private ITjCustomerService customerService;
     @Autowired
     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);
+    }
+
 
 
     /**
      * 鏌ヨ绾煶鍚槇娴嬭瘯鍒楄〃
      */
-    @PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:list')")
+    //@PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:list')")
     @GetMapping("/list")
     @ApiOperation(value = "绾煶鍚槇鏌ヨ(榛樿鑷甫)")
     public TableDataInfo list(TjPureToneTest tjPureToneTest) {
@@ -81,10 +131,22 @@
             for (Map.Entry<String, List<TjPureToneTest>> entry : stringListMap.entrySet()) {
                 Map<String,Object>map=new HashMap<>();
                 TjCustomer customer = customerService.getById(entry.getKey());
+                if(customer==null) continue;
                 customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
                 customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
                 customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
                 customer.setTjNumber(entry.getValue().get(0).getTjNum());
+                TjOrder order = orderService.getOrderByTjNum(entry.getValue().get(0).getTjNum());
+                if(null !=order){
+                    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"));
@@ -105,7 +167,7 @@
     /**
      * 瀵煎嚭绾煶鍚槇娴嬭瘯鍒楄〃
      */
-    @PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:export')")
+    //@PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:export')")
     @Log(title = "绾煶鍚槇娴嬭瘯", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ApiOperation(value = "瀵煎嚭绾煶鍚槇娴嬭瘯鍒楄〃")
@@ -118,7 +180,7 @@
     /**
      * 鑾峰彇绾煶鍚槇娴嬭瘯璇︾粏淇℃伅
      */
-    @PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:query')")
+    //@PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation(value = "鑾峰彇绾煶鍚槇娴嬭瘯璇︾粏淇℃伅")
     public AjaxResult getInfo(@PathVariable("id") String id) {
@@ -128,7 +190,7 @@
     /**
      * 鏂板绾煶鍚槇娴嬭瘯
      */
-    @PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:add')")
+    //@PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:add')")
     @Log(title = "绾煶鍚槇娴嬭瘯", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation(value = "鏂板绾煶鍚槇娴嬭瘯")
@@ -139,7 +201,7 @@
     /**
      * 淇敼绾煶鍚槇娴嬭瘯
      */
-    @PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:edit')")
+    //@PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:edit')")
     @Log(title = "绾煶鍚槇娴嬭瘯", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation(value = "淇敼绾煶鍚槇娴嬭瘯")
@@ -150,7 +212,7 @@
     /**
      * 鍒犻櫎绾煶鍚槇娴嬭瘯
      */
-    @PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:remove')")
+    //@PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:remove')")
     @Log(title = "绾煶鍚槇娴嬭瘯", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     @ApiOperation(value = "鍒犻櫎绾煶鍚槇娴嬭瘯")

--
Gitblit v1.8.0