1

lige

2023-09-15 121a2eda372f4149864117b881e8c334dc6e6c54

1

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

@@ -72,7 +72,6 @@
    private ISysDeptService deptService;



    @GetMapping("/getOperationPermissionsByTjNum")
    @ApiOperation(value = "(初审页面  和 医生页面)根据体检号获取是否可操作权限接口  true可操作  反之不可")
    public AjaxResult getOperationPermissionsByTjNum(@ApiParam(value = "体检号") @RequestParam String tjNumber) {
@@ -88,10 +87,6 @@
        }
        return AjaxResult.success(false);
    }






    @GetMapping("/getCsList")
@@ -183,7 +178,6 @@
            return getResult(page, pageSize, orderList, customerList, map);
        }
    }



    /**
@@ -440,20 +434,17 @@
    @ApiOperation(value = "总检点击体检信息详情")
//    @PreAuthorize("@ss.hasPermi('check:check:updateCheckType')")
    public AjaxResult updateCheckType(@ApiParam(value = "客户体检号") @RequestParam String tjNumber) {
        final long l = System.currentTimeMillis();
        List<Map<String, Object>> list = new ArrayList<>();
        LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
        wq1.eq(TjOrder::getTjNumber, tjNumber);
        TjOrder one = orderService.getOne(wq1);
        TjOrder one = orderService.getOrderByTjNum(tjNumber);

        if (one == null) {
            return AjaxResult.error("暂无数据！！");
        }
        LambdaQueryWrapper<TjCustomer> wq22 = new LambdaQueryWrapper<>();
        wq22.eq(TjCustomer::getCusId, one.getUserId());
        TjCustomer customer = customerService.getOne(wq22);
        LambdaQueryWrapper<TjOrderRemark> wqm = new LambdaQueryWrapper<>();
        wqm.eq(TjOrderRemark::getTjNumber, tjNumber);
        wqm.eq(TjOrderRemark::getType, 1);
        List<TjOrderRemark> remarkList = orderRemarkService.list(wqm);

        TjCustomer customer = customerService.getById(one.getUserId());
        List<TjOrderRemark> remarkList = orderRemarkService.getRemarkListByTjNumAndType(tjNumber);

        if (null != remarkList && remarkList.size() > 0) {
            for (TjOrderRemark remark : remarkList) {
                Map<String, Object> parent = new HashMap<>();
@@ -463,52 +454,27 @@
                    parent.put("parent", project.getProName());
                    parent.put("parentId", project.getProId().toString());
                }
                LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>();
                wq2.eq(TjProject::getProParentId, remark.getProId());
                List<Long> sonsTjProjectList = projectService.list(wq2).stream().map(TjProject::getProId).collect(Collectors.toList());
                if (sonsTjProjectList.size() > 0) {
                    LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
                    wq.eq(TjOrderDetail::getOrderId, one.getOrderId());
                    wq.in(TjOrderDetail::getProId, sonsTjProjectList);
                    List<TjOrderDetail> tjOrderDetails = detailService.list(wq);
                List<TjOrderDetail> tjOrderDetails = detailService.getDetailByOrderIdAndParId(one.getOrderId(), remark.getProId());
                    if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
                        for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                            LambdaQueryWrapper<TjProject> wqqqq = new LambdaQueryWrapper<>();
                            wqqqq.eq(TjProject::getProId, tjOrderDetail.getProId());
                            tjOrderDetail.setProject(projectService.getOne(wqqqq));
                            LambdaQueryWrapper<TjStandard> wq6 = new LambdaQueryWrapper<>();
                            wq6.eq(TjStandard::getProId, tjOrderDetail.getProId());
                            List<TjStandard> list2 = tjStandardService.list(wq6);
                        final TjProject byId = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
                        tjOrderDetail.setProject(byId);
                        List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
                            if (list2.size() == 0) {
                                tjOrderDetail.setStandard(new TjStandard());
                            } else if (list2.size() == 1) {
                                tjOrderDetail.setStandard(list2.get(0));
                            } else {
                                for (TjStandard tjStandard : list2) {
                                    LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
                                    if (tjStandard.getTjSex() != null) {
                                        wq8.eq(TjStandard::getTjSex, customer.getCusSex());
                                    }
                                    if (tjStandard.getTjType() != null) {
                                        wq8.eq(TjStandard::getTjType, StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday())));
                                    }
                                    tjOrderDetail.setStandard(tjStandardService.getOne(wq8));
                                }
                            final int ageType = StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday()));
                            TjStandard tjStandard1=tjStandardService.getListBySexAndType(customer.getCusSex(),ageType, String.valueOf(tjOrderDetail.getProId()));
                            tjOrderDetail.setStandard(tjStandard1);
                            }
                        }
                        String summary = remark.getSummary();
                        if (null != summary) {
                            String[] split = summary.split(";");
                            LambdaQueryWrapper<TjAdvice> wq3 = new LambdaQueryWrapper<>();
                            wq3.in(TjAdvice::getId, Arrays.asList(split));
                            List<TjAdvice> advices = tjAdviceService.list(wq3);
                            if (null != advices && advices.size() > 0) {
                                StringBuilder string = new StringBuilder();
                                for (TjAdvice advice : advices) {
                                    string.append(advice.getTitle()).append(";");
                                }
                                parent.put("parentAdvice", string);
                            }
                        parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(Arrays.asList(split)));

                        } else {
                            parent.put("parentAdvice", null);
                        }
@@ -521,8 +487,10 @@
                    } else {
                        return AjaxResult.success("该客户没有体检项目数据");
                    }
//                }
                }
            }
            final long l1 = System.currentTimeMillis();
            System.out.println("++++++++++++++++++++++++++++++++++++++++++==============="+(l1-l));
            return AjaxResult.success(list);
        }
        return AjaxResult.success("该客户没有体检项目数据！");
@@ -538,6 +506,7 @@

    /**
     * 总检修改备注
     *
     * @return
     */
    @PostMapping("/checkUpdateOrderRemark")

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

@@ -111,11 +111,11 @@
    }

    /**
     * 判断是否有人正在改
     * 查看修改记录判断是否有人正在改
     */
    @RepeatSubmit
    @GetMapping(value = "/hasModified/{tjNumber}")
    @ApiOperation(value = "判断是否有人正在改")
    @ApiOperation(value = "查看修改记录判断是否有人正在改")
    public AjaxResult hasModified(@PathVariable("tjNumber") String tjNumber) {
        Map<String, String> map = new HashMap<>();
        LambdaQueryWrapper<TjCheckModifiedState> wq = new LambdaQueryWrapper<>();
@@ -125,7 +125,6 @@
        if (a != null) {
            SysUser sysUser = userService.selectUserById(Long.valueOf(a.getUserId()));
            map.put("status", "0");
            //map.put("userid", sysUser.getUserName());
            map.put("name", sysUser.getNickName());
            return AjaxResult.success(map);
        }

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

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjAdvice;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

/**
 * adviceMapper接口
@@ -62,4 +64,13 @@
     * @return 结果
     */
    public int deleteTjAdviceByIds(Long[] ids);



    @Select({"<script>", "select GROUP_CONCAT(a.title  Separator ';') from tj_advice a where a.id in",
            "<foreach collection='aList' item='id' open='(' separator=',' close=')'>",
            "#{id}",
            "</foreach>",
            "</script>" })
    public String getAdviceStringByIds(@Param("aList") List<String> aList);
}

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

@@ -133,4 +133,13 @@
            "a.update_id=#{userId}\n" +
            "WHERE a.order_id=#{orderId}")
    boolean updateTjOrderDetailsByOrderId(@Param("orderId")String orderId,@Param("userName")String userName,@Param("userId") String userId,@Param("ls")String ls);


    @Select("SELECT *\n" +
            "FROM `tj_order_detail` \n" +
            "where order_id=#{orderId}\n" +
            "and pro_id IN\n" +
            "(select pro_id from tj_project where pro_parent_id=#{proParentId})")
    public List<TjOrderDetail> getDetailByOrderIdAndParId(@Param("orderId")Long orderId,@Param("proParentId")Long proParentId);

}

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

@@ -64,4 +64,8 @@
            "LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.order_id=#{orderId} AND\n" +
            "b.pro_parent_id=0")
    boolean saveTjOrderRemarkByOrderId(@Param("tjNumber")String tjNumber,@Param("userName") String userName,@Param("userId") String userId,@Param("orderId")String orderId);


    @Select("SELECT * FROM tj_order_remark WHERE tj_number=#{tjNumber} AND type =1 AND deleted='0'")
    List<TjOrderRemark> getRemarkListByTjNumAndType(String tjNumber);
}

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

@@ -66,4 +66,12 @@

    @Select("SELECT * FROM tj_standard  WHERE  pro_id=#{proId} AND deleted='0'")
    public List<TjStandard> getTjStandardListByProId(String proId);


    @Select("select * from tj_standard \n" +
            "where IF(NULL is NULL, 0 = 0, tj_sex =#{tjSex})\n" +
            "AND IF(NULL is NULL, 0 = 0, tj_type=#{tjType})\n" +
            "AND stan_id in \n" +
            "(SELECT stan_id FROM tj_standard  WHERE  pro_id=#{proId} AND deleted='0')")
    public TjStandard getListBySexAndType(Long tjSex,int tjType,String proId);
}

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

@@ -60,4 +60,10 @@
     * @return 结果
     */
    public int deleteTjAdviceById(Long id);


    public String getAdviceStringByIds(List<String> aList);



}

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

@@ -94,4 +94,6 @@
    boolean saveTjOrderDetailsByCusId(String cusId,String orderId,String userName, String userId);

    boolean updateTjOrderDetailsByOrderId(String orderId,String userName, String userId,String ls);

    public List<TjOrderDetail> getDetailByOrderIdAndParId(Long orderId,Long proParentId);
}

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

@@ -30,4 +30,6 @@


    boolean saveTjOrderRemarkByOrderId(String tjNumber, String userName, String userId,String orderId);

    List<TjOrderRemark> getRemarkListByTjNumAndType(String tjNumber);
}

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

@@ -3,6 +3,7 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.hosp.domain.TjStandard;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@@ -62,4 +63,7 @@
    public int deleteTjStandardById(String id);

    public List<TjStandard> getTjStandardListByProId(String proId);


    public TjStandard getListBySexAndType(Long tjSex,int tjType,String proId);
}

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

@@ -89,4 +89,9 @@
    public int deleteTjAdviceById(Long id) {
        return tjAdviceMapper.deleteTjAdviceById(id);
    }

    @Override
    public String getAdviceStringByIds(List<String> aList) {
        return tjAdviceMapper.getAdviceStringByIds(aList);
    }
}

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

@@ -143,4 +143,9 @@
        return tjOrderDetailMapper.updateTjOrderDetailsByOrderId(orderId,userName,userId,ls);
    }

    @Override
    public List<TjOrderDetail> getDetailByOrderIdAndParId(Long orderId, Long proParentId) {
        return tjOrderDetailMapper.getDetailByOrderIdAndParId(orderId,proParentId);
    }

}

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

@@ -56,4 +56,11 @@
    public boolean saveTjOrderRemarkByOrderId(String tjNumber, String userName, String userId,String orderId) {
        return mapper.saveTjOrderRemarkByOrderId(tjNumber,userName,userId,orderId);
    }

    @Override
    public List<TjOrderRemark> getRemarkListByTjNumAndType(String tjNumber) {
        return mapper.getRemarkListByTjNumAndType(tjNumber);
    }


}

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

@@ -94,4 +94,10 @@
    public List<TjStandard> getTjStandardListByProId(String proId) {
        return tjStandardMapper.getTjStandardListByProId(proId);
    }

    @Override
    public TjStandard getListBySexAndType(Long tjSex, int tjType,String proId) {
        return tjStandardMapper.getListBySexAndType(tjSex,tjType,proId);
    }

}