zjh20250603

zjh

2025-06-03 8f8c019d9b4013a5b71ffd5c0c2f88b0d1a386aa

zjh20250603

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

@@ -1933,4 +1933,12 @@
    }


    @GetMapping("/zongjianyishengHuiFuyichangxiangmu")
    @ApiOperation(value = "总检恢复异常项目接口")
    public AjaxResult zongjianyishengHuiFuyichangxiangmu(@RequestParam String tjNum) {

        List<TjOrderYcxm> list = ycxmService.zongjianyishengHuiFuyichangxiangmu(tjNum);
        return AjaxResult.success(list);
    }

}

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

@@ -794,6 +794,10 @@
            if(StringUtil.isNotBlank(bz)){
                tjBzProLambdaQueryWrapper.eq(TjBzPro::getBzId, bz);
                List<TjBzPro> list = bzProService.list(tjBzProLambdaQueryWrapper);
                for (TjBzPro bzPro : list) {
                    TjProject tjProject = tjProjectService.getById(bzPro.getProId());
                    if(null != tjProject)bzPro.setProName(tjProject.getProName());
                }
                return AjaxResult.success(list);
            }else {
                List<TjProject> list = tjProjectService.selectTjProjectListByBz();

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

@@ -178,7 +178,8 @@
    @ApiOperation(value = "查询体检预约列表接口(默认)")
    public TableDataInfo list(TjReservation tjReservation) {
        startPage();
        tjReservation.setIsExpire(2);
//        tjReservation.setIsExpire(2);
        if(tjReservation.getIsExpire()==null) tjReservation.setIsExpire(2);
        List<TjReservation> list = tjReservationService.selectTjReservationList(tjReservation);
//        if(null !=list && list.size()>0){
//            for (TjReservation reservation : list) {

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

@@ -45,4 +45,8 @@
    @ApiModelProperty(value = "病种ID")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long bzId;


    @TableField(exist = false)
    private String proName;
}

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

@@ -436,6 +436,18 @@
    private String zhiyeZysszdw;


    @ApiModelProperty("预约时间开始")
    @TableField(exist = false)
    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd")
    private Date yykssj;


    @ApiModelProperty("预约时间结束")
    @TableField(exist = false)
    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd")
    private Date yyjssj;



    @Override
    public String toString() {

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

@@ -23,4 +23,7 @@

    @Select("select * FROM tj_order_ycxm WHERE tjh=#{tjNumber}")
    List<TjOrderYcxm> selectListByTjh(String tjNumber);

    @Select("select * FROM tj_order_ycxm WHERE tjh=#{tjNum} and deleted=1")
    List<TjOrderYcxm> zongjianyishengHuiFuyichangxiangmu(String tjNum);
}

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

@@ -17,4 +17,6 @@
    void delOrderYcXmJyByTjh(String tjh);

    List<TjOrderYcxm> selectListByTjh(String tjNumber);

    List<TjOrderYcxm> zongjianyishengHuiFuyichangxiangmu(String tjNum);
}

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

@@ -31,4 +31,9 @@
    public List<TjOrderYcxm> selectListByTjh(String tjNumber) {
        return mapper.selectListByTjh(tjNumber);
    }

    @Override
    public List<TjOrderYcxm> zongjianyishengHuiFuyichangxiangmu(String tjNum) {
        return mapper.zongjianyishengHuiFuyichangxiangmu(tjNum);
    }
}

 ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml

@@ -86,7 +86,7 @@
            <if test="phoe != null  and phoe != ''">and phoe = #{phoe}</if>
            <if test="company != null  and company != ''">and company like concat('%', #{company}, '%')</if>
            <if test="companyId != null  and companyId != ''">and company_id = #{companyId} </if>
            <if test="reservationTime != null ">and reservation_time  BETWEEN #{reservationTime} and now()</if>
            <if test="yykssj != null and yyjssj != null ">and reservation_time  BETWEEN #{yykssj} and #{yyjssj} </if>
            <if test="isExpire != null ">and is_expire = #{isExpire}</if>
            <if test="szd != null ">and szd = #{szd}</if>
            and deleted = '0'