From 15b3f13f55f4f4f0abb1960b72637bb17b4d35b2 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 25 七月 2025 18:11:11 +0800
Subject: [PATCH] zjh20250725-3
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 553 ++++++++++++++----------------------------------------
1 files changed, 147 insertions(+), 406 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
index 53d0542..06a9e68 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -133,7 +133,7 @@
String code1 = object1.getStr("ResultCode");
if (code1.equals("0")) {
JSONArray resultDatas = object1.getJSONArray("ResultData");
- if (null != resultDatas && resultDatas.size() > 0) {
+ if (null != resultDatas && !resultDatas.isEmpty()) {
Map<String, Object> resultDatasss = (Map<String, Object>) resultDatas.get(0);
String hisRegistrationId = resultDatasss.get("his_registration_id").toString();
jzh=hisRegistrationId;
@@ -204,10 +204,14 @@
private static List<String> mapJinchuan=null;
public AjaxResult tijianshenqingJinchuanNew(TjCustomer customer, String date,String cardId)
{
- mapJinchuan=new ArrayList<>();
- tijianshenqingOldJinchuan( customer, date, cardId);
+ try {
+ mapJinchuan=new ArrayList<>();
+ tijianshenqingOldJinchuan( customer, date, cardId);
- tijianshenqingJinchuan( customer, date, cardId);
+ tijianshenqingJinchuan( customer, date, cardId);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
return AjaxResult.success();
}
public AjaxResult tijianshenqingJinchuan(TjCustomer customer, String date,String cardId) {
@@ -348,6 +352,8 @@
// List<TjOrderDetail> dengJi = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
// tjSysAsyncService.addCaiYangDengJi(dengJi,!dengJi.isEmpty(),tjOrder, SecurityUtils.getLoginUser().getUser(), null);
// }
+ }else {
+ throw new RuntimeException("妫�楠岀敵璇峰け璐�!");
}
}
}
@@ -463,6 +469,8 @@
tree.setCreateTime(DateUtil.date());
ltkjJianchajianyanTreeService.save(tree);
}
+ }else {
+ throw new RuntimeException("妫�鏌ョ敵璇峰け璐�!");
}
}
}
@@ -580,6 +588,8 @@
tree.setCreateTime(DateUtil.date());
ltkjJianchajianyanTreeService.save(tree);
}
+ }else {
+ throw new RuntimeException("澶勭疆鐢宠澶辫触!");
}
}
}
@@ -707,6 +717,8 @@
cf.setCreateTime(new Date());
cfService.save(cf);
}
+ }else {
+ throw new RuntimeException("鑽搧鐢宠澶辫触!");
}
});
}
@@ -842,6 +854,8 @@
// List<TjOrderDetail> dengJi = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
// tjSysAsyncService.addCaiYangDengJi(dengJi,!dengJi.isEmpty(),tjOrder, SecurityUtils.getLoginUser().getUser(), null);
// }
+ }else {
+ throw new RuntimeException("妫�楠岀敵璇峰け璐�!");
}
}
@@ -951,6 +965,8 @@
tree.setCreateTime(DateUtil.date());
ltkjJianchajianyanTreeService.save(tree);
}
+ }else {
+ throw new RuntimeException("妫�鏌ョ敵璇峰け璐�!");
}
}
@@ -1060,6 +1076,8 @@
tree.setCreateTime(DateUtil.date());
ltkjJianchajianyanTreeService.save(tree);
}
+ }else {
+ throw new RuntimeException("澶勭疆鐢宠澶辫触!");
}
}
/*
@@ -1113,397 +1131,7 @@
return AjaxResult.success();
}
- /**/
-// public AjaxResult tijianshenqing(TjCustomer customer, String date,String cardId) {
-// String dept = configService.selectConfigByKey("request_default_dept");
-// String ysbm = configService.selectConfigByKey("request_default_ysbm");
-// String ysmc = configService.selectConfigByKey("request_default_ysmc");
-//
-// List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
-//
-// //妫�楠岀敵璇�
-// List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =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()) {
-// 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 (StrUtil.isNotBlank(tjProject.getHisXmbm()) && tjProject.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
-// 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);
-// }
-// }
-// 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.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);
-//// }
-// }
-// }
-// }
-// }
-// }
-//
-// //闂ㄨ瘖妫�鏌ョ敵璇�
-// 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) {
-// 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) {
-// LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
-// wrapper.eq(TjProject::getProParentId,project.getProId());
-// List<TjProject> list = projectService.list(wrapper);
-// for (TjProject tjProject : list) {
-// if (StrUtil.isNotBlank(tjProject.getHisXmbm()) && tjProject.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
-// 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);
-// }
-// }
-// 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.size() > 0) {
-// 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.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);
-// if (null != detailList && detailList.size() > 0) {
-// 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.size() > 0) {
-// for (TjProject project : projects) {
-// List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>();
-// if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
-// LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
-// wrapper.eq(TjProject::getProParentId,project.getProId());
-// List<TjProject> list = projectService.list(wrapper);
-// for (TjProject tjProject : list) {
-// if (StrUtil.isNotBlank(tjProject.getHisXmbm()) && tjProject.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
-// 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());
-// 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.size() > 0) {
-// 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.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.size()>0){
-// 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.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 tijianshenqing(TjCustomer customer, String date,String cardId) {
String dept = configService.selectConfigByKey("request_default_dept");
@@ -1634,6 +1262,8 @@
// List<TjOrderDetail> dengJi = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
// tjSysAsyncService.addCaiYangDengJi(dengJi,!dengJi.isEmpty(),tjOrder, SecurityUtils.getLoginUser().getUser(), null);
// }
+ }else {
+ throw new RuntimeException("妫�楠岀敵璇峰け璐�");
}
}
}
@@ -1743,6 +1373,8 @@
tree.setCreateTime(DateUtil.date());
ltkjJianchajianyanTreeService.save(tree);
}
+ }else {
+ throw new RuntimeException("妫�鏌ョ敵璇峰け璐�!");
}
}
}
@@ -1856,6 +1488,8 @@
tree.setCreateTime(DateUtil.date());
ltkjJianchajianyanTreeService.save(tree);
}
+ }else {
+ throw new RuntimeException("澶勭疆鐢宠澶辫触!");
}
}
}
@@ -1982,6 +1616,8 @@
cf.setCreateTime(new Date());
cfService.save(cf);
}
+ }else {
+ throw new RuntimeException("鑽搧鐢宠澶辫触!");
}
});
}
@@ -2530,11 +2166,11 @@
String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
String isRequestLisAllzx = configService.selectConfigByKey("jcx_is_requestLisAllzx");
if (mergeRequest.equals("Y")){
+ LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
+ List<TjSampling> list = tjSamplingService.list(wrapper);
if (isRequestLisAllzx != null && isRequestLisAllzx.equals("Y")){
log.info("杩涘叆鍥綋鏍规嵁灏忛」鏍囨湰鍚堝苟鍙戦�佹柟娉�");
- LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
- List<TjSampling> list = tjSamplingService.list(wrapper);
if(null !=list && !list.isEmpty()){
List<String> strings = list.stream().map(TjSampling::getProId).collect(Collectors.toList());
LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
@@ -2562,9 +2198,9 @@
}else{
try {
- LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
- List<TjSampling> list = tjSamplingService.list(wrapper);
+// LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
+// 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));
@@ -2917,7 +2553,7 @@
List<String> jysqdh = orderService.getHuoQuJysqdh(order.getCardId());
//2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇�
- if (null != jcsqdh && jcsqdh.size()>0) {
+ if (null != jcsqdh && !jcsqdh.isEmpty()) {
for (String s : jcsqdh) {
AjaxResult result = controller.Outpindelexamapply(order.getCardId(), ysbm, s);
String result1 = getAjaxResult(result);
@@ -3050,7 +2686,7 @@
List<String> jysqdh = orderService.getHuoQuBlJysqdh(order.getCardId(),bldh);
// }else {
// 2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇�
- if (null != jcsqdh && jcsqdh.size()>0) {
+ if (null != jcsqdh && !jcsqdh.isEmpty()) {
for (String s : jcsqdh) {
AjaxResult result = controller.Outpindelexamapply(order.getCardId(), ysbm, s);
String result1 = getAjaxResult(result);
@@ -3065,7 +2701,7 @@
}
//2.1.6.3 浣滃簾闂ㄨ瘖妫�楠岀敵璇�
- if (null != jysqdh && jysqdh.size()>0) {
+ if (null != jysqdh && !jysqdh.isEmpty()) {
for (String s : jysqdh) {
ajaxResult = controller.Outpindeltestapply(order.getCardId(), ysbm, s);
result2 = getAjaxResult(ajaxResult);
@@ -3080,7 +2716,7 @@
}
//2.1.6.9 浣滃簾闂ㄨ瘖娌荤枟澶勭疆鐢宠
- if (null != zlsqdh && zlsqdh.size()>0) {
+ if (null != zlsqdh && !zlsqdh.isEmpty()) {
for (String s : zlsqdh) {
ajaxResult = controller.Outpintdelreatapply(order.getCardId(), ysbm, s);
result2 = getAjaxResult(ajaxResult);
@@ -3095,7 +2731,7 @@
}
//浣滃簾鑽搧鐢宠
- if(null !=cfhs && cfhs.size()>0){
+ if(null !=cfhs && !cfhs.isEmpty()){
for (String cfh : cfhs) {
AjaxResult result = controller.Outpindelmedicapply(order.getCardId(), ysbm, cfh);
String result1 = getAjaxResult(result);
@@ -3204,6 +2840,111 @@
return true;
}
+
+ public void ZfBlHisApiMethod(String tjh,String bldh) {
+
+ TjOrder order = orderService.getOrderByTjNum(tjh);
+ if(null !=order){
+ String ysbm = configService.selectConfigByKey("request_default_ysbm");
+
+ List<String> zlsqdh = orderService.getHuoQuBlZlsqdh(order.getCardId(),bldh);
+ List<String> jcsqdh = orderService.getHuoQuBlJcsqdh(order.getCardId(),bldh);
+ List<String> jysqdh = orderService.getHuoQuBlJysqdh(order.getCardId(),bldh);
+ List<String> cfhs = cfService.getCfBlhs(order.getCardId(),bldh);
+
+ AjaxResult ajaxResult = null;
+ String result2 = null;
+ JSONObject object1 = null;
+ String code1 = null;
+ log.info("鏌ヨ鍓�");
+ TjCustomer customer1 = customerService.getById(order.getUserId());
+ log.info("customer1 ->{}",customer1);
+ List<String> bljcsqdhByPacs = orderService.getBljcsqdhByPacs(order.getCardId(), bldh);
+ log.info("bljcsqdhByPacs ->{}",bljcsqdhByPacs);
+ // 浣滃簾妫�鏌ョ敵璇�
+ 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();
+ JSONObject object = JSONUtil.parseObj(result);
+ String code = object.getStr("ResultCode");
+ if(code.equals("1")){
+ orderService.delHuoQuBlJcsqdh(order.getCardId(),bldh);
+ }
+ }
+ }
+ List<String> bljysqdhByLis = orderService.getBljysqdhByLis(order.getCardId(), bldh);
+ log.info("bljysqdhByLis ->{}",bljysqdhByLis);
+ // 浣滃簾妫�楠岀敵璇�
+ if (bljysqdhByLis != null && !bljysqdhByLis.isEmpty()){
+ for (String sqdh : bljysqdhByLis) {
+ AjaxResult cancelLisAjaxResult = lisApiMethod.cancel(sqdh, order.getCardId(), customer1.getCusName());
+ log.info("浣滃簾妫�楠� lis杩斿洖 ->{}",JSONUtil.toJsonStr(cancelLisAjaxResult));
+ String result = cancelLisAjaxResult.get("data").toString();
+ JSONObject object = JSONUtil.parseObj(result);
+ String code= object.getStr("ResultCode");
+ if(code.equals("1")){
+ orderService.delHuoQuBlJysqdh(order.getCardId(),bldh);
+ }
+ }
+ }
+
+
+
+ if (null != jcsqdh && !jcsqdh.isEmpty()) {
+ for (String s : jcsqdh) {
+ AjaxResult result = controller.Outpindelexamapply(order.getCardId(), ysbm, s);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if (code.equals("0")) {
+ orderService.delHuoQuBlJcsqdh(order.getCardId(),bldh);
+ }
+ }
+ }
+
+ //2.1.6.3 浣滃簾闂ㄨ瘖妫�楠岀敵璇�
+ if (null != jysqdh && !jysqdh.isEmpty()) {
+ for (String s : jysqdh) {
+ ajaxResult = controller.Outpindeltestapply(order.getCardId(), ysbm, s);
+ result2 = getAjaxResult(ajaxResult);
+ object1 = getJSONObject(result2);
+ code1 = object1.getStr("ResultCode");
+ if (code1.equals("0")) {
+ orderService.delHuoQuBlJysqdh(order.getCardId(),bldh);
+ }
+ }
+ }
+
+ //2.1.6.9 浣滃簾闂ㄨ瘖娌荤枟澶勭疆鐢宠
+ if (null != zlsqdh && !zlsqdh.isEmpty()) {
+ for (String s : zlsqdh) {
+ ajaxResult = controller.Outpintdelreatapply(order.getCardId(), ysbm, s);
+ result2 = getAjaxResult(ajaxResult);
+ object1 = getJSONObject(result2);
+ code1 = object1.getStr("ResultCode");
+ if (code1.equals("0")) {
+ orderService.delHuoQuZlsqdh(order.getCardId(),bldh);
+ }
+ }
+ }
+
+ //浣滃簾鑽搧鐢宠
+ if(null !=cfhs && !cfhs.isEmpty()){
+ for (String cfh : cfhs) {
+ AjaxResult result = controller.Outpindelmedicapply(order.getCardId(), ysbm, cfh);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if(null !=code && code.equals("0")){
+ cfService.delCfByCardId(cfh);
+ }
+ }
+ }
+ }
+ }
+
//鑾峰彇闂ㄨ瘖缁撶畻璁板綍
@Transactional
public void getHisMzJsJl(TjOrder order) {
--
Gitblit v1.8.0