zjh20241101

zjh

2024-11-01 36b6d628eb92b689d8808e4a3e14fef934bed631

zjh20241101

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

@@ -73,9 +73,11 @@
import com.ltkj.mall.mallOrderUtils.TjConstants;
import com.ltkj.mall.service.IMallCheckLogService;
import com.ltkj.mall.service.IMallOrderService;
import com.ltkj.system.domain.TjDjdDyjl;
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import com.ltkj.system.service.ISysUserService;
import com.ltkj.system.service.ITjDjdDyjlService;
import com.ltkj.web.controller.his.*;
import com.ltkj.web.controller.lis.LisApiMethod;
import com.ltkj.web.controller.pacs.PacsApiMethodService;
@@ -219,6 +221,8 @@
    private TjSamplingMapper tjSamplingMapper;
    @Autowired
    private ITjGroupingProService groupingProService;
    @Autowired
    private ITjDjdDyjlService djdDyjlService;

    //将方法返回值解析成json格式
    public JSONObject getJSONObject(String builder) {
@@ -454,6 +458,8 @@
                                order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
                            }
                        }
                        TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber());
                        if(null !=dycs)order.setDycs(Math.toIntExact(dycs.getDycs()));
                    }
                    collect = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
                }
@@ -512,6 +518,8 @@
                        order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
                    }
                }
                TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber());
                if(null !=dycs)order.setDycs(Math.toIntExact(dycs.getDycs()));
            }
        }
        map.put("list", list);

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

@@ -439,6 +439,10 @@
    @ApiModelProperty("预约号")
    private String reservationId;


    @TableField(exist = false)
    private Integer dycs;

    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

 ltkj-system/src/main/java/com/ltkj/system/mapper/TjDjdDyjlMapper.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.system.domain.TjDjdDyjl;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;

/**
 * 体检导检单打印记录Mapper接口
@@ -61,4 +62,8 @@
     * @return 结果
     */
    public int deleteTjDjdDyjlByIds(Long[] ids);


    @Select("SELECT * FROM tj_djd_dyjl a WHERE a.deleted=0 AND a.tj_num=#{tjNumber} AND a.dylx=0")
    TjDjdDyjl getDjdDyCsByTjNum(String tjNumber);
}

 ltkj-system/src/main/java/com/ltkj/system/service/ITjDjdDyjlService.java

@@ -59,4 +59,6 @@
     * @return 结果
     */
    public int deleteTjDjdDyjlById(Long id);

    TjDjdDyjl getDjdDyCsByTjNum(String tjNumber);
}

 ltkj-system/src/main/java/com/ltkj/system/service/impl/TjDjdDyjlServiceImpl.java

@@ -88,4 +88,9 @@
    public int deleteTjDjdDyjlById(Long id) {
        return tjDjdDyjlMapper.deleteTjDjdDyjlById(id);
    }

    @Override
    public TjDjdDyjl getDjdDyCsByTjNum(String tjNumber) {
        return tjDjdDyjlMapper.getDjdDyCsByTjNum(tjNumber);
    }
}