zjh20250717

zjh

6 天以前 cf37087d3a1bd7247e0fa7acc4c3c6c1e30ea01b

zjh20250717

 ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java

@@ -157,6 +157,7 @@
                    water.setRefundPersonId("his回调");
                    water.setRefundTime(new Date());
                    water.setRefundPrice(water.getPaidIn());
                    water.setHisTfWaterId(feiYongId);
                    tjFlowingWaterService.updateById(water);
                }
            }

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

@@ -134,7 +134,7 @@

    @GetMapping("/getCyTjAdviceKjbqBySex")
    @ApiOperation(value = "根据当前登录人id获取常用建议")
    public AjaxResult getCyTjAdviceKjbqBySex(@RequestParam String sex, @RequestParam @ApiParam(value = "用户id 传当前登录人") Long userId,
    public AjaxResult getCyTjAdviceKjbqBySex(@RequestParam @ApiParam(value = "用户id 传当前登录人") Long userId,
                                             @ApiParam(value = "页码数(默认1)") @RequestParam(defaultValue = "1") Integer page,
                                             @ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize) {
        LambdaQueryWrapper<TjAdvice> wq = new LambdaQueryWrapper<>();

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

@@ -23,6 +23,7 @@
import com.ltkj.framework.config.UserHoder;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.dto.CheckUpdateStatusDto;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.*;
@@ -1137,49 +1138,35 @@
     * @param checkStatus
     * @return
     */
    @PutMapping("/getTjdetailList")
    @PostMapping("/getTjdetailList")
    @ApiOperation(value = "根据体检订单号获取体检详情信息(并修改状态)接口")
//    @PreAuthorize("@ss.hasPermi('check:check:getTjdetailList')")
    public AjaxResult getTjdetailList(@ApiParam(value = "体检tjNumber") @RequestParam String tjNumber,
                                      @ApiParam(value = "总检建议") @RequestParam(required = false) String advice,
                                      @ApiParam(value = "审核状态0待审核1已审核") @RequestParam Integer checkStatus,
                                      @ApiParam(value = "职业结论") @RequestParam(required = false) String zhiyeJl,
                                      @ApiParam(value = "职业结果") @RequestParam(required = false) String zhiyeJg) {
    public AjaxResult getTjdetailList(@RequestBody CheckUpdateStatusDto dto) {
        String config = configService.selectConfigByKey("sfjcwjhyqxm");
        if (null != config && config.equalsIgnoreCase("Y")) {
            int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
            int num = orderRemarkService.getTjYqOrderRemarkByTjNum(dto.getTjNumber());
            if (num > 0) return AjaxResult.error("存在未检或延期项目暂不能生成报告!!!");
        }
        Date date = new Date();
        if (null != tjNumber) {
        if (null != dto.getTjNumber()) {
            Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
            SysUser sysUser = userService.getById(userId);
            LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
            wq1.eq(TjOrder::getTjNumber, tjNumber);
            wq1.eq(TjOrder::getTjNumber, dto.getTjNumber());
            TjOrder tjOrder = orderService.getOne(wq1);
            if (null != tjOrder) {
                tjOrder.setCheckAdvice(advice);
                tjOrder.setCheckStatus(checkStatus);
                tjOrder.setCheckAdvice(dto.getAdvice());
                tjOrder.setCheckStatus(dto.getCheckStatus());
                tjOrder.setStatus(TjConstants.TJ_CHECK);
                tjOrder.setCheckDoctor(sysUser.getNickName());
                tjOrder.setCheckTime(date);
                tjOrder.setStatus(401);
                tjOrder.setFinishTime(date);
                if (StrUtil.isNotBlank(zhiyeJl))
                    tjOrder.setZhiyeJl(zhiyeJl);
                if (StrUtil.isNotBlank(zhiyeJg))
                    tjOrder.setZhiyeJg(zhiyeJg);
                if (StrUtil.isNotBlank(dto.getZhiyeJl()))
                    tjOrder.setZhiyeJl(dto.getZhiyeJl());
                if (StrUtil.isNotBlank(dto.getZhiyeJg()))
                    tjOrder.setZhiyeJg(dto.getZhiyeJg());
                if (orderService.updateById(tjOrder)) {
                    TjCustomer customer = customerService.getById(tjOrder.getUserId());
                    if (null != customer) {
                        customer.setCusNumber(customer.getCusNumber() + 1);
                        customer.setCardId("0");
                        if (customerService.updateById(customer)) {
                            asyncService.updateCheckType(tjNumber);
                            return AjaxResult.success("操作成功");
                        }
                        return AjaxResult.error("操作失败");
                    }
                }
                return AjaxResult.error("操作失败");
            }
@@ -1796,7 +1783,8 @@
                                            String[] split = tjOrderDetail.getProResult().split("。|,|，");
                                            List<Map<String, Object>> mapList = new ArrayList<>();
                                            for (String s : split) {
                                                s = s.replaceAll("\n", "").replaceAll("[（(][^）)]*[）)]", "");;
                                                    s = s.replaceAll("\n", "").replaceAll("[（(][^）)]*[）)]", "");
                                                    ;
                                                Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s, "0",xb);
                                                if (null != maps && !maps.isEmpty()) {
                                                    Object bt = maps.get("bt");
@@ -1858,7 +1846,6 @@
    }



    @GetMapping("/chushenyemianchakanxiangmujieguo")
    @ApiOperation(value = "初审页面查看项目结果接口")
    public AjaxResult chushenyemianchakanxiangmujieguo(@RequestParam String proId, @RequestParam String tjNum) {
@@ -1910,6 +1897,7 @@

    /**
     * 查询复查项目列表
     *
     * @param tjNum 体检号
     * @param type 复查状态 0未复查状态 1复查状态
     * @return
@@ -1925,6 +1913,7 @@

    /**
     * 复查项目提交
     *
     * @param json
     * @return
     */
@@ -1950,7 +1939,6 @@
        int a = ycxmService.zongjianyishengHuiFuyichangxiangmuanniu(id);
        return AjaxResult.success(a);
    }



    @GetMapping("/csymxmxzqtyybcjk")

 ltkj-hosp/src/main/java/com/ltkj/hosp/dto/CheckUpdateStatusDto.java

New file
@@ -0,0 +1,21 @@
package com.ltkj.hosp.dto;

import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * ClassName: CheckUpdateStatusDto <br/>
 * Description: <br/>
 * date: 2025/7/17 16:46<br/>
 *
 * @author zjh<br />
 */
@Data
public class CheckUpdateStatusDto {
    private String tjNumber;
    private String advice;
    private Integer checkStatus;
    private String zhiyeJl;
    private String zhiyeJg;
}