总检页面增加体检类型搜索调整了存储过程

zhaowenxuan

2025-05-19 6859e991130a26b2a1e393f6a2ce8b89a1bdfd41

总检页面增加体检类型搜索调整了存储过程

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

@@ -1004,7 +1004,8 @@
                              @ApiParam(value = "姓名)") @RequestParam(required = false) String name,
                              @ApiParam(value = "审核医生)") @RequestParam(required = false) String shys,
                              @ApiParam(value = "开始时间") @RequestParam(required = false) String beginTime,
                              @ApiParam(value = "结束时间") @RequestParam(required = false) String endTime) {
                              @ApiParam(value = "结束时间") @RequestParam(required = false) String endTime,
                              @ApiParam(value = "体检类型") @RequestParam(required = false) String tjCategory) {

        String value = String.valueOf(compId);
        if (tjNumber == null) tjNumber = "";
@@ -1013,7 +1014,7 @@
        if (shys == null) shys = "";
        if (beginTime == null) beginTime = "";
        if (endTime == null) endTime = "";
        return AjaxResult.success(orderService.getCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name,shys));
        return AjaxResult.success(orderService.getCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name,shys,tjCategory));
    }


@@ -1140,8 +1141,9 @@
//    @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 = "审核状态0待审核1已审核") @RequestParam Integer checkStatus,
                                      @ApiParam(value = "职业结论") @RequestParam(required = false) String zhiyeJl,
                                      @ApiParam(value = "职业结果") @RequestParam(required = false) String zhiyeJg) {
        String config = configService.selectConfigByKey("sfjcwjhyqxm");
        if (null != config && config.equalsIgnoreCase("Y")) {
            int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
@@ -1162,6 +1164,10 @@
                tjOrder.setCheckTime(date);
                tjOrder.setStatus(401);
                tjOrder.setFinishTime(date);
                if (StrUtil.isNotBlank(zhiyeJl))
                    tjOrder.setZhiyeJl(zhiyeJl);
                if (StrUtil.isNotBlank(zhiyeJg))
                    tjOrder.setZhiyeJg(zhiyeJg);
                if (orderService.updateById(tjOrder)) {
                    TjCustomer customer = customerService.getById(tjOrder.getUserId());
                    if (null != customer) {
@@ -1410,6 +1416,8 @@
                parent.put("parent", remark.getProName());
                parent.put("parentId", remark.getProsId());
                parent.put("xmlb", remark.getXmlb());
                parent.put("zhiyejl",one.getZhiyeJl());
                parent.put("zhiyejg", one.getZhiyeJg());
                parent.put("", remark.getXmlb());
                List<TjOrderDetail> dels = new ArrayList<>();
                if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {

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

@@ -126,7 +126,7 @@

    //存储过程专用接口(总检)
    Map<String,Object> getCunChuGuoChengCustomerList(String tjNumber,Integer page,Integer pageSize,
                                                   Integer checkStatus, String compId, String beginTime, String endTime,String tjname,String shys);
                                                   Integer checkStatus, String compId, String beginTime, String endTime,String tjname,String shys,String tjCategory);

    //存储过程专用接口(初审)
    Map<String,Object> getCsCunChuGuoChengCustomerList(String tjNumber,Integer page,Integer pageSize,

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

@@ -226,7 +226,7 @@

    @Override
    public Map<String,Object> getCunChuGuoChengCustomerList(String tjNumber, Integer page, Integer pageSize, Integer checkStatus,
                                                          String compId, String beginTime, String endTime, String tjname,String shys) {
                                                          String compId, String beginTime, String endTime, String tjname,String shys,String tjCategory) {

        Map<String, Object> map = new HashMap<>();
        map.put("checkStatus",checkStatus);
@@ -238,6 +238,7 @@
        map.put("shys",shys);
        map.put("beginTime",beginTime);
        map.put("endTime",endTime);
        map.put("p_tjCategory",tjCategory);
        List<List<?>> list = tjOrderMapper.getCunChuGuoChengCustomerList(map);
        Map<String,Object> map1=new HashMap<>();
        map1.put("customers",list);

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

@@ -365,6 +365,7 @@
                #{shys,mode=IN,jdbcType=VARCHAR},
                #{beginTime,mode=IN,jdbcType=VARCHAR},
                #{endTime,mode=IN,jdbcType=VARCHAR},
                #{p_tjCategory,mode=IN,jdbcType=VARCHAR},
                #{total,mode=OUT,jdbcType=INTEGER}
            )}
    </select>