zjh202500811

zjh

6 天以前 bda1ce873514c0848c4ad76bdd2274f01ab5dcc1

 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,6 +33,7 @@
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;
@@ -47,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;

@@ -89,6 +94,8 @@
    private HisApiMethod hisApiMethod;
    @Autowired
    private HisApiMethodService controller;
    @Autowired
    private UtilsService utilsService;


    //将方法返回值解析成json格式
@@ -269,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);

@@ -304,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);
@@ -544,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);
                }
            }
@@ -585,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","");
@@ -701,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","");