ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -1315,12 +1315,12 @@ public AjaxResult addRemark(@ApiParam(value = "体检父项目备注集合") @RequestBody List<TjOrderRemark> remarklList) { Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId()); SysUser sysUser = userService.getById(userId); if (remarklList == null || remarklList.size() == 0) { if (remarklList == null || remarklList.isEmpty()) { return AjaxResult.success("操作失败"); } for (TjOrderRemark orderRemark : remarklList) { List<String> summaryList = orderRemark.getSummaryList(); if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null) ) { if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null) ) { orderRemark.setSummary(Joiner.on(";").join(orderRemark.getSummaryList())); } LambdaQueryWrapper<TjOrder> qw = new LambdaQueryWrapper<>(); @@ -1333,7 +1333,7 @@ List<TjOrderDetail> tjOrderDetailList = orderRemark.getTjOrderDetailList(); final TjCustomer byId1 = customerService.getById(order.getUserId()); if (null != tjOrderDetailList && tjOrderDetailList.size() > 0) { if (null != tjOrderDetailList && !tjOrderDetailList.isEmpty()) { //----------------------------------start for (TjOrderDetail tjOrderDetail : tjOrderDetailList) { final TjProject byId = projectService.getById(tjOrderDetail.getProId()); @@ -1378,7 +1378,7 @@ remarkService.save(remark); } else { one.setRemark(orderRemark.getRemark()); if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null)) { if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) { one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList())); } // one.setDeptId(orderRemark.getDeptId()); @@ -1764,6 +1764,29 @@ return AjaxResult.success(map); } @GetMapping("/getAdviceByTjNumAndPro") @ApiOperation(value = "根据项目id和体检号获取建议") public AjaxResult getAdviceByTjNumAndPro(@ApiParam(value = "父项目项目id") @RequestParam String proId, @ApiParam(value = "体检号") @RequestParam String tjNum) { LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>(); wq.eq(TjOrderRemark::getProId, proId); wq.eq(TjOrderRemark::getTjNumber,tjNum); TjOrderRemark remark = remarkService.getOne(wq); List<TjAdvice> list =null; if (null != remark && !StringUtils.isBlank(remark.getSummary())) { String[] strings = StringUtils.split(remark.getSummary(), ";"); if(null !=strings && strings.length>0){ list = tjAdviceService.getAdviceStringByIds(strings); } } return AjaxResult.success(list); } /** * 获取部门树列表 */ ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ltkj.common.annotation.Excel; import com.ltkj.common.utils.StringUtils; import com.ltkj.common.utils.poi.ExcelUtil; import com.ltkj.framework.config.UserHoder; import com.ltkj.hosp.domain.TjAdvice; @@ -87,14 +88,14 @@ @ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize) { LambdaQueryWrapper<TjAdviceKjbq> wq = new LambdaQueryWrapper<>(); Page<TjAdviceKjbq> page1 = new Page<>(page, pageSize); if (null != userId && !userId.equals("")) { if (null != userId && !StringUtils.isBlank(userId)) { wq.eq(TjAdviceKjbq::getUserId, userId); } if (null != qyzt) { wq.eq(TjAdviceKjbq::getQyzt, qyzt); } Page<TjAdviceKjbq> kjbqPage = kjbqService.page(page1, wq); if (null != kjbqPage.getRecords() && kjbqPage.getRecords().size() > 0) { if (null != kjbqPage.getRecords() && !kjbqPage.getRecords().isEmpty()) { for (TjAdviceKjbq record : kjbqPage.getRecords()) { if (null != record.getUserId()) { record.setUserName(userService.getById(record.getUserId()).getNickName()); ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
@@ -99,7 +99,7 @@ @GetMapping(value = "/getInfoById") @ApiOperation(value = "根据客户id获取问诊详细信息") public AjaxResult getInfoById(@RequestParam String tjNumber) { if (null != tjNumber && !"".equals(tjNumber)) { if (null != tjNumber && !tjNumber.isEmpty()) { // LambdaQueryWrapper<TjAskMedicalHistory> wq = new LambdaQueryWrapper<>(); // wq.eq(TjAskMedicalHistory::getTjNum, tjNumber); // TjAskMedicalHistory one = tjAskMedicalHistoryService.getOne(wq); @@ -139,7 +139,7 @@ a.setTjLx(order.getTjCategory()); TjCustomer customer = customerService.getById(a.getCusId()); if (customer != null) { a.setCusName(MatchUtils.hideCusName(customer.getCusName())); a.setCusName(customer.getCusName()); a.setCusIdCard(customer.getCusIdcard()); a.setCusSex(String.valueOf(customer.getCusSex())); } ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
@@ -108,7 +108,16 @@ if(i>0){ return AjaxResult.error("该性别分组已存在不可重复创建"); } if(null ==tjDwGrouping.getPayType()|| tjDwGrouping.getPayType().equals(""))return AjaxResult.error("请选择结算方式!!!"); int wz = tjDwGroupingService.selectTjDwGroupingBySex(tjDwGrouping.getDwDeptId(),"2"); if(wz>0 && (tjDwGrouping.getSex().contains("0") || tjDwGrouping.getSex().contains("1"))){ return AjaxResult.error("已存在通用分组不可创建其他分组"); } int n = tjDwGroupingService.selectTjDwGroupingBySex(tjDwGrouping.getDwDeptId(),"0"); int v = tjDwGroupingService.selectTjDwGroupingBySex(tjDwGrouping.getDwDeptId(),"1"); if((n>0 || v>0) && tjDwGrouping.getSex().contains("2")){ return AjaxResult.error("已存在其他分组不可创建通用分组"); } if(null ==tjDwGrouping.getPayType()|| tjDwGrouping.getPayType().isEmpty())return AjaxResult.error("请选择结算方式!!!"); TjDwDept dwDept = dwDeptService.getById(tjDwGrouping.getDwDeptId()); if(null !=dwDept){ ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzLogController.java
@@ -196,7 +196,7 @@ wq1.eq(TjOrder::getTjNumber, tjNumber); wq1.eq(TjOrder::getIsHz, 1); final List<TjOrder> list = tjOrderService.list(wq1); if (list == null || list.size() == 0) { if (list == null || list.isEmpty()) { return AjaxResult.success(0); } for (TjOrder tjOrder : list) { ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -177,7 +177,7 @@ public TableDataInfo selectTjReservationByDelete(TjReservation tjReservation) { startPage(); List<TjReservation> list = tjReservationService.selectTjReservationByDelete(tjReservation); if(null !=list && list.size()>0){ if(null !=list && !list.isEmpty()){ // for (TjReservation reservation : list) { // reservation.setName(MatchUtils.hideCusName(reservation.getName())); // reservation.setPhoe(MatchUtils.hidePhoneNum(reservation.getPhoe())); @@ -410,12 +410,19 @@ } } for (TjDwGrouping groupingWz : groupingWzs) { if (null != groupingWz && groupingWz.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingWz.getDwDeptId().equals(dwDept.getId())) { if (null != groupingWz && groupingWz.getDwDeptId().equals(dwDept.getId())) { tjReservation.setGroupingId(groupingWz.getId()); tjReservation.setGroupingName(groupingWz.getGroupingName()); tjReservation.setYsPrice(groupingWz.getYsPrice()); //合计 hjMoney = hjMoney.add(groupingWz.getYsPrice()); count+=1; hjMoney = hjMoney.add(groupingWz.getYsPrice());count+=1; if(tjReservation.getSex()==0){ manMoney=manMoney.add(groupingWz.getYsPrice()); manCount+=1; } if(tjReservation.getSex()==1){ woManMoney=woManMoney.add(groupingWz.getYsPrice());woManCount+=1; } } } LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>(); @@ -435,13 +442,13 @@ wrongList.add(tjReservation.getName()); } } if (yyList.size() > 0) { if (!yyList.isEmpty()) { map.put("list", yyList); map.put("hjMoney", hjMoney); return AjaxResult.error("操作失败,以上人员已经预约无需导入!!!", map); } if (wrongList.size() > 0) { if (!wrongList.isEmpty()) { map.put("list", wrongList); map.put("hjMoney", hjMoney); return AjaxResult.error("操作失败, 请认真核对信息后重新导入!!!", map);
