zjh20241021

zjh

2024-10-21 89919412a7d94f87aea159b39d823e5d6014a20e

zjh20241021

 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java

@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.hisDto.*;
import com.ltkj.hosp.service.*;
@@ -74,6 +75,7 @@
    private TjSysAsyncServiceImpl tjSysAsyncService;
    @Autowired
    private LisApiMethod lisApiMethod;


    //将方法返回值解析成json格式
    public JSONObject getJSONObject(String builder) {
@@ -249,7 +251,7 @@
                }
            }
        }
        if (detailsDtos.size() > 0) {
        if (!detailsDtos.isEmpty()) {
            dto.setDetails(detailsDtos);
            AjaxResult ajaxResult1 = controller.Outpintestapply(dto);
            String result5 = getAjaxResult(ajaxResult1);
@@ -286,6 +288,11 @@
                    tree.setCreateTime(DateUtil.date());
                    ltkjJianchajianyanTreeService.save(tree);
                }
                TjOrder tjOrder = orderService.getOrderByCardId(cardId);
                if(null !=tjOrder){
                    List<TjOrderDetail> dengJi = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
                    tjSysAsyncService.addCaiYangDengJi(dengJi,!dengJi.isEmpty(),tjOrder, SecurityUtils.getLoginUser().getUser(), null);
                }
            }
        }


 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java

@@ -848,7 +848,7 @@
            TjProject project = projectService.getById(item.getProId());
            return project != null && project.getProParentId() == 0;
        }).collect(Collectors.toList());
        addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
//        addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
        tjOrderDetails = new ArrayList<>();

        ArrayList<TjProject> jianChaProjects = new ArrayList<>();
@@ -1026,7 +1026,7 @@
                TjProject project = projectService.getById(item.getProId());
                return project != null && project.getProParentId() == 0;
            }).collect(Collectors.toList());
            addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
//            addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
        }

        Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
@@ -1097,6 +1097,10 @@
                            ltkjJianchajianyanTreeService.save(tree);
                        }

                        List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());

                        addCaiYangDengJi(detailList,!detailList.isEmpty(), order, sysUser,jxbz);

                    }
                }


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

@@ -231,7 +231,7 @@
        ArrayList<TjCustomer> tjCustomers = new ArrayList<>();
        for (TjSampling tjSampling : list) {
            TjCustomer customer = customerService.getById(tjSampling.getCusId());
            customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
            customer.setCusName(customer.getCusName());
            customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
            customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
            customer.setTjNumber(tjSampling.getTjNum());
@@ -268,6 +268,8 @@
        }
        for (TjSampling sampling : list) {
            TjCustomer customer = customerService.getById(sampling.getCusId());
            TjOrder order = orderService.getOrderByTjNum(sampling.getTjNum());
            if(null !=order)sampling.setCardId(order.getCardId());
            sampling.setCustomer(customer);
        }
        return AjaxResult.success(list);

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java

@@ -40,6 +40,9 @@
    @ApiModelProperty(value = "体检号")
    private String tjNum;

    @TableField(exist = false)
    private String cardId;

    /**
     * 采样编号
     */

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java

@@ -148,6 +148,9 @@
    @Select("SELECT * FROM tj_order WHERE tj_number = #{tjNum} AND deleted='0' ")
    public TjOrder getOrderByTjNum(String tjNum);

    @Select("SELECT * FROM tj_order WHERE card_id = #{cardId} AND deleted='0' ")
    public TjOrder getOrderByCardId(String cardId);

    List<TjOrder> getTjOrderList(@Param("tjNum")String tjNum,
                                 @Param("checkStatus")Integer checkStatus,
                                 @Param("compId")Long compId,

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java

@@ -97,6 +97,8 @@

    public TjOrder getOrderByTjNum(String tjNum);

    public TjOrder getOrderByCardId(String cardId);


    //总检 未开启初审
    List<TjOrder> getTjOrderList(String tjNum, Integer checkStatus, Long compId, Date beginTime, Date endTime);

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java

@@ -176,6 +176,11 @@
    }

    @Override
    public TjOrder getOrderByCardId(String cardId) {
        return tjOrderMapper.getOrderByCardId(cardId);
    }

    @Override
    public List<TjOrder> getTjOrderList(String tjNum, Integer checkStatus, Long compId, Date beginTime, Date endTime) {
        return tjOrderMapper.getTjOrderList(tjNum,checkStatus,compId,beginTime,endTime);
    }