From 75605bab29e6e5db93f4ba1f12d9f2fe9015990c Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期四, 31 十月 2024 10:04:50 +0800
Subject: [PATCH] 采样登记抽出合并以及确认采样接口

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java |  167 ++++++++++++++++++++++++++++---------------------------
 1 files changed, 86 insertions(+), 81 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
index b8d687d..0f529eb 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
@@ -12,6 +12,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.pinyin.PinyinUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ltkj.common.core.redis.RedisCache;
@@ -19,11 +20,12 @@
 import com.ltkj.framework.config.MatchUtils;
 import com.ltkj.hosp.domain.*;
 import com.ltkj.hosp.service.*;
+import com.ltkj.system.service.ISysConfigService;
 import com.ltkj.web.controller.lis.LisApiMethod;
-import com.sun.xml.internal.bind.v2.TODO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
 import org.aspectj.weaver.AjAttribute;
 import org.springframework.beans.BeanUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -44,6 +46,7 @@
  * @author ltkj_璧典匠璞�&鏉庢牸
  * @date 2023-04-11
  */
+@Slf4j
 @RestController
 @RequestMapping("/sampling/sampling")
 @Api(tags = "PC绔� 浣撴閲囨牱绠$悊")
@@ -65,7 +68,7 @@
     @Autowired
     private LisApiMethod lisApiMethod;
     @Autowired
-    private IdUtils idUtils;
+    private ISysConfigService configService;
 
     /**
      * 鏌ヨ浣撴閲囨牱绠$悊鍒楄〃
@@ -226,7 +229,7 @@
         ArrayList<TjCustomer> tjCustomers = new ArrayList<>();
         for (TjSampling tjSampling : list) {
             TjCustomer customer = customerService.getById(tjSampling.getCusId());
-            customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
+            customer.setCusName(customer.getCusName());
             customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
             customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
             customer.setTjNumber(tjSampling.getTjNum());
@@ -247,12 +250,14 @@
      */
     @GetMapping("/getCusCyList")
     @ApiOperation(value = "鏍规嵁瀹㈡埛鑾峰彇閲囨牱鍒楄〃")
-    public AjaxResult getCusCyList(@RequestParam @ApiParam(value = "瀹㈡埛id") String cusId) {
+    public AjaxResult getCusCyList(@RequestParam @ApiParam(value = "瀹㈡埛id") String cusId,
+                                   @RequestParam(defaultValue = "1") @ApiParam(value = "0鏄�1鍚�") Integer isSignFor) {
         if (cusId == null || StrUtil.isBlank(cusId))
             return AjaxResult.error("鍙傛暟閿欒,鏈紶鍙傛暟");
         LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(TjSampling::getCusId, cusId);
-        wrapper.isNull(TjSampling::getParentId).or().eq(TjSampling::getIsMerge,1);
+        wrapper.eq(TjSampling::getIsSignFor,isSignFor);
+        wrapper.and(i -> i.isNull(TjSampling::getParentId).or().eq(TjSampling::getIsMerge,1));
         wrapper.orderByDesc(TjSampling::getIsMerge);
         List<TjSampling> list = tjSamplingService.list(wrapper);
         if (list.isEmpty()){
@@ -260,62 +265,18 @@
             return AjaxResult.error("鍙傛暟閿欒,鏈煡璇㈠埌鏁版嵁");
         }
         for (TjSampling sampling : list) {
-//            sampling.setCusName(MatchUtils.hideCusName(sampling.getCusName()));
-            sampling.setCusName(sampling.getCusName());
+            TjCustomer customer = customerService.getById(sampling.getCusId());
+            TjOrder order = orderService.getOrderByTjNum(sampling.getTjNum());
+            if(null !=order)sampling.setCardId(order.getCardId());
+            sampling.setCustomer(customer);
         }
         return AjaxResult.success(list);
     }
 
     @PostMapping("/mergeCaiYang")
     @ApiOperation(value = "閲囨牱鐧昏鍚堝苟椤圭洰鎺ュ彛")
-    @Transactional
     public AjaxResult mergeCaiYang(@RequestBody List<String> ids) {
-        if (null != ids && !ids.isEmpty()) {
-            if(ids.size()==1)return AjaxResult.error("璇烽�夋嫨鑷冲皯涓ゆ潯椤圭洰杩涜鍚堝苟!");
-            int i = tjSamplingService.panduanshifoukeyihebing(ids);
-            if (i > 1) {
-                return AjaxResult.error("鏍囨湰绫诲瀷涓嶄竴鑷�,涓嶅彲鍚堝苟");
-            }
-            int pdsfczhbxm = tjSamplingService.pdsfczhbxm(ids);
-            if (pdsfczhbxm == ids.size()) return AjaxResult.error("澶氫釜鍚堝苟椤圭洰涓嶅彲鍐嶇户缁悎骞�!");
-            if (pdsfczhbxm > 1) return AjaxResult.error("鏈�澶氬厑璁搁�夋嫨涓�涓悎骞惰繃鐨勯」鐩�!");
-            if (pdsfczhbxm == 0) {
-                TjSampling tjSampling = tjSamplingService.getById(ids.get(0));
-                Map<String, Object> map = tjSamplingService.hebingCaiYangInFo(ids);
-                TjSampling sampling = new TjSampling();
-                String proId = map.get("proId").toString();
-                String proName = map.get("proName").toString();
-                BeanUtil.copyProperties(tjSampling, sampling, new String[]{"id"});
-                sampling.setProId(proId);
-                sampling.setProName(proName);
-                sampling.setIsMerge(1);
-                sampling.setJyxh(idUtils.generateLisID());
-                if (tjSamplingService.save(sampling)) {
-                    if (tjSamplingService.updateHeBingXm(ids, sampling.getId())) {
-                        return AjaxResult.success("鍚堝苟椤圭洰鎴愬姛!");
-                    }
-                }
-                return AjaxResult.error("鎿嶄綔澶辫触!");
-            } else {
-                TjSampling tjSampling = tjSamplingService.getTjSamplingByHb(ids);
-                List<TjSampling> samplingList = tjSamplingService.getTjSamplingListByHb(ids);
-                if (null != tjSampling && null != samplingList && !samplingList.isEmpty()) {
-                    List<String> stringList = samplingList.stream().map(TjSampling::getId).collect(Collectors.toList());
-                    Map<String, Object> map = tjSamplingService.hebingCaiYangInFo(stringList);
-                    String proId = map.get("proId").toString();
-                    String proName = map.get("proName").toString();
-                    tjSampling.setProId(proId);
-                    tjSampling.setProName(proName);
-                    if (tjSamplingService.updateById(tjSampling)) {
-                        if (tjSamplingService.updateHeBingXm(stringList, tjSampling.getParentId())) {
-                            return AjaxResult.success("鍚堝苟椤圭洰鎴愬姛!");
-                        }
-                    }
-                }
-                return AjaxResult.error("鎿嶄綔澶辫触!");
-            }
-        }
-        return AjaxResult.error("璇烽�夋嫨浣犺鍚堝苟鐨勯」鐩�!!!");
+        return tjSamplingService.mergeCaiYangTran(ids);
     }
 
 
@@ -398,38 +359,82 @@
     @ApiOperation(value = "纭閲囨牱鎺ュ彛")
     @Transactional
     public AjaxResult confirmSampling(@RequestBody List<String> ids) {
-        if (null == ids || ids.size() == 0) {
+        String config = configService.selectConfigByKey("sfkqdyhis");
+        String mergeRequest = configService.selectConfigByKey("use_lis_pacs_is_auto_merge_request");
+        return confirm(ids,config,mergeRequest);
+    }
+
+    /**
+     * 纭閲囨牱鎺ュ彛
+     */
+    public Boolean confirmSamplingApi(List<String> ids,String sfkqdyhis,String mergeRequest) {
+        AjaxResult confirm = confirm(ids, sfkqdyhis, mergeRequest);
+        log.info("纭閲囨牱杩斿洖 ->{}",confirm);
+        return confirm.get("code").toString().equals("200");
+    }
+
+    private AjaxResult confirm(List<String> ids,String config,String mergeRequest) {
+        if (null == ids || ids.isEmpty()) {
             return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
         }
-        for (String id : ids) {
-            TjSampling sampling = tjSamplingService.getById(id);
-            if (null != sampling) {
-                sampling.setIsSignFor("0");
-                LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
-                wq.eq(TjProject::getProParentId, sampling.getProId());
-                List<TjProject> projectList = projectService.list(wq);
-                List<String> collect = new ArrayList<>();
-                for (TjProject project : projectList) {
-                    Long proId = project.getProId();
-                    collect.add(String.valueOf(proId));
-                }
-                LambdaQueryWrapper<TjSampling> wq1 = new LambdaQueryWrapper<>();
-                wq1.eq(TjSampling::getTjNum, sampling.getTjNum());
-                wq1.in(TjSampling::getProId, collect);
-                List<TjSampling> samplingList = tjSamplingService.list(wq1);
-                if (null != samplingList && samplingList.size() > 0) {
-                    for (TjSampling tjSampling : samplingList) {
-                        tjSampling.setIsSignFor("0");
-                        tjSamplingService.updateById(tjSampling);
-                    }
-                }
+        List<TjSampling> tjSamplings = tjSamplingService.listByIds(ids);
+        if (tjSamplings.isEmpty())
+            return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
+        String errorMsg = "";
+        for (TjSampling sampling : tjSamplings) {
+            if (sampling.getJyxmdm() == null)
+                errorMsg+=sampling.getProName()+"鍦╨is绯荤粺鏈壘鍒板搴旂紪鐮佹棤娉曞彂鍑虹敵璇�";
+            sampling.setIsSignFor("0");
+//                LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+//                wq.eq(TjProject::getProParentId, sampling.getProId());
+//                List<TjProject> projectList = projectService.list(wq);
+//                List<String> collect = new ArrayList<>();
+//                for (TjProject project : projectList) {
+//                    Long proId = project.getProId();
+//                    collect.add(String.valueOf(proId));
+//                }
+//                LambdaQueryWrapper<TjSampling> wq1 = new LambdaQueryWrapper<>();
+//                wq1.eq(TjSampling::getTjNum, sampling.getTjNum());
+//                wq1.in(TjSampling::getProId, collect);
+//                List<TjSampling> samplingList = tjSamplingService.list(wq1);
+//                if (null != samplingList && samplingList.size() > 0) {
+//                    for (TjSampling tjSampling : samplingList) {
+//                        tjSampling.setIsSignFor("0");
+//                        tjSamplingService.updateById(tjSampling);
+//                    }
+//                }
+            TjOrder tjOrder = orderService.getOrderByTjNum(sampling.getTjNum());
+            if(null==tjOrder) return AjaxResult.error("浣撴璁板綍涓嶅瓨鍦�");
+            TjCustomer tjCustomer = customerService.getById(tjOrder.getUserId());
+            boolean updChild;
+            Boolean save;
+            if (null != config && config.equals("Y") && !mergeRequest.equals("Y")) {
+                save = lisApiMethod.save(sampling, tjOrder, tjCustomer);
+            }else {
+                save = true;
             }
-            if (!tjSamplingService.updateById(sampling)) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return AjaxResult.error("鎿嶄綔澶辫触,璇烽噸璇�");
+            if (save) {
+                if (sampling.getIsMerge() == 1) {
+                    LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
+                    wrapper.eq(TjSampling::getParentId, sampling.getId());
+                    List<TjSampling> list = tjSamplingService.list(wrapper);
+                    for (TjSampling tjSampling : list) {
+                        tjSampling.setIsSignFor("0");
+                    }
+                    updChild = tjSamplingService.updateBatchById(list);
+                } else {
+                    updChild = true;
+                }
+                if (!tjSamplingService.updateById(sampling) && !updChild) {
+//                    lisApiMethod.cancel(sampling.getJyxh(), tjOrder.getCardId(), PinyinUtil.getFirstLetter(tjCustomer.getCusName(), ""));
+//                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("鎿嶄綔澶辫触璇烽噸璇�");
+                }
+            } else {
+                return AjaxResult.error("鎿嶄綔澶辫触璇烽噸璇�");
             }
         }
-
+        if (StrUtil.isNotBlank(errorMsg)) return AjaxResult.error(errorMsg);
         return AjaxResult.success("鎿嶄綔鎴愬姛");
     }
 }

--
Gitblit v1.8.0