zjh 本地 2024/01/31 -1

zjh

2024-01-31 fc868e56b1e8199d2c4267fae74c44cfa62a777f

zjh 本地 2024/01/31 -1

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

@@ -269,7 +269,7 @@
                                   @ApiParam(value = "状态 0同意 1拒绝 默认同意") @RequestParam(defaultValue = "0") Integer status,
                                   @ApiParam(value = "驳回理由") @RequestParam(required = false) String remark) {
        int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
        if (num > 0) return AjaxResult.error("有延期项目暂不能审核!");
        if (num > 0) return AjaxResult.error("请先同步体检项目!");
        if (null != tjNumber) {
            Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
            SysUser sysUser = userService.getById(userId);

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

@@ -26,7 +26,7 @@
    @Select("SELECT * FROM tj_order_remark WHERE tj_number=#{tjNumber} AND pro_id=#{proParentId} AND deleted='0'")
    TjOrderRemark getTjOrderRemarkByTjNumAndProParentId(@Param("tjNumber") String tjNumber,@Param("proParentId") String proParentId);

    @Select("SELECT COUNT(*) a FROM tj_order_remark WHERE tj_number=#{tjNumber} AND type=3 AND deleted=0")
    @Select("SELECT COUNT(*) a FROM tj_order_remark WHERE tj_number=#{tjNumber} AND type=3 or type=0 AND deleted=0")
    int getTjYqOrderRemarkByTjNum(String tjNumber);

    @Delete("DELETE  FROM tj_order_remark WHERE tj_number=#{tjNumber}")