zhaowenxuan
2025-03-28 92f6a9cabdc277e15571353d9ace6ea5abdd335f
手动同步调整
4个文件已修改
47 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
@@ -313,7 +313,7 @@
            LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(TjOrder::getTjNumber,tjNum);
            TjOrder order = tjOrderService.getOne(wrapper);
            hysqd.setTjh(order.getTjNumber());
            hysqd.setTjh(order.getCardId());
            String mzh = order.getCardId();
            LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
@@ -347,19 +347,25 @@
            hysqd.setTmh(tree.getSqdh()+"_"+tree.getHisXmdm());
            hysqd.setXmid(xmdm);
            hysqd.setXmmc(project.getHisXmbm());
            if (StrUtil.isNotBlank(xmdm)) {
                hysqd.setXmid(xmdm);
                hysqd.setXmmc(project.getHisXmmc());
            }else {
                hysqd.setXmid(String.valueOf(project.getProId()));
                hysqd.setXmmc(project.getProName());
            }
            hysqd.setSqsj(format.format(tree.getCreateTime()));
            hysqd.setJgsj(format.format(new Date()));
//            hysqd.setBbmc();
            boolean save = hysqdService.save(hysqd);
            boolean save2 = true;
            hysqdService.deletedByTjhAndXmId(hysqd.getTjh(),hysqd.getXmid());
            hybgdService.deletedLtkjHybgdByTjhAndTmh(tree.getSqdh()+"_"+tree.getHisXmdm());
            hysqdService.save(hysqd);
            for (Object object : lis) {
                cn.hutool.json.JSONObject jsonObject = (cn.hutool.json.JSONObject) object;
                LtkjHybgd hybgd = new LtkjHybgd();
                hybgd.setTmh(tree.getSqdh()+"_"+tree.getHisXmdm());
                hybgd.setJcxmid(jsonObject.getStr("jcxmid"));
                hybgd.setJcxm(jsonObject.getStr("checkParts"));
                hybgd.setJcxm(jsonObject.getStr("proName"));
                hybgd.setJyjg(jsonObject.getStr("proResult"));
                hybgd.setJgdw(jsonObject.getStr("company"));
                String tjStandardGtValue = jsonObject.getStr("tjStandardGtValue");
@@ -377,21 +383,12 @@
                hybgd.setShsj(jsonObject.getStr("examinationDate"));
                hybgd.setJyys(jsonObject.getStr("checkDoctorName"));
                hybgd.setShys(jsonObject.getStr("shys"));
                boolean save1 = hybgdService.save(hybgd);
                if (!save1) {
                    save2 = false;
                    break;
                }
                hybgdService.save(hybgd);
            }
            if (save && save2){
                try {
                    testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                }catch (Exception e){
                    log.error(String.valueOf(e));
                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    return AjaxResult.error("同步失败请重试");
                }
            } else {
            try {
                testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
            }catch (Exception e){
                log.error(String.valueOf(e));
                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                return AjaxResult.error("同步失败请重试");
            }
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java
@@ -31,6 +31,9 @@
    @Delete("DELETE FROM ltkj_hysqd WHERE tjh=#{tjh} AND tmh=#{tmh} ")
    void  deletedLtkjHysqdByTjhAndTmh(@Param("tjh")String tjh,@Param("tmh")String tmh);
    @Delete("DELETE FROM ltkj_hysqd WHERE tjh=#{tjh} AND xmid=#{xmid} ")
    void deletedByTjhAndXmId(@Param("tjh") String tjh,@Param("xmid") String xmid);
    @Select("SELECT * FROM ltkj_hysqd a WHERE a.tjh=#{tjh}")
    List<LtkjHysqd> getLtkjHysqdByTjh(@Param("tjh") String tjh);
ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java
@@ -28,4 +28,6 @@
    List<TjCustomer> getHyYcXmList(Date strTime, Date endTime);
    int getHyYcXmCount(String cardId);
    void deletedByTjhAndXmId(String tjh, String xmid);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java
@@ -57,4 +57,9 @@
    public int getHyYcXmCount(String cardId) {
        return mapper.getHyYcXmCount(cardId);
    }
    @Override
    public void deletedByTjhAndXmId(String tjh, String xmid) {
        mapper.deletedByTjhAndXmId(tjh,xmid);
    }
}