From bda1ce873514c0848c4ad76bdd2274f01ab5dcc1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 11 八月 2025 08:48:08 +0800
Subject: [PATCH] zjh202500811

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java |   86 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
index b5604d8..93c8b99 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -6,6 +6,7 @@
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.pinyin.PinyinUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
@@ -32,10 +33,12 @@
 import com.ltkj.web.controller.his.HisApiGetMethodService;
 import com.ltkj.web.controller.his.HisApiMethod;
 import com.ltkj.web.controller.his.HisApiMethodService;
+import com.ltkj.web.controller.service.UtilsService;
 import com.ltkj.web.wxUtils.HttpClientUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.DigestUtils;
@@ -46,6 +49,9 @@
 import com.ltkj.common.utils.poi.ExcelUtil;
 import com.ltkj.common.core.page.TableDataInfo;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -59,6 +65,7 @@
 @RestController
 @RequestMapping("/hosp/customer")
 @Api(tags = "瀹㈡埛绠$悊鎺ュ彛")
+@Slf4j
 public class TjCustomerController extends BaseController {
     @Resource
     private ITjCustomerService tjCustomerService;
@@ -87,6 +94,8 @@
     private HisApiMethod hisApiMethod;
     @Autowired
     private HisApiMethodService controller;
+    @Autowired
+    private UtilsService utilsService;
 
 
     //灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
@@ -267,6 +276,7 @@
 
 //                    if(null !=tjReservation.getCompanyId())tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
                     if(null !=tjReservation.getCompany())tjCustomer1.setCompName(tjReservation.getCompany());
+                    if(null !=tjReservation.getDepartment())tjCustomer1.setDepartment(tjReservation.getDepartment());
 
 //                    tjCustomerService.updateById(tjCustomer1);
 
@@ -302,6 +312,7 @@
                     tjCustomer.setPym(PinyinUtil.getFirstLetter(tjReservation.getName(),""));
                     if(null !=tjReservation.getCompanyId())tjCustomer.setCompId(tjReservation.getCompanyId());
                     if(null !=tjReservation.getCompany())tjCustomer.setCompName(tjReservation.getCompany());
+                    if(null !=tjReservation.getDepartment())tjCustomer.setDepartment(tjReservation.getDepartment());
 
                     if (null != key && key.equals("Y")) {
                         AjaxResult result = controller.Outpincreateapply(tjCustomer);
@@ -542,11 +553,13 @@
                 TjCustomer requestCommonHisApi = isRequestCommonHisApi(tjCustomer);
                 if (null !=requestCommonHisApi){
                     if (tjCustomerService.save(requestCommonHisApi)) {
+                        utilsService.saveCustomerSfzImg(tjCustomer,dataSourceType);
                         return AjaxResult.success(requestCommonHisApi);
                     }
                 }
             }else {
                 if (tjCustomerService.save(tjCustomer)) {
+                    utilsService.saveCustomerSfzImg(tjCustomer,dataSourceType);
                     return AjaxResult.success(tjCustomer);
                 }
             }
@@ -583,7 +596,7 @@
             }
             map.put("cusName", tjCustomer.getCusName());
             map.put("cusSex", tjCustomer.getCusSex());
-            map.put("cusBrithday", tjCustomer.getCusBrithday() != null ? DateUtil.format(tjCustomer.getCusBrithday(), "yyyy-MM-dd") : "");
+            map.put("cusBrithday", tjCustomer.getCusBrithday() != null ? tjCustomer.getCusBrithday() : "");
             map.put("cusAddr", tjCustomer.getCusAddr());
             map.put("cusPhone", tjCustomer.getCusPhone());
             map.put("compName","");
@@ -699,7 +712,7 @@
                     map.put("cusSex",tjCustomer.getCusSex());
                     map.put("cusIdCard",tjCustomer.getCusIdcard());
                     map.put("compId","");
-                    map.put("cusBrithday",tjCustomer.getCusBrithday() != null ? DateUtil.format(tjCustomer.getCusBrithday(), "yyyy-MM-dd") : "");
+                    map.put("cusBrithday",tjCustomer.getCusBrithday() != null ? tjCustomer.getCusBrithday() : "");
                     map.put("cusAddr",tjCustomer.getCusAddr());
                     map.put("cusPhone",tjCustomer.getCusPhone());
                     map.put("compName","");
@@ -723,6 +736,75 @@
        return AjaxResult.error();
     }
 
+
+    @Log(title = "娉ㄥ唽瀹㈡埛淇℃伅", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/zhuceTjCustomer")
+    @ApiOperation(value = "淇敼瀹㈡埛淇℃伅")
+    @Transactional
+    @RepeatSubmit
+    public AjaxResult zhuceTjCustomer(@RequestBody @ApiParam(value = "瀹㈡埛瀵硅薄") TjCustomer tjCustomer) {
+
+        try {
+            TjCustomer customer = tjCustomerService.getById(tjCustomer.getCusId());
+            if(null==customer){
+                return AjaxResult.error("璇ヤ汉鍛樹笉瀛樺湪!");
+            }
+
+            if(!customer.getPationId().equals("0")){
+                return AjaxResult.error("璇ヤ汉鍛樺凡缁忔敞鍐�!");
+            }
+            String config = sysConfigService.selectConfigByKey("sfkqdyhis");
+            if (null != config && config.equals("Y")) {
+                AjaxResult result = controller.Outpincreateapply(customer);
+                String result1 = getAjaxResult(result);
+                JSONObject object = getJSONObject(result1);
+                String code = object.getStr("ResultCode");
+                if (code.equals("0")) {
+                    JSONArray resultDatass = object.getJSONArray("ResultData");
+                    Map<String, Object> resultData = (Map<String, Object>) resultDatass.get(0);
+                    if (null != resultData && !resultData.isEmpty()) {
+                        String pationid = resultData.get("PationId").toString();
+                        if (null != pationid) {
+                            customer.setPationId(pationid);
+                            //淇濆瓨娉ㄥ唽鍏ュ弬鍑哄弬
+                            resultData.put("cardId",pationid);
+                            JSONObject object4 = JSONUtil.parseObj(resultData);
+                            LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+                            lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpincreateapply");
+                            HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
+                            hisApiGetMethodService.save(object4, "Outpincreateapply", hisApiConfig, JSONUtil.toJsonStr(BeanUtil.beanToMap(tjCustomer)));
+                        }
+
+                    }
+                    if (tjCustomerService.updateById(customer)) {
+                        return AjaxResult.success("娉ㄥ唽鎴愬姛");
+                    }
+                }else{
+                    return AjaxResult.error("娉ㄥ唽澶辫触");
+                }
+            }
+
+            String s = sysConfigService.selectConfigByKey("is_request_common_his_api");
+            if (null != s && s.equals("Y")){
+                TjCustomer requestCommonHisApi = isRequestCommonHisApi(customer);
+                if (null !=requestCommonHisApi){
+                    if (tjCustomerService.updateById(customer)) {
+                        return AjaxResult.success("娉ㄥ唽鎴愬姛");
+                    }
+                }else {
+                    return AjaxResult.error("娉ㄥ唽澶辫触");
+                }
+            }
+            return AjaxResult.error("璇峰厛杩炴帴his鏈嶅姟");
+        } catch (Exception e) {
+            log.error(e.toString());
+            throw new RuntimeException(e);
+
+        }
+
+    }
+
+
     /**
      * 鍒犻櫎瀹㈡埛淇℃伅
      */

--
Gitblit v1.8.0