zjh
2024-09-29 d26dae167a83c7eb4dfeb59e386bbb30540493c9
zjh20240929
3个文件已修改
25 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
@@ -412,7 +412,7 @@
                //同步化验项目
                testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()),order.getTjNumber(), "1");
                //同步检查项目
                testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()),order.getTjNumber(),"1");
//                testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()),order.getTjNumber(),"1");
            }
//        }
        return AjaxResult.success("同步成功");
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -33,6 +33,7 @@
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;
@@ -493,6 +494,8 @@
                    /*同步检查 his存储过程*/
                    AjaxResult results = jcsqdService.getTjJcProByHisCall("体检中心", order.getCardId(), "''", 100, 1, "'1'");
                    DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
                    DynamicDataSourceContextHolder.clearDataSourceType();
                    log.info("检查项目查询返回值:      " + results.toString());
@@ -553,7 +556,24 @@
                                jcbgdService.save(jcbgd);
                            }
                            jcsqdService.saveLtkjExamJcsqd(order.getCardId());
                            testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                            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("检查项目暂时未出结果,请稍后同步!!!");
                        }
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
@@ -3,6 +3,7 @@
import com.ltkj.common.annotation.DataSource;
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.hosp.sqlDomain.*;
import com.mysql.cj.jdbc.exceptions.MySQLTransactionRollbackException;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;