ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
@@ -8,10 +8,12 @@ import com.itextpdf.text.Element; import com.itextpdf.text.Paragraph; import com.ltkj.common.core.domain.AjaxResult; import com.ltkj.framework.config.MatchUtils; import com.ltkj.hosp.domain.TjCustomer; import com.ltkj.hosp.domain.TjOrder; import com.ltkj.hosp.domain.TjOrderYcxm; import com.ltkj.hosp.mapper.TjCustomerMapper; import com.ltkj.hosp.service.ITjCustomerService; import com.ltkj.hosp.service.ITjOrderDetailService; import com.ltkj.hosp.service.ITjOrderService; import com.ltkj.hosp.service.TjOrderYcxmService; @@ -25,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; @@ -50,6 +53,8 @@ private TjCheckController tjCheckController; @Autowired private TjCustomerMapper tjCustomerMapper; @Resource private ITjCustomerService customerService; @Autowired private ITjOrderService tjOrderService; @Autowired @@ -300,22 +305,30 @@ /** * 小程序点击体检报告查询详情,显示身高体重体重指数收缩压舒张压 */ @GetMapping("/getShenGaoTiZhong") @ApiOperation(value = "小程序-体检报告查询详情") public AjaxResult getShenGaoTiZhong(@RequestParam @ApiParam(value = "体检号") String tjNumber) { // Map<String, Object> objectMap = new HashMap<>(); LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>(); wq1.eq(TjOrder::getTjNumber, tjNumber); wq1.eq(TjOrder::getCheckStatus, 1); TjOrder one = tjOrderService.getOne(wq1); if (one == null) { return AjaxResult.success("体检暂未完成！！"); @GetMapping("/updatePhone") @ApiOperation(value = "小程序-修改手机号接口") public AjaxResult updatePhone(@RequestParam @ApiParam(value = "身份证号") String sfzh, @RequestParam @ApiParam(value = "姓名") String name, @RequestParam @ApiParam(value = "手机号") String phone) { if(StrUtil.isBlank(sfzh) || StrUtil.isBlank(name) || StrUtil.isBlank(phone)){ return AjaxResult.error("请输入正确的信息!"); } List<ShenGaoTiZhongVo> maps = detailService.getShenGaoTiZhongList(one.getTjNumber()); log.info("ltkj {}的体检报告查询详情"+maps,tjNumber); return AjaxResult.success(maps); if(!MatchUtils.isIdCard(sfzh)){ return AjaxResult.error("身份证号格式错误 请核对后重新输入!"); } LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>(); wq.eq(TjCustomer::getCusIdcard, sfzh); wq.like(TjCustomer::getCusName, name); TjCustomer customer = customerService.getOne(wq); if(null != customer){ if(!MatchUtils.isMobileNO( phone)){ return AjaxResult.error("手机号不正确 请核对后重新输入!"); } customer.setCusPhone( phone); customerService.updateById(customer); return AjaxResult.success("修改成功!"); } return AjaxResult.error("未查询到该人员!"); }
@@ -870,7 +870,7 @@ return AjaxResult.success(); }*/ public AjaxResult hisPDFNew2(TjOrder tjOrder, TjCustomer customer, TjReportTemplate tjReportTemplate, TjReportTemplate zongJianYiShiQianMing) throws Exception { public AjaxResult hisPDFNew2(TjOrder tjOrder, TjCustomer customer, TjReportTemplate tjReportTemplate, TjReportTemplate zongJianYiShiQianMing) throws Exception { try { String s1 = sysConfigService.selectConfigByKey("tjreport_font_size_second_page_info"); String s2 = sysConfigService.selectConfigByKey("tjreport_font_size_second_page_title"); ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
@@ -116,7 +116,7 @@ @GetMapping("/getKjTjAdviceKjbqBySex") @ApiOperation(value = "根据体检人性别和是否为总检查询体检建议接口") public AjaxResult getKjTjAdviceKjbqBySex(@RequestParam String sex, @RequestParam @ApiParam(value = "1常规医生 0总检") String isZj, public AjaxResult getKjTjAdviceKjbqBySex(@RequestParam @ApiParam(value = "1常规医生 0总检") String isZj, @RequestParam(required = false) @ApiParam(value ="建议内容") String jynr, @RequestParam(required = false) @ApiParam(value ="建议标题") String jybt, @ApiParam(value = "页码数(默认1)") @RequestParam(defaultValue = "1") Integer page, @@ -157,11 +157,13 @@ @GetMapping("/getCyTjAdviceKjbqBySex") @ApiOperation(value = "根据当前登录人id获取常用建议") public AjaxResult getCyTjAdviceKjbqBySex(@RequestParam(required = false) String sex, @RequestParam @ApiParam(value = "用户id 传当前登录人") Long userId, public AjaxResult getCyTjAdviceKjbqBySex( @RequestParam @ApiParam(value = "用户id 传当前登录人") Long userId, @ApiParam(value = "页码数(默认1)") @RequestParam(defaultValue = "1") Integer page, @ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize) { @ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize, @RequestParam(required = false) String nr) { LambdaQueryWrapper<TjUserAdvice> wq0 = new LambdaQueryWrapper<>(); if(!SecurityUtils.isAdmin(userId)) wq0.eq(TjUserAdvice::getUserId, userId); if(!SecurityUtils.isAdmin(userId)) wq0.eq(TjUserAdvice::getUserId, userId); List<TjUserAdvice> list = userAdviceService.list(wq0); List<TjAdvice> kjbqPage = new ArrayList<>(); Map<String,Object> map = new HashMap<>(); @@ -173,7 +175,13 @@ kjbqPage.add(advice1); } } List<TjAdvice> adviceList = kjbqPage.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); List<TjAdvice> adviceList =null; if(StringUtil.isNotBlank( nr)){ adviceList = kjbqPage.stream().filter(kjbq -> StringUtil.isNotBlank(kjbq.getTitle()) && kjbq.getTitle().contains(nr)) .skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); }else { adviceList = kjbqPage.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); } map.put("total", kjbqPage.size()); map.put("records", adviceList); return AjaxResult.success(map); ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -24,6 +24,7 @@ import com.ltkj.framework.config.UserHoder; import com.ltkj.framework.datasource.DynamicDataSourceContextHolder; import com.ltkj.hosp.domain.*; import com.ltkj.hosp.dto.CheckUpdateStatusDto; import com.ltkj.hosp.mapper.TestMapper; import com.ltkj.hosp.service.*; import com.ltkj.hosp.sqlDomain.*; @@ -1346,46 +1347,38 @@ /** * 根据体检订单号获取体检详情信息接口 * * @param tjNumber * @param advice * @param checkStatus * @return */ @PutMapping("/getTjdetailList") @PostMapping("/getTjdetailList") @ApiOperation(value = "根据体检订单号获取体检详情信息(并修改状态)接口") // @PreAuthorize("@ss.hasPermi('check:check:getTjdetailList')") @Transactional 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 = "职业结论") @RequestParam(required = false) String zhiyeJl, @ApiParam(value = "职业结果") @RequestParam(required = false) String zhiyeJg) { public AjaxResult getTjdetailList(@RequestBody CheckUpdateStatusDto dto) { try { String config = configService.selectConfigByKey("sfjcwjhyqxm"); if (null != config && config.equalsIgnoreCase("Y")) { int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber); int num = orderRemarkService.getTjYqOrderRemarkByTjNum(dto.getTjNumber()); if (num > 0) return AjaxResult.error("存在未检或延期项目暂不能生成报告!!!"); } Date date = new Date(); if (null != tjNumber) { if (null != dto.getTjNumber()) { Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId()); SysUser sysUser = userService.getById(userId); TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber); TjOrder tjOrder = orderService.getOrderByTjNum(dto.getTjNumber()); if (null != tjOrder) { tjOrder.setCheckAdvice(advice); tjOrder.setCheckStatus(checkStatus); tjOrder.setCheckAdvice(dto.getAdvice()); tjOrder.setCheckStatus(dto.getCheckStatus()); tjOrder.setStatus(TjConstants.TJ_CHECK); tjOrder.setCheckDoctor(sysUser.getNickName()); tjOrder.setCheckTime(date); tjOrder.setStatus(401); tjOrder.setFinishTime(date); if (StrUtil.isNotBlank(zhiyeJl)) tjOrder.setZhiyeJl(zhiyeJl); if (StrUtil.isNotBlank(zhiyeJg)) tjOrder.setZhiyeJg(zhiyeJg); if (StrUtil.isNotBlank(dto.getZhiyeJl())) tjOrder.setZhiyeJl(dto.getZhiyeJl()); if (StrUtil.isNotBlank(dto.getZhiyeJg())) tjOrder.setZhiyeJg(dto.getZhiyeJg()); if (orderService.updateById(tjOrder)) { AjaxResult pdf = reportController.toPdf(tjNumber); AjaxResult pdf = reportController.toPdf(dto.getTjNumber()); if (!pdf.get("code").toString().equals("200") ) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("操作失败!"); ltkj-hosp/src/main/java/com/ltkj/hosp/dto/CheckUpdateStatusDto.java
New file @@ -0,0 +1,21 @@ package com.ltkj.hosp.dto; import io.swagger.annotations.ApiParam; import lombok.Data; import org.springframework.web.bind.annotation.RequestParam; /** * ClassName: CheckUpdateStatusDto <br/> * Description: <br/> * date: 2025/7/17 16:46<br/> * * @author zjh<br /> */ @Data public class CheckUpdateStatusDto { private String tjNumber; private String advice; private Integer checkStatus; private String zhiyeJl; private String zhiyeJg; }
