From edd22f77d054237b32628a91f217fd18288b13d6 Mon Sep 17 00:00:00 2001 From: 赵文轩 <1652863494@qq.com> Date: 星期三, 08 一月 2025 10:11:45 +0800 Subject: [PATCH] 泾川his补录调整 --- ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 729 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 582 insertions(+), 147 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java index eb792a0..4f0293f 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java @@ -855,6 +855,420 @@ //浣撴瀵筯is鐢宠鍗曡皟鐢ㄦ柟娉� +// public AjaxResult tijianbulushenqing(TjCustomer customer, String date,String cardId,String jxbz,ArrayList<TjProject> jianChaProjects,Boolean isTuanTiPiao) { +// TjOrder order = orderService.getOrderByCardId(cardId); +// if(null !=order){ +// String dept = configService.selectConfigByKey("request_default_dept"); +// String ysbm = configService.selectConfigByKey("request_default_ysbm"); +// String ysmc = configService.selectConfigByKey("request_default_ysmc"); +// String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix"); +// List<TbTransition> detailList = transitionService.getBlTbTransitionListByCusId(customer.getCusIdcard(),cardId,jxbz); +// Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order); +// List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =new ArrayList<>(); +// if (useLisAndPacsRegister && isTuanTiPiao) { +// // 妫�鏌ョ敵璇� +// 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("閲囨牱鏁版嵁 ->{}",JSONUtil.toJsonStr(list)); +// if (!list.isEmpty()){ +// Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode)); +// 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()); +// // Lis鏍囨湰浠g爜 +// String specimenTypeCode = entry.getKey(); +// List<TjSampling> samplings = entry.getValue(); +// if (samplings.size() >= 2){ +// // 杩涜鍚堝苟 +// List<String> stringList = samplings.stream().map(TjSampling::getId).collect(Collectors.toList()); +// log.info("鎻愬彇id ->{}",stringList); +// for (int i = 0; i < stringList.size(); i++) { +// String s = stringList.get(i); +// if (tjSamplingService.isMergeItem(s) != 0) { +// stringList.remove(s); +// ids.add(s); +// } +// } +// if (stringList.size() > 1) { +// String id = tjSamplingService.mergeCaiYangApi(stringList,lis_tmh_prefix); +// ids.add(id); +// }else { +// ids.add(stringList.get(0)); +// } +// }else { +// ids.add(samplings.get(0).getId()); +// } +// } +// Boolean confirmed = samplingServiceApi.confirmSamplingApi(ids, "Y", "N"); +// if (!confirmed) +// return AjaxResult.error("澶勭悊澶辫触"); +// } +// }else { +// //妫�楠岀敵璇� +// OutpintestapplyDto dto = new OutpintestapplyDto(); +// dto.setHisRegistrationId(cardId); +// dto.setSfzh(customer.getCusIdcard()); +// dto.setSqysbm(ysbm); +// dto.setMzksbm(dept); +// dto.setSjrq(date); +// dto.setCzybm(ysbm); +// dto.setCzyksbm(dept); +// dto.setSfjz("0"); +// +// List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>(); +// if (null != detailList && !detailList.isEmpty()) { +// LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>(); +// wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList())); +//// wq.groupBy(TjProject::getHisXmbm); +//// wq.in(TjProject::getDeptId, "241", "317"); +// wq.in(TjProject::getDeptId,deptService.getJyDeptIds()); +// List<TjProject> projects = projectService.list(wq); +// if (null != projects && !projects.isEmpty()) { +// for (TjProject project : projects) { +// if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) { +// if (null != project.getHisXmbm()) { +// OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); +// detailsDto.setMxfyxmbm(project.getHisXmbm()); +// if (project.getSfzhfy().equals("Y")) { +// detailsDto.setSfzhfy("1"); +// } else { +// detailsDto.setSfzhfy("0"); +// } +// detailsDto.setSl(project.getSl()); +// detailsDto.setProjg(project.getProPrice()); +// detailsDtos.add(detailsDto); +// } +// if(project.getProId()==1740177341251154377L){ +// OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto(); +// detilsDto.setYpbm("00006670"); +// detilsDto.setPcbm("06"); +// detilsDto.setSl("1"); +// detilsDto.setDj("60"); +// detilsDto.setDcjl("1"); +// detilsDto.setPj("60"); +// detilsDto.setJj("60"); +// detilsDto.setJldw(""); +// detilsDto.setTjbm(""); +// detilsDto.setPs(""); +// detilsDto.setPsbm(""); +// detilsDto.setYyts(""); +// detilsDto.setXtph(""); +// detilsDto.setScph(""); +// detilsDto.setYpxq(""); +// detilsDto.setCdbm(""); +// detilsDto.setKfdw(""); +// detilsDto.setYfdw(""); +// detilsDto.setYysm(""); +// detilsDto.setFzbl("1"); +// detilsDto.setZh("0"); +// outpinmedicapplyDetilsDtos.add(detilsDto); +// } +// } +// } +// } +// } +// if (!detailsDtos.isEmpty()) { +// dto.setDetails(detailsDtos); +// AjaxResult ajaxResult1 = controller.Outpintestapply(dto); +// String result5 = getAjaxResult(ajaxResult1); +// JSONObject object3 = getJSONObject(result5); +// String code3 = object3.getStr("ResultCode"); +// if (code3.equals("0")) { +// List<OutpintestapplyDetailsDto> details = dto.getDetails(); +// for (OutpintestapplyDetailsDto detail : details) { +// LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree(); +// tree.setJxbz(jxbz); +// tree.setCardId(dto.getHisRegistrationId()); +// tree.setPationid(customer.getPationId()); +// JSONObject resultData = object3.getJSONObject("ResultData"); +// tree.setSqdh(resultData.getStr("jysqdh")); +// tree.setFyhj(resultData.getStr("fyhj")); +// String mxfyxmbm = detail.getMxfyxmbm(); +// tree.setHisXmdm(mxfyxmbm); +// tree.setType("妫�楠�"); +// tree.setService("his"); +// tree.setTjPrice(String.valueOf(detail.getProjg())); +// LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>(); +// if (detail.getSfzhfy().equals("1")) +// wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm); +// else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm); +// List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1); +// if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) { +// String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm(); +// LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>(); +// wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm); +// LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2); +// LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>(); +// wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm()); +// LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3); +// tree.setXmfl(ejjfxmzd.getYjkmdm()); +// } +// tree.setCreateTime(DateUtil.date()); +// ltkjJianchajianyanTreeService.save(tree); +// } +// } +// } +// +// //闂ㄨ瘖妫�鏌ョ敵璇� +// OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto(); +// outpinexamapplyDto.setHisRegistrationId(cardId); +// outpinexamapplyDto.setSfzh(customer.getCusIdcard()); +// outpinexamapplyDto.setSqysbm(ysbm); +// outpinexamapplyDto.setMzksbm(dept); +// outpinexamapplyDto.setCzybm(ysbm); +// outpinexamapplyDto.setCzyksbm(dept); +// outpinexamapplyDto.setSfjz("0"); +//// List<TbTransition> detailLists = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId); +// List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>(); +// if (null != detailList && !detailList.isEmpty()) { +// LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>(); +// wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList())); +// wq.in(TjProject::getDeptId,deptService.getJcDeptIds()); +// List<TjProject> projects = projectService.list(wq); +// if (null != projects && !projects.isEmpty()) { +// for (TjProject project : projects) { +// if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) { +// if (null != project.getHisXmbm()) { +// OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); +// detailsDto.setMxfyxmbm(project.getHisXmbm()); +// if (project.getSfzhfy().equals("Y")) { +// detailsDto.setSfzhfy("1"); +// } else { +// detailsDto.setSfzhfy("0"); +// } +// detailsDto.setSl(project.getSl()); +// detailsDto.setProjg(project.getProPrice()); +// detailsDtoss.add(detailsDto); +// } +// if(project.getProId()==1740177341251154377L){ +// OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto(); +// detilsDto.setYpbm("00006670"); +// detilsDto.setPcbm("06"); +// detilsDto.setSl("1"); +// detilsDto.setDj("60"); +// detilsDto.setDcjl("1"); +// detilsDto.setPj("60"); +// detilsDto.setJj("60"); +// detilsDto.setJldw(""); +// detilsDto.setTjbm(""); +// detilsDto.setPs(""); +// detilsDto.setPsbm(""); +// detilsDto.setYyts(""); +// detilsDto.setXtph(""); +// detilsDto.setScph(""); +// detilsDto.setYpxq(""); +// detilsDto.setCdbm(""); +// detilsDto.setKfdw(""); +// detilsDto.setYfdw(""); +// detilsDto.setYysm(""); +// detilsDto.setFzbl("1"); +// detilsDto.setZh("0"); +// outpinmedicapplyDetilsDtos.add(detilsDto); +// } +// } +// } +// } +// } +// if (!detailsDtoss.isEmpty()) { +// outpinexamapplyDto.setDetails(detailsDtoss); +// AjaxResult ajaxResult2 = controller.Outpinexamapply(outpinexamapplyDto); +// String result6 = getAjaxResult(ajaxResult2); +// JSONObject object5 = getJSONObject(result6); +// String code4 = object5.getStr("ResultCode"); +// if (code4.equals("0")) { +// List<OutpintestapplyDetailsDto> details = outpinexamapplyDto.getDetails(); +// for (OutpintestapplyDetailsDto detail : details) { +// LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree(); +// tree.setJxbz(jxbz); +// tree.setCardId(outpinexamapplyDto.getHisRegistrationId()); +// tree.setPationid(customer.getPationId()); +// JSONObject resultData = object5.getJSONObject("ResultData"); +// tree.setSqdh(resultData.getStr("jcsqdh")); +// tree.setFyhj(resultData.getStr("fyhj")); +// String mxfyxmbm = detail.getMxfyxmbm(); +// tree.setHisXmdm(mxfyxmbm); +// tree.setType("妫�鏌�"); +// tree.setService("his"); +// tree.setTjPrice(String.valueOf(detail.getProjg())); +// LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>(); +// if (detail.getSfzhfy().equals("1")) +// wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm); +// else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm); +// List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1); +// if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) { +// String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm(); +// LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>(); +// wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm); +// LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2); +// LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>(); +// wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm()); +// LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3); +// tree.setXmfl(ejjfxmzd.getYjkmdm()); +// } +// tree.setCreateTime(DateUtil.date()); +// ltkjJianchajianyanTreeService.save(tree); +// } +// } +// } +// +// //闂ㄨ瘖娌荤枟澶勭疆鐢宠 +// OutpintreatapplyDto dao = new OutpintreatapplyDto(); +// dao.setHisRegistrationId(cardId); +// dao.setSfzh(customer.getCusIdcard()); +// dao.setSqysbm(ysbm); +// dao.setMzksbm(dept); +// dao.setSjrq(date); +// dao.setCzybm(ysbm); +// dao.setCzyksbm(dept); +// dao.setSfjz("0"); +//// List<TbTransition> details = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId); +// List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>(); +// if (null != detailList && !detailList.isEmpty()) { +// LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>(); +// wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList())); +// wq.in(TjProject::getDeptId,deptService.getCzDeptIds()); +// List<TjProject> projects = projectService.list(wq); +// if (null != projects && !projects.isEmpty()) { +// for (TjProject project : projects) { +// if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) { +// if (null != project.getHisXmbm()) { +// OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); +// detailsDto.setMxfyxmbm(project.getHisXmbm()); +// if (project.getSfzhfy().equals("Y")) { +// detailsDto.setSfzhfy("1"); +// } else { +// detailsDto.setSfzhfy("0"); +// } +// detailsDto.setSl(project.getSl()); +// detailsDto.setProjg(project.getProPrice()); +// detailDtos.add(detailsDto); +// } +// if(project.getProId()==1740177341251154377L){ +// OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto(); +// detilsDto.setYpbm("00006670"); +// detilsDto.setPcbm("06"); +// detilsDto.setSl("1"); +// detilsDto.setDj("60"); +// detilsDto.setDcjl("1"); +// detilsDto.setPj("60"); +// detilsDto.setJj("60"); +// detilsDto.setJldw(""); +// detilsDto.setTjbm(""); +// detilsDto.setPs(""); +// detilsDto.setPsbm(""); +// detilsDto.setYyts(""); +// detilsDto.setXtph(""); +// detilsDto.setScph(""); +// detilsDto.setYpxq(""); +// detilsDto.setCdbm(""); +// detilsDto.setKfdw(""); +// detilsDto.setYfdw(""); +// detilsDto.setYysm(""); +// detilsDto.setFzbl("1"); +// detilsDto.setZh("0"); +// outpinmedicapplyDetilsDtos.add(detilsDto); +// } +// } +// } +// } +// } +// if (!detailDtos.isEmpty()) { +// dao.setDetails(detailDtos); +// AjaxResult mzylyzsq1 = controller.Outpintreatapply(dao); +// String mzylyzsq2 = getAjaxResult(mzylyzsq1); +// JSONObject mzylyzsq3 = getJSONObject(mzylyzsq2); +// String code5 = mzylyzsq3.getStr("ResultCode"); +// if (code5.equals("0")) { +// List<OutpintestapplyDetailsDto> details1 = dao.getDetails(); +// for (OutpintestapplyDetailsDto detail : details1) { +// LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree(); +// tree.setJxbz(jxbz); +// tree.setCardId(dao.getHisRegistrationId()); +// tree.setPationid(customer.getPationId()); +// JSONObject resultData = mzylyzsq3.getJSONObject("ResultData"); +// tree.setSqdh(resultData.getStr("zlczh")); +// tree.setFyhj(resultData.getStr("fyhj")); +// String mxfyxmbm = detail.getMxfyxmbm(); +// tree.setHisXmdm(mxfyxmbm); +// tree.setType("澶勭疆"); +// tree.setTjPrice(String.valueOf(detail.getProjg())); +// LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>(); +// if (detail.getSfzhfy().equals("1")) +// wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm); +// else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm); +// List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1); +// if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) { +// String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm(); +// LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>(); +// wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm); +// LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2); +// LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>(); +// wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm()); +// LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3); +// tree.setXmfl(ejjfxmzd.getYjkmdm()); +// } +// tree.setCreateTime(DateUtil.date()); +// ltkjJianchajianyanTreeService.save(tree); +// } +// } +// } +// +// //鑽搧鐢宠 +// if(!outpinmedicapplyDetilsDtos.isEmpty()){ +// OutpinmedicapplyDto dto1=new OutpinmedicapplyDto(); +// dto1.setHisRegistrationId(cardId); +// dto1.setSfzh(customer.getCusIdcard()); +// dto1.setSqysbm(ysbm); +// dto1.setMzksbm(dept); +// dto1.setSjrq(date); +// dto1.setCzybm(ysbm); +// dto1.setCzyksbm(dept); +// dto1.setCflxbm("A"); +// dto1.setYfbm("1"); +// dto1.setFyts("1"); +// dto1.setMzzd(""); +// dto1.setDetails(outpinmedicapplyDetilsDtos); +// AjaxResult result = controller.Outpinmedicapply(dto1); +// String result1 = getAjaxResult(result); +// JSONObject object = getJSONObject(result1); +// String code = object.getStr("ResultCode"); +// if(null !=code && code.equals("0")){ +// JSONObject resultData = object.getJSONObject("ResultData"); +//// Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0); +// String cfh = resultData.getStr("cfh"); +// log.info("鑽搧鐢宠鍚庣殑澶勬柟鍙锋槸: "+cfh+" outpinmedicapplyDetilsDtos 閲岄潰鐨勫�间负: "+outpinmedicapplyDetilsDtos.toString()); +// for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) { +// TjCf cf=new TjCf(); +// cf.setJxbz(jxbz); +// cf.setCardId(cardId); +// cf.setSfzh(customer.getCusIdcard()); +// cf.setCfh(cfh); +// cf.setSqysbm(ysbm); +// cf.setSqysxm(ysmc); +// cf.setMzksbn(dept); +// cf.setSqrq(date); +// cf.setCzybm(ysbm); +// cf.setYpbm(detilsDto.getYpbm()); +// cf.setYpmc("灏跨礌[14C]鍛兼皵璇曢獙鑽洅"); +// cf.setSl(String.valueOf(detilsDto.getSl())); +// cf.setDj(String.valueOf(detilsDto.getDj())); +// cf.setDcjl(String.valueOf(detilsDto.getDcjl())); +// cf.setPj(String.valueOf(detilsDto.getPj())); +// cf.setJj(String.valueOf(detilsDto.getJj())); +// cf.setCreateTime(new Date()); +// cfService.save(cf); +// } +// } +// } +// } +// } +// return AjaxResult.success(); +// } + public AjaxResult tijianbulushenqing(TjCustomer customer, String date,String cardId,String jxbz,ArrayList<TjProject> jianChaProjects,Boolean isTuanTiPiao) { TjOrder order = orderService.getOrderByCardId(cardId); if(null !=order){ @@ -909,17 +1323,6 @@ } }else { //妫�楠岀敵璇� - OutpintestapplyDto dto = new OutpintestapplyDto(); - dto.setHisRegistrationId(cardId); - dto.setSfzh(customer.getCusIdcard()); - dto.setSqysbm(ysbm); - dto.setMzksbm(dept); - dto.setSjrq(date); - dto.setCzybm(ysbm); - dto.setCzyksbm(dept); - dto.setSfjz("0"); - - List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>(); if (null != detailList && !detailList.isEmpty()) { LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>(); wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList())); @@ -928,102 +1331,120 @@ wq.in(TjProject::getDeptId,deptService.getJyDeptIds()); List<TjProject> projects = projectService.list(wq); if (null != projects && !projects.isEmpty()) { - for (TjProject project : projects) { - if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) { - if (null != project.getHisXmbm()) { - OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); - detailsDto.setMxfyxmbm(project.getHisXmbm()); - if (project.getSfzhfy().equals("Y")) { - detailsDto.setSfzhfy("1"); - } else { - detailsDto.setSfzhfy("0"); + List<TjProject> notNull = projects.stream().filter(i -> i.getSpecimenType() != null).collect(Collectors.toList()); + List<TjProject> isNull = projects.stream().filter(i -> i.getSpecimenType() == null).collect(Collectors.toList()); + Map<String, List<TjProject>> listMap = notNull.stream().collect(Collectors.groupingBy(TjProject::getSpecimenType)); + if (!isNull.isEmpty()) + listMap.put("",isNull); + for (Map.Entry<String, List<TjProject>> entry : listMap.entrySet()) { + OutpintestapplyDto dto = new OutpintestapplyDto(); + dto.setHisRegistrationId(cardId); + dto.setSfzh(customer.getCusIdcard()); + dto.setSqysbm(ysbm); + dto.setMzksbm(dept); + dto.setSjrq(date); + dto.setCzybm(ysbm); + dto.setCzyksbm(dept); + dto.setSfjz("0"); + List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>(); + List<TjProject> value = entry.getValue(); + for (TjProject project : value) { + LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(TjProject::getProParentId,project.getProId()); + List<TjProject> list = projectService.list(wrapper); + for (TjProject tjProject : list) { + if (null != project.getHisXmbm()) { + OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); + detailsDto.setMxfyxmbm(tjProject.getHisXmbm()); + if (tjProject.getSfzhfy().equals("Y")) { + detailsDto.setSfzhfy("1"); + } else { + detailsDto.setSfzhfy("0"); + } + detailsDto.setSl(tjProject.getSl()); + detailsDto.setProjg(tjProject.getProPrice()); + detailsDtos.add(detailsDto); } - detailsDto.setSl(project.getSl()); - detailsDto.setProjg(project.getProPrice()); - detailsDtos.add(detailsDto); - } - if(project.getProId()==1740177341251154377L){ - OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto(); - detilsDto.setYpbm("00006670"); - detilsDto.setPcbm("06"); - detilsDto.setSl("1"); - detilsDto.setDj("60"); - detilsDto.setDcjl("1"); - detilsDto.setPj("60"); - detilsDto.setJj("60"); - detilsDto.setJldw(""); - detilsDto.setTjbm(""); - detilsDto.setPs(""); - detilsDto.setPsbm(""); - detilsDto.setYyts(""); - detilsDto.setXtph(""); - detilsDto.setScph(""); - detilsDto.setYpxq(""); - detilsDto.setCdbm(""); - detilsDto.setKfdw(""); - detilsDto.setYfdw(""); - detilsDto.setYysm(""); - detilsDto.setFzbl("1"); - detilsDto.setZh("0"); - outpinmedicapplyDetilsDtos.add(detilsDto); + if(project.getProId()==1740177341251154377L){ + OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto(); + detilsDto.setYpbm("00006670"); + detilsDto.setPcbm("06"); + detilsDto.setSl("1"); + detilsDto.setDj("60"); + detilsDto.setDcjl("1"); + detilsDto.setPj("60"); + detilsDto.setJj("60"); + detilsDto.setJldw(""); + detilsDto.setTjbm(""); + detilsDto.setPs(""); + detilsDto.setPsbm(""); + detilsDto.setYyts(""); + detilsDto.setXtph(""); + detilsDto.setScph(""); + detilsDto.setYpxq(""); + detilsDto.setCdbm(""); + detilsDto.setKfdw(""); + detilsDto.setYfdw(""); + detilsDto.setYysm(""); + detilsDto.setFzbl("1"); + detilsDto.setZh("0"); + outpinmedicapplyDetilsDtos.add(detilsDto); + } } } - } - } - } - if (!detailsDtos.isEmpty()) { - dto.setDetails(detailsDtos); - AjaxResult ajaxResult1 = controller.Outpintestapply(dto); - String result5 = getAjaxResult(ajaxResult1); - JSONObject object3 = getJSONObject(result5); - String code3 = object3.getStr("ResultCode"); - if (code3.equals("0")) { - List<OutpintestapplyDetailsDto> details = dto.getDetails(); - for (OutpintestapplyDetailsDto detail : details) { - LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree(); - tree.setJxbz(jxbz); - tree.setCardId(dto.getHisRegistrationId()); - tree.setPationid(customer.getPationId()); - JSONObject resultData = object3.getJSONObject("ResultData"); - tree.setSqdh(resultData.getStr("jysqdh")); - tree.setFyhj(resultData.getStr("fyhj")); - String mxfyxmbm = detail.getMxfyxmbm(); - tree.setHisXmdm(mxfyxmbm); - tree.setType("妫�楠�"); - tree.setService("his"); - tree.setTjPrice(String.valueOf(detail.getProjg())); - LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>(); - if (detail.getSfzhfy().equals("1")) - wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm); - else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm); - List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1); - if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) { - String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm(); - LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>(); - wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm); - LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2); - LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>(); - wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm()); - LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3); - tree.setXmfl(ejjfxmzd.getYjkmdm()); + if (!detailsDtos.isEmpty()) { + dto.setDetails(detailsDtos); + AjaxResult ajaxResult1 = controller.Outpintestapply(dto); + String result5 = getAjaxResult(ajaxResult1); + JSONObject object3 = getJSONObject(result5); + String code3 = object3.getStr("ResultCode"); + if (code3.equals("0")) { + List<OutpintestapplyDetailsDto> details = dto.getDetails(); + for (OutpintestapplyDetailsDto detail : details) { + LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree(); + tree.setCardId(dto.getHisRegistrationId()); + tree.setPationid(customer.getPationId()); + JSONObject resultData = object3.getJSONObject("ResultData"); + tree.setSqdh(resultData.getStr("jysqdh")); + tree.setFyhj(resultData.getStr("fyhj")); + String mxfyxmbm = detail.getMxfyxmbm(); + tree.setHisXmdm(mxfyxmbm); + tree.setType("妫�楠�"); + tree.setService("his"); + tree.setTjPrice(String.valueOf(detail.getProjg())); + LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>(); + if (detail.getSfzhfy().equals("1")) + wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm); + else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm); + List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1); + if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) { + String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm(); + LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>(); + wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm); + LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2); + LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>(); + wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm()); + LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3); + tree.setXmfl(ejjfxmzd.getYjkmdm()); + } + tree.setCreateTime(DateUtil.date()); + ltkjJianchajianyanTreeService.save(tree); + } + // TODO 涓汉浠ュ強鍥綋 鏆備笉鍚戦噰鏍风鐞嗗啓鏁版嵁 + // HIS鍙戦�佹棤娉曞悎骞舵搷浣� 鏃犳硶鑾峰彇LIS鐨勬楠屽簭鍙� 鏉$爜鏃犳硶鎵撳嵃 +// TjOrder tjOrder = orderService.getOrderByCardId(cardId); +// if(null !=tjOrder){ +// List<TjOrderDetail> dengJi = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId()); +// tjSysAsyncService.addCaiYangDengJi(dengJi,!dengJi.isEmpty(),tjOrder, SecurityUtils.getLoginUser().getUser(), null); +// } + } } - tree.setCreateTime(DateUtil.date()); - ltkjJianchajianyanTreeService.save(tree); } } } //闂ㄨ瘖妫�鏌ョ敵璇� - OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto(); - outpinexamapplyDto.setHisRegistrationId(cardId); - outpinexamapplyDto.setSfzh(customer.getCusIdcard()); - outpinexamapplyDto.setSqysbm(ysbm); - outpinexamapplyDto.setMzksbm(dept); - outpinexamapplyDto.setCzybm(ysbm); - outpinexamapplyDto.setCzyksbm(dept); - outpinexamapplyDto.setSfjz("0"); // List<TbTransition> detailLists = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId); - List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>(); if (null != detailList && !detailList.isEmpty()) { LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>(); wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList())); @@ -1031,18 +1452,32 @@ List<TjProject> projects = projectService.list(wq); if (null != projects && !projects.isEmpty()) { for (TjProject project : projects) { + OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto(); + outpinexamapplyDto.setHisRegistrationId(cardId); + outpinexamapplyDto.setSfzh(customer.getCusIdcard()); + outpinexamapplyDto.setSqysbm(ysbm); + outpinexamapplyDto.setMzksbm(dept); + outpinexamapplyDto.setCzybm(ysbm); + outpinexamapplyDto.setCzyksbm(dept); + outpinexamapplyDto.setSfjz("0"); + List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>(); if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) { - if (null != project.getHisXmbm()) { - OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); - detailsDto.setMxfyxmbm(project.getHisXmbm()); - if (project.getSfzhfy().equals("Y")) { - detailsDto.setSfzhfy("1"); - } else { - detailsDto.setSfzhfy("0"); + LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(TjProject::getProParentId,project.getProId()); + List<TjProject> list = projectService.list(wrapper); + for (TjProject tjProject : list) { + if (null != tjProject.getHisXmbm()) { + OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); + detailsDto.setMxfyxmbm(tjProject.getHisXmbm()); + if (tjProject.getSfzhfy().equals("Y")) { + detailsDto.setSfzhfy("1"); + } else { + detailsDto.setSfzhfy("0"); + } + detailsDto.setSl(tjProject.getSl()); + detailsDto.setProjg(tjProject.getProPrice()); + detailsDtoss.add(detailsDto); } - detailsDto.setSl(project.getSl()); - detailsDto.setProjg(project.getProPrice()); - detailsDtoss.add(detailsDto); } if(project.getProId()==1740177341251154377L){ OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto(); @@ -1070,47 +1505,47 @@ outpinmedicapplyDetilsDtos.add(detilsDto); } } - } - } - } - if (!detailsDtoss.isEmpty()) { - outpinexamapplyDto.setDetails(detailsDtoss); - AjaxResult ajaxResult2 = controller.Outpinexamapply(outpinexamapplyDto); - String result6 = getAjaxResult(ajaxResult2); - JSONObject object5 = getJSONObject(result6); - String code4 = object5.getStr("ResultCode"); - if (code4.equals("0")) { - List<OutpintestapplyDetailsDto> details = outpinexamapplyDto.getDetails(); - for (OutpintestapplyDetailsDto detail : details) { - LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree(); - tree.setJxbz(jxbz); - tree.setCardId(outpinexamapplyDto.getHisRegistrationId()); - tree.setPationid(customer.getPationId()); - JSONObject resultData = object5.getJSONObject("ResultData"); - tree.setSqdh(resultData.getStr("jcsqdh")); - tree.setFyhj(resultData.getStr("fyhj")); - String mxfyxmbm = detail.getMxfyxmbm(); - tree.setHisXmdm(mxfyxmbm); - tree.setType("妫�鏌�"); - tree.setService("his"); - tree.setTjPrice(String.valueOf(detail.getProjg())); - LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>(); - if (detail.getSfzhfy().equals("1")) - wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm); - else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm); - List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1); - if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) { - String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm(); - LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>(); - wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm); - LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2); - LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>(); - wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm()); - LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3); - tree.setXmfl(ejjfxmzd.getYjkmdm()); + if (!detailsDtoss.isEmpty()) { + outpinexamapplyDto.setDetails(detailsDtoss); + AjaxResult ajaxResult2 = controller.Outpinexamapply(outpinexamapplyDto); + String result6 = getAjaxResult(ajaxResult2); + JSONObject object5 = getJSONObject(result6); + String code4 = object5.getStr("ResultCode"); + if (code4.equals("0")) { + List<OutpintestapplyDetailsDto> details = outpinexamapplyDto.getDetails(); + for (OutpintestapplyDetailsDto detail : details) { + LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree(); + tree.setJxbz(jxbz); + tree.setCardId(outpinexamapplyDto.getHisRegistrationId()); + tree.setPationid(customer.getPationId()); + JSONObject resultData = object5.getJSONObject("ResultData"); + tree.setSqdh(resultData.getStr("jcsqdh")); + tree.setFyhj(resultData.getStr("fyhj")); + String mxfyxmbm = detail.getMxfyxmbm(); + tree.setHisXmdm(mxfyxmbm); + tree.setType("妫�鏌�"); + tree.setService("his"); + tree.setTjPrice(String.valueOf(detail.getProjg())); + LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>(); + if (detail.getSfzhfy().equals("1")) + wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm); + else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm); + List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1); + if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) { + String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm(); + LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>(); + wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm); + LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2); + LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>(); + wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm()); + LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3); + tree.setXmfl(ejjfxmzd.getYjkmdm()); + } + tree.setCreateTime(DateUtil.date()); + ltkjJianchajianyanTreeService.save(tree); + } + } } - tree.setCreateTime(DateUtil.date()); - ltkjJianchajianyanTreeService.save(tree); } } } -- Gitblit v1.8.0