ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
@@ -28,12 +28,12 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.*; import java.util.stream.Collectors; import static com.ltkj.framework.datasource.DynamicDataSourceContextHolder.log; import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.save; @@ -98,14 +98,39 @@ @GetMapping("/newGetTjPat") @ApiOperation(value = "新的查询体检信息接口") @ApiOperation(value = "A------新的查询体检信息接口") public AjaxResult newGetTjPat(@RequestParam(required = false)String pacCode, @RequestParam(required = false)String pacName, @RequestParam(required = false)String pacRemark) { @RequestParam(required = false)String pacRemark, HttpServletRequest request, HttpSession session) { // List<Map<String, Object>> maps = testMapper.newGetTjPat111111(pacName); List<Map<String, Object>> maps = testMapper.newGetTjPat(pacCode,pacName,pacRemark); DynamicDataSourceContextHolder.clearDataSourceType(); // List<Map<String, Object>> list=new ArrayList<>(); // if(null !=maps && maps.size()>0){ // for (Map<String, Object> map : maps) { // String pacCode1 = map.get("pacCode").toString(); // List<String> s = orderService.selectTjOrderByCardId1(); // if(null !=s && s.size()>0){ // if(s.contains(pacCode1)){ //// maps.remove(map); // continue; // } // list.add(map); // } // } // } // return AjaxResult.success(list); List<String> strings = orderService.selectTjOrderByCardId1(); if(null !=strings && strings.size()>0){ List<Map<String, Object>> collect = maps.stream() .filter(item -> !strings.contains(item.get("pacCode").toString())).collect(Collectors.toList()); return AjaxResult.success(collect); } return AjaxResult.success(maps); // return AjaxResult.success(collect); }
@@ -24,9 +24,12 @@ import com.ltkj.hosp.domain.TjCustomer; import com.ltkj.common.utils.poi.ExcelUtil; import com.ltkj.common.core.page.TableDataInfo; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; /** @@ -66,7 +69,28 @@ @RequestParam(required = false)String pacRemark) { List<Map<String, Object>> maps = testMapper.newGetTjPat(pacCode,pacName,pacRemark); DynamicDataSourceContextHolder.clearDataSourceType(); // List<Map<String, Object>> list=new ArrayList<>(); // if(null !=maps && maps.size()>0){ // for (Map<String, Object> map : maps) { // String pacCode1 = map.get("pacCode").toString(); // List<String> s = tjOrderService.selectTjOrderByCardId1(); // if(null !=s && s.size()>0){ // if(s.contains(pacCode1)){ //// maps.remove(map); // continue; // } // list.add(map); // } // } // } List<String> strings = tjOrderService.selectTjOrderByCardId1(); if(null !=strings && strings.size()>0){ List<Map<String, Object>> collect = maps.stream() .filter(item -> !strings.contains(item.get("pacCode").toString())).collect(Collectors.toList()); return AjaxResult.success(collect); } return AjaxResult.success(maps); // return AjaxResult.success(maps); }
@@ -10,6 +10,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import cn.hutool.core.codec.Base64; @@ -53,6 +54,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpRequest; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -804,7 +806,21 @@ @PostMapping @ApiOperation(value = "体检签到登记接口") @Transactional //(切换数据库出错，所以注释) public AjaxResult addOrderAndDetail(@RequestBody TjOrder tjOrder) throws Exception { public AjaxResult addOrderAndDetail(@RequestBody TjOrder tjOrder, HttpServletRequest request) throws Exception { // 生成Token并保存到Session中 String token = UUID.randomUUID().toString(); // 生成一个随机字符串作为Token request.getSession().setAttribute("token", token); // 获取表单中的Token并与Session中的Token比较 String formToken = request.getParameter("token"); if (formToken != null && formToken.equals(request.getSession().getAttribute("token"))) { System.out.printf("=================第一次提交"); } else { // 重复提交了表单信息 System.out.printf("=============================重复了"); } Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId()); SysUser sysUser = userService.getById(userId);
@@ -198,4 +198,8 @@ @Select("SELECT count(*) FROM tj_order a WHERE a.deleted=0 and a.card_id=#{cardId}") int selectTjOrderByCardId(String cardId); @Select("SELECT a.card_id FROM tj_order a WHERE a.deleted=0") List<String> selectTjOrderByCardId1(); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -129,4 +129,6 @@ Integer checkStatus, String compId, String beginTime, String endTime,String tjname); public int selectTjOrderByCardId(String cardId); List<String> selectTjOrderByCardId1(); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -263,4 +263,9 @@ public int selectTjOrderByCardId(String cardId) { return tjOrderMapper.selectTjOrderByCardId(cardId); } @Override public List<String> selectTjOrderByCardId1() { return tjOrderMapper.selectTjOrderByCardId1(); } }
