From 8e4922026e05dceffa44d913a234bbc489f1be6c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 23 七月 2025 17:16:14 +0800
Subject: [PATCH] zjh20250723
---
ltkj-admin/src/test/java/zjhTest.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 22 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 7
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 6
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 424 +++-------------------------------------------------
ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml | 1
6 files changed, 53 insertions(+), 409 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 c56b4a0..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
@@ -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("鑽搧鐢宠澶辫触!");
}
});
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 081d0c2..b535ab6 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1420,15 +1420,19 @@
// addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
log.info("璋冪敤his寮�鍚� 杩涘叆涓嶆敹璐规柟娉� 璇ユ柟娉曟墽琛屽畬姣�");
} else {
- log.info("璋冪敤his寮�鍚� 杩涘叆鏀惰垂鏂规硶 璇ヤ綋妫�浜哄憳鏀惰垂:" + tjOrder.getTjNumber());
- newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
- List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
- addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
- String isUseMx = configService.selectConfigByKey("jcxhis_is_use_mx");
- if (isUseMx.equalsIgnoreCase("Y"))
- hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
- else
- hisApiMethod.tijianshenqingJinchuanNew(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
+ try {
+ log.info("璋冪敤his寮�鍚� 杩涘叆鏀惰垂鏂规硶 璇ヤ綋妫�浜哄憳鏀惰垂:" + tjOrder.getTjNumber());
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+ String isUseMx = configService.selectConfigByKey("jcxhis_is_use_mx");
+ if (isUseMx.equalsIgnoreCase("Y"))
+ hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
+ else
+ hisApiMethod.tijianshenqingJinchuanNew(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
+ } catch (Exception e) {
+ throw new IllegalStateException("鐢宠鍗曞彂閫佸け璐�!" + result.get("msg").toString());
+ }
}
} catch (Exception e) {
log.error("鍙戠敓閿欒 ->{}" + String.valueOf(e), e.getMessage());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
index 6bee059..06b7df1 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -477,8 +477,11 @@
}
// bigDecimal.add(tjProject.getProPrice());
TjProject byId = tjProjectService.getById(proParentId);
- byId.setProPrice(bigDecimal);
- tjProjectService.updateById(byId);
+ if(null != byId){
+ byId.setProPrice(bigDecimal);
+ tjProjectService.updateById(byId);
+ }
+
}
}
return AjaxResult.success();
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index 8c038cb..5f23892 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -699,9 +699,9 @@
if (tjReservation.getIsExpire() == 1) {
return AjaxResult.error("棰勭害宸茶繃鏈熶笉鍙慨鏀�");
}
- tjReservation.setIdCard(reservation.getIdCard());
- tjReservation.setPhoe(reservation.getPhoe());
- tjReservation.setName(reservation.getName());
+// tjReservation.setIdCard(reservation.getIdCard());
+// tjReservation.setPhoe(reservation.getPhoe());
+// tjReservation.setName(reservation.getName());
if (tjReservationService.updateById(tjReservation)) {
taskService.removeTask(new TjReservationTask(tjReservation.getId()));
taskService.addTask(new TjReservationTask(tjReservation.getId(),
diff --git a/ltkj-admin/src/test/java/zjhTest.java b/ltkj-admin/src/test/java/zjhTest.java
index 63f8201..4294610 100644
--- a/ltkj-admin/src/test/java/zjhTest.java
+++ b/ltkj-admin/src/test/java/zjhTest.java
@@ -75,7 +75,7 @@
public static void main(String[] args) throws Exception {
- String s = "62272219650528411X";
+ String s = "62272219610528411X";
System.out.println(isValidIdCard(s) ? "鍚堟硶" : "闈炴硶");
}
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
index f88f78e..9a6803b 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
@@ -57,6 +57,7 @@
pro_ids,
pac_id,
company,
+ company_id,
job_no,
department,
department_id,
--
Gitblit v1.8.0