zjh20241205-3

zjh

2024-12-06 c42f62b32bac302a7ac9fcde7489f7c5fc6e11aa

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

@@ -68,25 +68,32 @@
        List<TjHzLog> list = tjHzLogService.list(wq);

        for (TjHzLog hzLog : list) {

            List<String> a = new ArrayList<>();
            List<String> b = new ArrayList<>();
            if ("0".equals(tjHzLog.getHzType())) {
                continue;
            }
            if (hzLog.getHzDeptId() != null) {
                StringBuffer aa = new StringBuffer();
                final String[] split = hzLog.getHzDeptId().split(",");
                for (String s : split) {
                    final SysDept byId = deptService.getById(s);
                    a.add(byId.getDeptName());
                    b.add(String.valueOf(byId.getDeptId()));
                    aa.append(byId.getDeptName());
                    aa.append(";");
                }
                hzLog.setHzDeptName(String.valueOf(aa));
            }

            hzLog.setHzDeptNameList(a);
            hzLog.setHzDeptIdList(b);
            //会诊记录的评论
            if (hzLog.getId() != null) {
                LambdaQueryWrapper<TjHzReplyLog> wq1 = new LambdaQueryWrapper<>();
                wq1.eq(TjHzReplyLog::getHzId, hzLog.getId());
                wq1.orderByDesc(TjHzReplyLog::getCreateTime);
                List<TjHzReplyLog> list1 = tjHzReplyLogService.list(wq1);
                hzLog.setHzReplyLogsList(list1);
            }
@@ -121,13 +128,12 @@
    @Log(title = "会诊申请记录", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody TjHzLog tjHzLog) {
        if (tjHzLog.getHzDeptIdList() == null && "1".equals(tjHzLog.getHzType())) {
        if (tjHzLog.getHzDeptIdList() == null && "1".equals(tjHzLog.getHzType()) && tjHzLog.getHzDeptIdList().size() == 0) {
            return AjaxResult.error("请选择科室");
        }
        if (tjHzLog.getHzDeptIdList() != null) {
        if (tjHzLog.getHzDeptIdList() != null && tjHzLog.getHzDeptIdList().size() > 0) {
            StringBuilder str = new StringBuilder();
            for (int i = 0; i < tjHzLog.getHzDeptIdList().size(); i++) {

                str = str.append(tjHzLog.getHzDeptIdList().get(i));
                if (i != tjHzLog.getHzDeptIdList().size() - 1) {
                    str = str.append(",");
@@ -135,7 +141,6 @@
            }
            tjHzLog.setHzDeptId(String.valueOf(str));
        }
        //修改当前会诊状态
        if (tjHzLog.getOrderId() == null) {
            return AjaxResult.error("出错了，请联系工作人员");
        }
@@ -154,6 +159,20 @@
    @Log(title = "会诊申请记录 ", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody TjHzLog tjHzLog) {
        if ("1".equals(tjHzLog.getHzType())) {
            if (tjHzLog.getHzDeptIdList() != null && tjHzLog.getHzDeptIdList().size() > 0) {
                StringBuilder str = new StringBuilder();
                for (int i = 0; i < tjHzLog.getHzDeptIdList().size(); i++) {
                    str = str.append(tjHzLog.getHzDeptIdList().get(i));
                    if (i != tjHzLog.getHzDeptIdList().size() - 1) {
                        str = str.append(",");
                    }
                }
                tjHzLog.setHzDeptId(String.valueOf(str));
            }else {
                return AjaxResult.error("请选择科室");
            }
        }
        return toAjax(tjHzLogService.saveOrUpdate(tjHzLog));
    }

@@ -161,8 +180,8 @@
     * 删除会诊申请记录
     */
    @Log(title = "会诊申请记录 ", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
    @DeleteMapping("/remove")
    public AjaxResult remove(@RequestBody Long[] ids) {
        return toAjax(tjHzLogService.removeByIds(Arrays.asList(ids)));
    }

@@ -177,7 +196,7 @@
        wq1.eq(TjOrder::getTjNumber, tjNumber);
        wq1.eq(TjOrder::getIsHz, 1);
        final List<TjOrder> list = tjOrderService.list(wq1);
        if (list == null || list.size() == 0) {
        if (list == null || list.isEmpty()) {
            return AjaxResult.success(0);
        }
        for (TjOrder tjOrder : list) {