zjh20240929

zjh

2024-09-29 d26dae167a83c7eb4dfeb59e386bbb30540493c9

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java

@@ -1,5 +1,6 @@
package com.ltkj.web.controller.system;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
@@ -7,6 +8,7 @@
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ltkj.common.annotation.RepeatSubmit;
@@ -31,9 +33,11 @@
import com.ltkj.system.service.ISysUserService;
import com.ltkj.web.controller.his.HisApiGetMethodService;
import com.ltkj.web.controller.his.HisApiMethodService;
import com.mysql.cj.jdbc.exceptions.MySQLTransactionRollbackException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import lombok.var;
import org.aspectj.weaver.AjAttribute;
import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +50,7 @@
import java.util.*;
import java.util.stream.Collectors;

import static com.ltkj.framework.datasource.DynamicDataSourceContextHolder.log;
import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.save;
import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.setClipRect;

@@ -56,6 +61,7 @@
@RestController
@RequestMapping ("/check")
@Api (tags = "总检医师相关接口")
@Slf4j
public class TjCheckController {
    @Resource
    private ITjOrderService orderService;
@@ -107,7 +113,8 @@
    private HisApiMethodService controller;
    @Autowired
    private HisApiGetMethodService service;

    @Autowired
    private HisApiConfigService hisApiConfigService;

    @GetMapping ("/getOperationPermissionsByTjNum")
    @ApiOperation (value = "(初审页面  和 医生页面)根据体检号获取是否可操作权限接口  true可操作  反之不可")
@@ -292,7 +299,7 @@
                tjOrder.setConfirmStatus(String.valueOf(status));
                if (status == 0) {
                    tjOrder.setStatus(TjConstants.TJ_CHECK);
                    asyncService.updateCheckType(tjNumber);
//                    asyncService.updateCheckType(tjNumber);
                } else {
                    tjOrder.setStatus(TjConstants.TJ_REFUSED);
                }
@@ -302,8 +309,8 @@
                    confirmLog.setTjNum(tjNumber);
                    confirmLog.setStatus(status);
                    confirmLogService.save(confirmLog);
                    asyncService.wCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, 0, null, null, null));
                    asyncService.yCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, 1, null, null, null));
//                    asyncService.wCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, 0, null, null, null));
//                    asyncService.yCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, 1, null, null, null));
                    return AjaxResult.success("操作成功");
                }
                return AjaxResult.error("操作失败");
@@ -320,8 +327,9 @@
    @GetMapping ("/dataSynchronization")
    @ApiOperation (value = "同步sql server数据到本地数据库数据接口")
    @RepeatSubmit
    @Transactional
//    @Transactional
    public AjaxResult dataSynchronization(@RequestParam String tjNumber) {

        //根据配置调取存储过程 将临时表数据存入预约表2023.12.12
        final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");

@@ -358,8 +366,9 @@
            if (null != sfkqdyhis && sfkqdyhis.equals("Y")) {

                List<String> baoGaoDans = ltkjHybgdService.getJianYanBaoGaoDan(order.getCardId());
                List<String> jianChaBaoGaoDan = ltkjHybgdService.getJianChaBaoGaoDan(order.getCardId());
                //同步检验
                if (null != baoGaoDans && baoGaoDans.size() > 0) {
                    //同步检验
                    Date dates = new Date();
                    Map<String, Object> map = new HashMap<>();
                    map.put("his_registration_id", order.getCardId());
@@ -374,13 +383,10 @@
                    JSONObject object = getJSONObject(result1);
                    String code = object.getStr("ResultCode");
                    if (null == code || !code.equals("0")) {
                        return AjaxResult.error("化验项目暂时无结果,请稍后同步!!!");
                        return AjaxResult.error("化验项目暂时未出结果,请稍后同步!!!");
                    }
                    JSONArray data = object.getJSONArray("ResultData");
//                    int size = data.size();
//                    if(size>0){
//
//                     }

                    for (Object datum : data) {
                        JSONObject jsonObject = (JSONObject) datum;
                        LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(order.getCardId(), jsonObject.getStr("JYBGID"));
@@ -468,77 +474,354 @@

                        }
                    }
                    //同步化验项目
                    testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                }

                    //同步检查
                /*同步检查 his接口*/
                if (null != jianChaBaoGaoDan && jianChaBaoGaoDan.size() > 0) {
                    Map<String, Object> maps = new HashMap<>();
                    maps.put("his_registration_id", order.getCardId());
                    maps.put("ksbm", "体检中心");
                    maps.put("pagecount", 100);
                    maps.put("page", 1);
                    AjaxResult results = service.getHISDataNew("Getexamreportinfo", maps);
//                    AjaxResult results = service.getHISDataNew("Getexamreportinfo", maps);

                    LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                    lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Getexamreportinfo");
                    HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);


                    /*同步检查 his存储过程*/
                    AjaxResult results = jcsqdService.getTjJcProByHisCall("体检中心", order.getCardId(), "''", 100, 1, "'1'");

                    DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
                    DynamicDataSourceContextHolder.clearDataSourceType();

                    log.info("检查项目查询返回值:      " + results.toString());

                    if (Integer.parseInt(results.get("code").toString()) == 200) {
                        List<Map<String, Object>> datas = (List<Map<String, Object>>) results.get("data");
                        if(null !=datas && datas.size()>0){
                        if (null != datas && datas.size() > 0) {
                            jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId());
                            jcbgdService.deletedLtkjJcbgdByTjhAndTmh(order.getCardId());
                            for (Map<String, Object> objectMap : datas) {
                                LtkjExamJcsqd jybgid = jcsqdService.getLtkjJcsqdByTjhAndTmh(order.getCardId(), objectMap.get("JCBGID").toString());
                                if (null != jybgid) {
                                    jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId(), objectMap.get("JCBGID").toString());
                                    jcbgdService.deletedLtkjJcbgdByTjhAndTmh(jybgid.getTmh());
                                }
                                LtkjExamJcbgd jcbgd=new LtkjExamJcbgd();
                                //保存入参出参
//                                service.save((JSONObject)objectMap,"Getexamreportinfo",hisApiConfig,JSONUtil.toJsonStr(maps));
                                service.save(JSONUtil.parseObj(objectMap), "Getexamreportinfo", hisApiConfig, JSONUtil.toJsonStr(maps));


                                LtkjExamJcbgd jcbgd = new LtkjExamJcbgd();
                                jcbgd.setTjh(order.getCardId());
                                if(null !=objectMap.get("JCBGID") || !objectMap.get("JCBGID").equals(""))
                                jcbgd.setTmh(objectMap.get("JCBGID").toString());
                                if (null != objectMap.get("JCBGID") || !objectMap.get("JCBGID").equals(""))
                                    jcbgd.setTmh(objectMap.get("JCBGID").toString());

                                if(null !=objectMap.get("JCXMDM") || !objectMap.get("JCXMDM").equals(""))
                                jcbgd.setXmdm(objectMap.get("JCXMDM").toString());
                                if (null != objectMap.get("JCXMDM") || !objectMap.get("JCXMDM").equals(""))
                                    jcbgd.setXmdm(objectMap.get("JCXMDM").toString());

                                if(null !=objectMap.get("JCXMMC") || !objectMap.get("JCXMMC").equals(""))
                                jcbgd.setXmmc(objectMap.get("JCXMMC").toString());
                                if (null != objectMap.get("JCXMMC") || !objectMap.get("JCXMMC").equals(""))
                                    jcbgd.setXmmc(objectMap.get("JCXMMC").toString());

                                if(null !=objectMap.get("JCXMJG") || !objectMap.get("JCXMJG").equals(""))
                                jcbgd.setBgNr(objectMap.get("JCXMJG").toString());
                                if (null != objectMap.get("JCXMJG") || !objectMap.get("JCXMJG").equals(""))
                                    jcbgd.setBgNr(objectMap.get("JCXMJG").toString());

                                if(null !=objectMap.get("reporturl") || !objectMap.get("reporturl").equals(""))
                                jcbgd.setBgUrl(objectMap.get("reporturl").toString());
                                if (null != objectMap.get("reporturl") || !objectMap.get("reporturl").equals(""))
                                    jcbgd.setBgUrl(objectMap.get("reporturl").toString());

                                if(null !=objectMap.get("SHYSQM") || !objectMap.get("SHYSQM").equals(""))
                                jcbgd.setShysxm(objectMap.get("SHYSQM").toString());
                                if (null != objectMap.get("SHYSQM") || !objectMap.get("SHYSQM").equals(""))
                                    jcbgd.setShysxm(objectMap.get("SHYSQM").toString());

                                if(null !=objectMap.get("SHYSBH") || !objectMap.get("SHYSBH").equals(""))
                                jcbgd.setShysdm(objectMap.get("SHYSBH").toString());
                                if (null != objectMap.get("SHYSBH") || !objectMap.get("SHYSBH").equals(""))
                                    jcbgd.setShysdm(objectMap.get("SHYSBH").toString());

                                if(null !=objectMap.get("YXZD") || !objectMap.get("YXZD").equals(""))
                                jcbgd.setYxzd(objectMap.get("YXZD").toString());
                                if (null != objectMap.get("YXZD") || !objectMap.get("YXZD").equals(""))
                                    jcbgd.setYxzd(objectMap.get("YXZD").toString());

                                if(null !=objectMap.get("YXBX") || !objectMap.get("YXBX").equals(""))
                                jcbgd.setYxbx(objectMap.get("YXBX").toString());
                                if (null != objectMap.get("YXBX") || !objectMap.get("YXBX").equals("")) {
                                    if (objectMap.get("YXBX").toString().equals("null")) {
                                        jcbgd.setYxbx("未检异常");
                                    } else {
                                        jcbgd.setYxbx(objectMap.get("YXBX").toString());
                                    }
                                }
                                if (null != objectMap.get("SJJLSJ") || !objectMap.get("SJJLSJ").equals(""))
                                    jcbgd.setZdsj(objectMap.get("SJJLSJ").toString());

                                if(null !=objectMap.get("SJJLSJ") || !objectMap.get("SJJLSJ").equals(""))
                                jcbgd.setZdsj(objectMap.get("SJJLSJ").toString());

                                if(null !=objectMap.get("JCBW") || !objectMap.get("JCBW").equals(""))
                                if (null != objectMap.get("JCBW") || !objectMap.get("JCBW").equals(""))
                                    jcbgd.setJcbw(objectMap.get("JCBW").toString());

                                if(null !=objectMap.get("SQRQSJ") || !objectMap.get("SQRQSJ").equals(""))
                                if (null != objectMap.get("SQRQSJ") || !objectMap.get("SQRQSJ").equals(""))
                                    jcbgd.setSqsj(objectMap.get("SQRQSJ").toString());

                                jcbgdService.save(jcbgd);
                            }
                            jcsqdService.saveLtkjExamJcsqd(order.getCardId());

                            int maxRetries=3;
                            for (int attempt = 0; attempt < maxRetries; attempt++) {
                                try {
                                    testMapper.updateDetailByTjJcCall(order.getCardId(),
                                            String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                                    break;
                                } catch (Exception e) {
                                    if (attempt==maxRetries-1){
                                        throw e;
                                    }
                                    try {
                                        Thread.sleep(1000);
                                    } catch (InterruptedException ignored) {
                                    }
                                }
                            }

                        }else {
                            return AjaxResult.error("检查项目暂时未出结果,请稍后同步!!!");
                        }
                    }
                }

                //同步化验项目
                testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                //同步检查项目
                testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                asyncService.updateCheckType(order.getTjNumber());

                return AjaxResult.success("同步成功");


                //同步检查项目给redis缓存现在不用了
//                asyncService.updateCheckType(order.getTjNumber());
            }
            //化验
            testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
            //检查
            jcsqdService.saveLtkjExamJcsqd(order.getCardId());
            return AjaxResult.success("同步成功");
        }
        return AjaxResult.error();
        return AjaxResult.error("未查到该人员体检记录");
    }

    /**
     * 同步sql server数据到本地数据库数据接口
     */
    @GetMapping ("/dataSynchronizationApi")
    @ApiOperation (value = "同步sql server数据到本地数据库数据接口")
    @RepeatSubmit
//    @Transactional
    public AjaxResult dataSynchronizationApi(@RequestParam String tjNumber) {
        //根据配置调取存储过程 将临时表数据存入预约表2023.12.12
        final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");

        final String sfkqdyhis = configService.selectConfigByKey("sfkqdyhis");
        TjOrder order = orderService.getOrderByTjNum(tjNumber);
        if (null != order) {

            //开启字典弹窗
            if ("Y".equals(getInfoFromSqlData)) {
                tbhyxm(order);
                //同步化验项目
                testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
                //同步检查项目
                testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
                asyncService.updateCheckType(order.getTjNumber());

            }
            //开启和his对接
            if (null != sfkqdyhis && sfkqdyhis.equals("Y")) {
                List<String> baoGaoDans = ltkjHybgdService.getJianYanBaoGaoDan(order.getCardId());
                List<String> jianChaBaoGaoDan = ltkjHybgdService.getJianChaBaoGaoDan(order.getCardId());
                //同步检验
                if (null != baoGaoDans && !baoGaoDans.isEmpty()) {
                    Date dates = new Date();
                    Map<String, Object> map = new HashMap<>();
                    map.put("his_registration_id", order.getCardId());
                    map.put("ksbm", "");
                    map.put("pationid", "");
                    map.put("ksrq", DateUtil.format(DateUtil.beginOfDay(order.getCreateTime()), "yyyy-MM-dd HH:mm:ss"));
                    map.put("jsrq", DateUtil.format(DateUtil.endOfDay(dates), "yyyy-MM-dd HH:mm:ss"));
                    map.put("pagecount", 10);
                    map.put("page", 1);
                    AjaxResult result = controller.Getlabreportinfo(map);
                    String result1 = getAjaxResult(result);
                    JSONObject object = getJSONObject(result1);
                    String code = object.getStr("ResultCode");
                    if (null == code || !code.equals("0")) {
                        return AjaxResult.error("化验项目暂时未出结果,请稍后同步!!!");
                    }
                    JSONArray data = object.getJSONArray("ResultData");
                    for (Object datum : data) {
                        JSONObject jsonObject = (JSONObject) datum;
                        boolean isInsertHysqd = false;
                        LtkjHysqd hysqd = new LtkjHysqd();
                        hysqd.setTjh(order.getCardId());
                        hysqd.setTmh(jsonObject.getStr("JYBGID"));
                        hysqd.setBbbh(jsonObject.getStr("BBDM"));
                        hysqd.setBbmc(jsonObject.getStr("BBMC"));
                        hysqd.setXmid(jsonObject.getStr("JYXMDM"));
                        hysqd.setXmmc(jsonObject.getStr("JYXMMC"));
                        hysqd.setSqsj(jsonObject.getStr("SQRQ"));
                        hysqd.setSqys(jsonObject.getStr("SQRBH"));
                        hysqd.setJgsj(jsonObject.getStr("JYBGRQ"));
                        hysqd.setSqrxm(jsonObject.getStr("SQRXM"));
                        hysqd.setSqdh(jsonObject.getStr("SQDBH"));
                        hysqd.setShrdm(jsonObject.getStr("JYYSBH"));
                        hysqd.setShrxm(jsonObject.getStr("JYYSQM"));
                        hysqd.setJybgjg(jsonObject.getStr("JYBGJG"));
                        QueryWrapper<LtkjHysqd> queryWrapper = new QueryWrapper<>(hysqd);
                        List<LtkjHysqd> list = ltkjHysqdService.list(queryWrapper);
                        if (list.isEmpty())
                            isInsertHysqd = true;
                        if (isInsertHysqd){
                            saveHysqd(hysqd);
                        }else {
                            saveHybgd(hysqd);
                        }
                    }
                    //同步化验项目
                    testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
                }
                /*同步检查 his接口*/
                if (null != jianChaBaoGaoDan && jianChaBaoGaoDan.size() > 0) {
                    Map<String, Object> maps = new HashMap<>();
                    maps.put("his_registration_id", order.getCardId());
                    maps.put("ksbm", "体检中心");
                    maps.put("pagecount", 100);
                    maps.put("page", 1);
                    LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                    lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Getexamreportinfo");
                    HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
                    /*同步检查 his存储过程*/
                    AjaxResult results = jcsqdService.getTjJcProByHisCall("体检中心", order.getCardId(), "''", 100, 1, "'1'");
                    DynamicDataSourceContextHolder.clearDataSourceType();
                    log.info("检查项目查询返回值:      " + results.toString());
                    if (Integer.parseInt(results.get("code").toString()) == 200) {
                        List<Map<String, Object>> datas = (List<Map<String, Object>>) results.get("data");
                        if (null != datas && !datas.isEmpty()) {
                            jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId());
                            jcbgdService.deletedLtkjJcbgdByTjhAndTmh(order.getCardId());
                            for (Map<String, Object> objectMap : datas) {
                                //保存入参出参
                                service.save(JSONUtil.parseObj(objectMap), "Getexamreportinfo", hisApiConfig, JSONUtil.toJsonStr(maps));
                                LtkjExamJcbgd jcbgd = new LtkjExamJcbgd();
                                jcbgd.setTjh(order.getCardId());
                                if (null != objectMap.get("JCBGID") || !objectMap.get("JCBGID").equals(""))
                                    jcbgd.setTmh(objectMap.get("JCBGID").toString());
                                if (null != objectMap.get("JCXMDM") || !objectMap.get("JCXMDM").equals(""))
                                    jcbgd.setXmdm(objectMap.get("JCXMDM").toString());
                                if (null != objectMap.get("JCXMMC") || !objectMap.get("JCXMMC").equals(""))
                                    jcbgd.setXmmc(objectMap.get("JCXMMC").toString());
                                if (null != objectMap.get("JCXMJG") || !objectMap.get("JCXMJG").equals(""))
                                    jcbgd.setBgNr(objectMap.get("JCXMJG").toString());
                                if (null != objectMap.get("reporturl") || !objectMap.get("reporturl").equals(""))
                                    jcbgd.setBgUrl(objectMap.get("reporturl").toString());
                                if (null != objectMap.get("SHYSQM") || !objectMap.get("SHYSQM").equals(""))
                                    jcbgd.setShysxm(objectMap.get("SHYSQM").toString());
                                if (null != objectMap.get("SHYSBH") || !objectMap.get("SHYSBH").equals(""))
                                    jcbgd.setShysdm(objectMap.get("SHYSBH").toString());
                                if (null != objectMap.get("YXZD") || !objectMap.get("YXZD").equals(""))
                                    jcbgd.setYxzd(objectMap.get("YXZD").toString());
                                if (null != objectMap.get("YXBX") || !objectMap.get("YXBX").equals("")) {
                                    if (objectMap.get("YXBX").toString().equals("null")) {
                                        jcbgd.setYxbx("未检异常");
                                    } else {
                                        jcbgd.setYxbx(objectMap.get("YXBX").toString());
                                    }
                                }
                                if (null != objectMap.get("SJJLSJ") || !objectMap.get("SJJLSJ").equals(""))
                                    jcbgd.setZdsj(objectMap.get("SJJLSJ").toString());
                                if (null != objectMap.get("JCBW") || !objectMap.get("JCBW").equals(""))
                                    jcbgd.setJcbw(objectMap.get("JCBW").toString());
                                if (null != objectMap.get("SQRQSJ") || !objectMap.get("SQRQSJ").equals(""))
                                    jcbgd.setSqsj(objectMap.get("SQRQSJ").toString());
                                jcbgdService.save(jcbgd);
                            }
                            jcsqdService.saveLtkjExamJcsqd(order.getCardId());
                            testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
                        }else {
                            return AjaxResult.error("检查项目暂时未出结果,请稍后同步!!!");
                        }
                    }
                }
                return AjaxResult.success("同步成功");
            }
            //化验
            testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
            //检查
            jcsqdService.saveLtkjExamJcsqd(order.getCardId());
            return AjaxResult.success("同步成功");
        }
        return AjaxResult.error("未查到该人员体检记录");
    }

    private void saveHysqd(LtkjHysqd hysqd) {
        if (ltkjHysqdService.save(hysqd)) {
            saveHybgd(hysqd);
        }
    }

    private void saveHybgd(LtkjHysqd hysqd) {
        Map<String, Object> hashMap = new HashMap<>();
        hashMap.put("jybgid", hysqd.getTmh());
        AjaxResult bgdres = controller.Getlabdetailinfo(hashMap);
        String result2 = getAjaxResult(bgdres);
        JSONObject object1 = getJSONObject(result2);
        String code1 = object1.getStr("ResultCode");
        if (null != code1 && code1.equals("0")) {
            JSONArray datas = object1.getJSONArray("ResultData");
            for (Object o : datas) {
                JSONObject js = (JSONObject) o;
//                            ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(jsonObject.getStr("JYBGID"));
                LtkjHybgd bgd = new LtkjHybgd();
                bgd.setTmh(hysqd.getTmh());
                bgd.setJcxmid(js.getStr("JCZBDM"));
                bgd.setJcxm(js.getStr("JCZBMC"));
                bgd.setTdh(js.getStr(""));
                bgd.setJyjg(js.getStr("JCZBJG"));
                bgd.setJgdw(js.getStr("JLDW"));
                bgd.setFwzdz(js.getStr(""));
                bgd.setFwzgz(js.getStr(""));
                bgd.setFwz(js.getStr("CKZFW"));
                bgd.setJysj(js.getStr("BGRQ"));
                bgd.setJyys(js.getStr("JCRBH"));
                bgd.setShsj(js.getStr("BGRQ"));
                bgd.setShsj(js.getStr("BGRQ"));
                bgd.setShys(js.getStr("SHRBH"));
                bgd.setShysmc(js.getStr("SHRXM"));
                bgd.setYcbz(js.getStr("YCTS"));
//                            bgd.setTpurl(js.getStr(""));
                QueryWrapper<LtkjHybgd> queryWrapper = new QueryWrapper<>(bgd);
                List<LtkjHybgd> list = ltkjHybgdService.list(queryWrapper);
                if (list.isEmpty())
                    ltkjHybgdService.save(bgd);
            }
        }

        Map<String, Object> fbhashMap = new HashMap<>();
        fbhashMap.put("jybgid", hysqd.getTmh());
        AjaxResult fbres = controller.Getlabgermrepinfo(fbhashMap);
        String ajaxResult = getAjaxResult(fbres);
        JSONObject fbobject = getJSONObject(ajaxResult);
        String fbcode = fbobject.getStr("ResultCode");
        if (null != fbcode && fbcode.equals("0")) {
            JSONArray datas = fbobject.getJSONArray("ResultData");
            for (Object o : datas) {
                JSONObject js = (JSONObject) o;
                LtkjHybgd bgd = new LtkjHybgd();
                bgd.setTmh(hysqd.getTmh());
                bgd.setJcxmid(hysqd.getXmid());
                bgd.setJcxm(hysqd.getXmmc());
                bgd.setTdh(js.getStr(""));
                bgd.setJyjg(js.getStr("JCJG"));
                bgd.setJgdw("/");
                bgd.setFwzdz("/");
                bgd.setFwzgz("/");
                bgd.setFwz("/");
                bgd.setJysj(js.getStr("BGRQ"));
                bgd.setJyys(hysqd.getSqrxm());
                bgd.setShsj(js.getStr("BGRQ"));
                bgd.setShys(hysqd.getShrdm());
                bgd.setShysmc(hysqd.getShrxm());
                QueryWrapper<LtkjHybgd> queryWrapper = new QueryWrapper<>(bgd);
                List<LtkjHybgd> list = ltkjHybgdService.list(queryWrapper);
                if (list.isEmpty())
                    ltkjHybgdService.save(bgd);
            }
        }
    }

    //将方法返回值解析成json格式
@@ -956,7 +1239,7 @@
//        final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
//        if(null !=getInfoFromSqlData && getInfoFromSqlData.equals("Y"))
//        tbhyxm(one);
        TjCustomer customer = customerService.getById(one.getUserId());
//        TjCustomer customer = customerService.getById(one.getUserId());
        List<TjOrderRemark> remarkList = orderRemarkService.addHuaYanAndCgTable(tjNumber);
        List<TjOrderDetail> tjOrderDetails = detailService.addHuaYanAndCgTable(tjNumber);

@@ -979,26 +1262,39 @@
                            }
                            if (StrUtil.isNotBlank(ckfw)) {
                                try {
                                    if (ckfw != null && ckfw.contains("-")) {
                                    Integer.parseInt(tjOrderDetail.getYcbz());
                                    String[] split = ckfw.split("-");
                                    BigDecimal min = new BigDecimal(split[0]);
                                    BigDecimal max = new BigDecimal(split[1]);
                                    String proResult = tjOrderDetail.getProResult();
                                    BigDecimal jyjgval = new BigDecimal(proResult);
                                    if (jyjgval.compareTo(min) < 0) {
                                        tjOrderDetail.setYcbz("↓");
                                    } else if (jyjgval.compareTo(max) > 0) {
                                        tjOrderDetail.setYcbz("↑");
                                    } else {
                                    if(null !=proResult){
                                        BigDecimal jyjgval = new BigDecimal(proResult);
                                        if (jyjgval.compareTo(min) < 0) {
                                            tjOrderDetail.setYcbz("↓");
                                        } else if (jyjgval.compareTo(max) > 0) {
                                            tjOrderDetail.setYcbz("↑");
                                        } else if(proResult.contains("阴")) {
                                            tjOrderDetail.setYcbz("");
                                        }else {
                                            tjOrderDetail.setYcbz("");
                                        }
                                        if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
                                            tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
                                        }
                                    }else {
                                        tjOrderDetail.setYcbz("");
                                    }
                                    }else {
                                        if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("阴")) tjOrderDetail.setYcbz("");

                                        if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("阳")) tjOrderDetail.setYcbz("↑");
                                    }
                                } catch (NumberFormatException ignored) {
                                    ignored.printStackTrace();
                                }
                                if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
                                    tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
                                }
                            }else {
                                tjOrderDetail.setYcbz("");
                                tjOrderDetail.setProResult(tjOrderDetail.getProResult());
                            }