ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -587,20 +587,20 @@ LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber()); List<TjSampling> list = tjSamplingService.list(wrapper); log.info("采样数据 ->{}",list); log.info("采样数据 ->{}",JSONUtil.toJsonStr(list)); if (!list.isEmpty()) { Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode)); // log.info("分组后 ->{}",JSONUtil.toJsonStr(listMap)); log.info("分组后 ->{}",JSONUtil.toJsonStr(listMap)); ArrayList<String> ids = new ArrayList<>(); for (Map.Entry<String, List<TjSampling>> entry : listMap.entrySet()) { // log.info("key ->{},val ->{}",entry.getKey(),entry.getValue()); log.info("key ->{},val ->{}",entry.getKey(),entry.getValue()); // Lis标本代码 String specimenTypeCode = entry.getKey(); List<TjSampling> samplings = entry.getValue(); if (samplings.size() > 1) { if (samplings.size() >= 2) { // 进行合并 List<String> stringList = samplings.stream().map(TjSampling::getId).collect(Collectors.toList()); // log.info("提取id ->{}",stringList); log.info("提取id ->{}",stringList); for (int i = 0; i < stringList.size(); i++) { String s = stringList.get(i); if (tjSamplingService.isMergeItem(s) != 0) { @@ -608,8 +608,12 @@ ids.add(s); } } if (stringList.size() > 1) { String id = tjSamplingService.mergeCaiYangApi(stringList); ids.add(id); }else { ids.add(stringList.get(0)); } } else { ids.add(samplings.get(0).getId()); } @@ -791,10 +795,6 @@ Date dates = new Date(); final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss"); List<String> jcsqdh = orderService.getHuoQuJcsqdh(order.getCardId()); List<String> jysqdh = orderService.getHuoQuJysqdh(order.getCardId()); List<String> zlsqdh = orderService.getHuoQuZlsqdh(order.getCardId()); @@ -807,11 +807,12 @@ JSONObject object1 = null; String code1 = null; if (isUseLisAndPacsRegister){ // if (isUseLisAndPacsRegister){ TjCustomer customer1 = customerService.getById(order.getUserId()); // 作废检查申请 if (jcsqdh != null && !jcsqdh.isEmpty()){ for (String sqdh : jcsqdh) { List<String> bljcsqdhByPacs = orderService.getBljcsqdhByPacs(order.getCardId()); if (bljcsqdhByPacs != null && !bljcsqdhByPacs.isEmpty()){ for (String sqdh : bljcsqdhByPacs) { AjaxResult cancelPacsAjaxResult = pacsApiMethodService.updatePacsApply(sqdh, order.getCardId(), customer1.getCusName()); String result = cancelPacsAjaxResult.get("data").toString(); JSONObject object = JSONUtil.parseObj(result); @@ -821,11 +822,10 @@ } } } // 作废检验申请 TODO if (jysqdh != null && !jysqdh.isEmpty()){ List<String> huoQuJysqdhNotBuLu = orderService.getHuoQuJysqdhNotBuLu(order.getCardId()); List<String> huoQuJysqdhBuLu = orderService.getHuoQuJysqdhBuLu(order.getCardId()); for (String sqdh : huoQuJysqdhNotBuLu) { // 作废检验申请 List<String> bljysqdhByLis = orderService.getBljysqdhByLis(order.getCardId()); if (bljysqdhByLis != null && !bljysqdhByLis.isEmpty()){ for (String sqdh : bljysqdhByLis) { AjaxResult cancelLisAjaxResult = lisApiMethod.cancel(sqdh, order.getCardId(), customer1.getCusName()); log.info("lis请求返回 ->{}",JSONUtil.toJsonStr(cancelLisAjaxResult)); if (cancelLisAjaxResult.get("code").toString().equals("200")){ @@ -835,24 +835,14 @@ if(code.equals("1")){ orderService.delHuoQuJysqdh(order.getCardId()); } } else { String str = JSONUtil.parseObj(cancelLisAjaxResult.get("result").toString()).getJSONObject("Response").getStr("ResultContent"); if (str.contains("申请已作废")) orderService.delHuoQuJysqdh(order.getCardId()); } } for (String s : huoQuJysqdhBuLu) { ajaxResult = controller.Outpindeltestapply(order.getCardId(), "00029", s); result2 = getAjaxResult(ajaxResult); object1 = getJSONObject(result2); code1 = object1.getStr("ResultCode"); if (code1.equals("0")) { orderService.delHuoQuJysqdh(order.getCardId()); } } } }else { // }else { List<String> jcsqdh = orderService.getHuoQuJcsqdh(order.getCardId()); List<String> jysqdh = orderService.getHuoQuJysqdh(order.getCardId()); //2.1.6.5 作废门诊检查申请 if (null != jcsqdh && jcsqdh.size()>0) { for (String s : jcsqdh) { @@ -910,7 +900,7 @@ } } } } // } //2.1.3 门诊医生取消接诊 ajaxResult = controller.Outpinunconapply(order.getCardId(), date, "00029"); @@ -927,14 +917,11 @@ //作废补录项目 public boolean ZfBlXm(List<String> bldhs, TjOrder order) { log.info("bldhs ->{}",JSONUtil.toJsonStr(bldhs)); if(null !=bldhs && bldhs.size()>0){ log.info("进入判断"); try { for (String bldh : bldhs) { List<String> jcsqdh = orderService.getHuoQuBlJcsqdh(order.getCardId(),bldh); List<String> jysqdh = orderService.getHuoQuBlJysqdh(order.getCardId(),bldh); List<String> zlsqdh = orderService.getHuoQuBlZlsqdh(order.getCardId(),bldh); @@ -945,12 +932,15 @@ String result2 = null; JSONObject object1 = null; String code1 = null; if (lisApiMethod.isUseLisAndPacsRegister(order)) { log.info("查询前"); // if (lisApiMethod.isUseLisAndPacsRegister(order)) { TjCustomer customer1 = customerService.getById(order.getUserId()); log.info("customer1 ->{}",customer1); List<String> bljcsqdhByPacs = orderService.getBljcsqdhByPacs(order.getCardId(), bldh); log.info("bljcsqdhByPacs ->{}",bljcsqdhByPacs); // 作废检查申请 if (jcsqdh != null && !jcsqdh.isEmpty()){ for (String sqdh : jcsqdh) { if (bljcsqdhByPacs != null && !bljcsqdhByPacs.isEmpty()){ for (String sqdh : bljcsqdhByPacs) { AjaxResult cancelPacsAjaxResult = pacsApiMethodService.updatePacsApply(sqdh, order.getCardId(), customer1.getCusName()); log.info("作废检查 pacs返回 ->{}",JSONUtil.toJsonStr(cancelPacsAjaxResult)); String result = cancelPacsAjaxResult.get("data").toString(); @@ -963,9 +953,11 @@ } } } List<String> bljysqdhByLis = orderService.getBljysqdhByLis(order.getCardId(), bldh); log.info("bljysqdhByLis ->{}",bljysqdhByLis); // 作废检验申请 if (jysqdh != null && !jysqdh.isEmpty()){ for (String sqdh : jysqdh) { if (bljysqdhByLis != null && !bljysqdhByLis.isEmpty()){ for (String sqdh : bljysqdhByLis) { AjaxResult cancelLisAjaxResult = lisApiMethod.cancel(sqdh, order.getCardId(), customer1.getCusName()); log.info("作废检验 pacs返回 ->{}",JSONUtil.toJsonStr(cancelLisAjaxResult)); String result = cancelLisAjaxResult.get("data").toString(); @@ -979,7 +971,10 @@ } } }else { List<String> jcsqdh = orderService.getHuoQuBlJcsqdh(order.getCardId(),bldh); List<String> jysqdh = orderService.getHuoQuBlJysqdh(order.getCardId(),bldh); // }else { //2.1.6.5 作废门诊检查申请 if (null != jcsqdh && jcsqdh.size()>0) { for (String s : jcsqdh) { @@ -1039,11 +1034,11 @@ } } } } // } return true; } } catch (Exception e) { e.printStackTrace(); log.error(e.getMessage()); return false; } } ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java
@@ -160,6 +160,7 @@ String mxfyxmbm = detail.getMxfyxmbm(); tree.setHisXmdm(mxfyxmbm); tree.setType("检验"); tree.setService("lis"); tree.setTjPrice(String.valueOf(detail.getProjg())); LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>(); if (detail.getSfzhfy().equals("1")) @@ -401,6 +402,7 @@ String mxfyxmbm = detail.getMxfyxmbm(); tree.setHisXmdm(mxfyxmbm); tree.setType("检验"); tree.setService("lis"); tree.setTjPrice(String.valueOf(detail.getProjg())); LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>(); if (detail.getSfzhfy().equals("1")) ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -828,8 +828,9 @@ } } List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(),jxbz); addCaiYangDengJi(detailList,!detailList.isEmpty(), order, sysUser,jxbz); // TODO 和签到登记一样 只有配置中的以及收费类型为体检票时才增加到采样管理表 // List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(),jxbz); // addCaiYangDengJi(detailList,!detailList.isEmpty(), order, sysUser,jxbz); tjOrderDetails = new ArrayList<>(); @@ -1289,8 +1290,9 @@ pacsReg(order, customer, jianChaProjects); LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(TjSampling::getTjNum,order.getTjNumber()); wrapper.eq(TjSampling::getJxbz,jxbz); List<TjSampling> list = tjSamplingService.list(wrapper); log.info("采样数据 ->{}",list); log.info("采样数据 ->{}",JSONUtil.toJsonStr(list)); if (!list.isEmpty()){ Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode)); log.info("分组后 ->{}",JSONUtil.toJsonStr(listMap)); @@ -1300,7 +1302,7 @@ // Lis标本代码 String specimenTypeCode = entry.getKey(); List<TjSampling> samplings = entry.getValue(); if (samplings.size() > 1){ if (samplings.size() >= 2){ // 进行合并 List<String> stringList = samplings.stream().map(TjSampling::getId).collect(Collectors.toList()); log.info("提取id ->{}",stringList); @@ -1311,9 +1313,13 @@ ids.add(s); } } if (stringList.size() > 1) { String id = tjSamplingService.mergeCaiYangApi(stringList); ids.add(id); }else { ids.add(stringList.get(0)); } }else { ids.add(samplings.get(0).getId()); } } ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -2989,7 +2989,7 @@ boolean b = hisApiMethod.ZfBlXm(dto.getBldhs(), order); if (!b) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); // TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); log.info("撤销失败,调用作废出现失败"); return AjaxResult.error("撤销失败,调用作废出现失败"); } ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
@@ -248,24 +248,6 @@ @Select("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id=#{cardId} AND a.type='检验' GROUP BY a.sqdh") List<String> getHuoQuJysqdh(String cardId); /** * 查询非补录项目 * LIS作废查询 * @param cardId * @return */ @Select("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id= #{cardId} AND a.type='检验' AND a.jxbz IS NULL GROUP BY a.sqdh") List<String> getHuoQuJysqdhNotBuLu(String cardId); /** * 查询补录项目 * LIS作废查询 * @param cardId * @return */ @Select("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id= #{cardId} AND a.type='检验' AND a.jxbz IS NOT NULL GROUP BY a.sqdh") List<String> getHuoQuJysqdhBuLu(String cardId); @Delete("DELETE FROM ltkj_jianchajianyan_tree WHERE card_id=#{cardId} AND type='检验'") @@ -274,7 +256,7 @@ @Select("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id=#{cardId} AND a.type='处置' GROUP BY a.sqdh") List<String> getHuoQuZlsqdh(String cardId); @Delete("DELETE FROM ltkj_jianchajianyan_tree WHERE card_id=#{cardId} AND type='处置'") Boolean delHuoQuZlsqdh(String cardId); Boolean delHuoQuZlsqdha(String cardId); List<Map<String, Object>> getTjTongJiJieKou(Map<String, Object> map); @@ -303,4 +285,16 @@ "</foreach>", "</script>" }) List<LtkjJianchajianyanTree> getBuLuXmXinXi(@Param("bldh") List<String> bldh,@Param("cardId")String cardId); @Select("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id=#{cardId} and a.jxbz=#{bldh} AND a.type='检查' AND a.service = 'pacs' GROUP BY a.sqdh") List<String> getBlJcsqdhByPacsAndBldh(@Param("cardId") String cardId,@Param("bldh") String bldh); @Select("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id=#{cardId} and a.jxbz=#{bldh} AND a.type='检验' AND a.service = 'lis' GROUP BY a.sqdh") List<String> getBlJysqdhByLisAndBldh(@Param("cardId") String cardId,@Param("bldh") String bldh); @Select("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id=#{cardId} AND a.type='检查' AND a.service = 'pacs' GROUP BY a.sqdh") List<String> getBlJcsqdhByPacs(String cardId); @Select("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id=#{cardId} AND a.type='检验' AND a.service = 'lis' GROUP BY a.sqdh") List<String> getBlJysqdhByLis(String cardId); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -147,10 +147,6 @@ List<String> getHuoQuJysqdh(String cardId); List<String> getHuoQuJysqdhNotBuLu(String cardId); List<String> getHuoQuJysqdhBuLu(String cardId); Boolean delHuoQuJysqdh(String cardId); List<String> getHuoQuZlsqdh(String cardId); @@ -172,4 +168,12 @@ List<LtkjJianchajianyanTree> getBuLuXmXinXi(List<String> bldh,String cardId); List<String> getBljcsqdhByPacs(String cardId, String bldh); List<String> getBljysqdhByLis(String cardId, String bldh); List<String> getBljcsqdhByPacs(String cardId); List<String> getBljysqdhByLis(String cardId); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -313,7 +313,7 @@ @Override public Boolean delHuoQuZlsqdh(String cardId) { return tjOrderMapper.delHuoQuZlsqdh(cardId); return tjOrderMapper.delHuoQuZlsqdha(cardId); } @Override @@ -375,12 +375,22 @@ } @Override public List<String> getHuoQuJysqdhNotBuLu(String cardId) { return tjOrderMapper.getHuoQuJysqdhNotBuLu(cardId); public List<String> getBljcsqdhByPacs(String cardId, String bldh) { return tjOrderMapper.getBlJcsqdhByPacsAndBldh(cardId,bldh); } @Override public List<String> getHuoQuJysqdhBuLu(String cardId) { return tjOrderMapper.getHuoQuJysqdhBuLu(cardId); public List<String> getBljysqdhByLis(String cardId, String bldh) { return tjOrderMapper.getBlJysqdhByLisAndBldh(cardId,bldh); } @Override public List<String> getBljcsqdhByPacs(String cardId) { return tjOrderMapper.getBlJcsqdhByPacs(cardId); } @Override public List<String> getBljysqdhByLis(String cardId) { return tjOrderMapper.getBlJysqdhByLis(cardId); } } ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
@@ -313,12 +313,12 @@ </delete> <select id="getOrderList" parameterType="java.lang.Long" resultMap="TjOrderResult"> select * from tj_order where 1 = 1 and user_id = #{cusId} </select> <!-- <select id="getOrderList" parameterType="java.lang.Long" resultMap="TjOrderResult">--> <!-- select *--> <!-- from tj_order--> <!-- where 1 = 1--> <!-- and user_id = #{cusId}--> <!-- </select>--> <select id="getOrderList1" parameterType="Integer" resultMap="TjOrderResult">
