From 6c9e1bdb612fead54a204561c1d5c796ab5bc830 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期五, 21 六月 2024 15:46:42 +0800
Subject: [PATCH] zjh 本地 2024/06/21 --1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java | 6
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 153 ++++++++++++++++++---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 121 +++++++++++++----
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 63 +++++----
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java | 19 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java | 6
6 files changed, 268 insertions(+), 100 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 748adfe..32e718a 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
@@ -439,24 +439,27 @@
Date dates = new Date();
final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
- String jcsqdh = orderService.getHuoQuJcsqdh(order.getCardId());
+ List<String> jcsqdh = orderService.getHuoQuJcsqdh(order.getCardId());
- String jysqdh = orderService.getHuoQuJysqdh(order.getCardId());
+ List<String> jysqdh = orderService.getHuoQuJysqdh(order.getCardId());
- String zlsqdh = orderService.getHuoQuZlsqdh(order.getCardId());
+ List<String> zlsqdh = orderService.getHuoQuZlsqdh(order.getCardId());
//2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇�
- if (null != jcsqdh) {
- AjaxResult result = controller.Outpindelexamapply(order.getCardId(), "00029", jcsqdh);
- String result1 = getAjaxResult(result);
- JSONObject object = getJSONObject(result1);
- String code = object.getStr("ResultCode");
- if (code.equals("0")) {
- orderService.delHuoQuJcsqdh(order.getCardId());
- } else {
- return false;
+ if (null != jcsqdh && jcsqdh.size()>0) {
+ for (String s : jcsqdh) {
+ AjaxResult result = controller.Outpindelexamapply(order.getCardId(), "00029", s);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if (code.equals("0")) {
+ orderService.delHuoQuJcsqdh(order.getCardId());
+ } else {
+ return false;
+ }
}
+
}
@@ -467,26 +470,30 @@
JSONObject object1 = null;
String code1 = null;
- if (null != jysqdh) {
- ajaxResult = controller.Outpindeltestapply(order.getCardId(), "00029", jysqdh);
- result2 = getAjaxResult(ajaxResult);
- object1 = getJSONObject(result2);
- code1 = object1.getStr("ResultCode");
- if (code1.equals("0")) {
- orderService.delHuoQuJysqdh(order.getCardId());
- } else {
- return false;
+ if (null != jysqdh && jysqdh.size()>0) {
+ for (String s : jysqdh) {
+ 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 {
+ return false;
+ }
}
}
//2.1.6.9 浣滃簾闂ㄨ瘖娌荤枟澶勭疆鐢宠
- if (null != zlsqdh) {
- ajaxResult = controller.Outpintdelreatapply(order.getCardId(), "00029", zlsqdh);
- result2 = getAjaxResult(ajaxResult);
- object1 = getJSONObject(result2);
- code1 = object1.getStr("ResultCode");
- if (!code1.equals("0")) {
- return false;
+ if (null != zlsqdh && zlsqdh.size()>0) {
+ for (String s : zlsqdh) {
+ ajaxResult = controller.Outpintdelreatapply(order.getCardId(), "00029", s);
+ result2 = getAjaxResult(ajaxResult);
+ object1 = getJSONObject(result2);
+ code1 = object1.getStr("ResultCode");
+ if (!code1.equals("0")) {
+ return false;
+ }
}
}
//2.1.3 闂ㄨ瘖鍖荤敓鍙栨秷鎺ヨ瘖
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 3064a33..64e1892 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
@@ -114,6 +114,14 @@
private HisApiGetMethodService hisApiGetMethodService;
@Resource
private ISysConfigService configService;
+ @Autowired
+ private LtkjJfzhglmxjfxmzdService ltkjJfzhglmxjfxmzdService;
+ @Autowired
+ private LtkjMxjfxmzdService ltkjMxjfxmzdService;
+ @Autowired
+ private LtkjEjjfxmzdService ltkjEjjfxmzdService;
+ @Autowired
+ private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;
@Override
public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
@@ -510,7 +518,7 @@
for (String tjProId : tjProIds) {
LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
- TjProject project = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
+ TjProject project = projectService.getById(Long.valueOf(tjProId));
if (null != project && project.getProParentId() == 0) {
TjOrderRemark tjOrderRemark = new TjOrderRemark();
tjOrderRemark.setProId(Long.valueOf(tjProId));
@@ -617,7 +625,7 @@
wqq.in(TbTransition::getProId, Arrays.asList(tjProIds));
TjProject projects = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
if (null != projects) {
- TjProject projectss = projectService.selectTjProjectByProId(projects.getProParentId());
+ TjProject projectss = projectService.getById(projects.getProParentId());
if (null != projectss && projectss.getProParentId()==0L) {
projectList.add(projectss);
}
@@ -800,13 +808,45 @@
JSONObject object3 = getJSONObject(result5);
String code3 = object3.getStr("ResultCode");
if (code3.equals("0")) {
- Map<String, Object> datas = object3.getJSONObject("ResultData");
- datas.put("cardId", order.getCardId());
- JSONObject object4 = JSONUtil.parseObj(datas);
- LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
- lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpintestapply");
- HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
- hisApiGetMethodService.save(object4, "Outpintestapply", hisApiConfig,JSONUtil.toJsonStr(BeanUtil.beanToMap(dto)));
+ List<OutpintestapplyDetailsDto> details = dto.getDetails();
+ for (OutpintestapplyDetailsDto detail : details) {
+ LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
+ tree.setCardId(dto.getHisRegistrationId());
+ LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
+ wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
+ TjCustomer tjCustomer = tjCustomerService.getOne(wrapper4);
+ tree.setPationid(tjCustomer.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("妫�楠�");
+ LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
+ List<TjProject> list = projectService.list(wrapper);
+ String tj_price = "";
+ for (TjProject project : list) {
+ tj_price += project.getProPrice() + "銆�";
+ }
+ tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
+ 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());
+ }
+ ltkjJianchajianyanTreeService.save(tree);
+ }
}
}
@@ -827,14 +867,45 @@
JSONObject object5 = getJSONObject(result6);
String code4 = object5.getStr("ResultCode");
if (code4.equals("0")) {
- Map<String, Object> map = object5.getJSONObject("ResultData");
- map.put("cardId", order.getCardId());
- JSONObject jsonObject = JSONUtil.parseObj(map);
- LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
- lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpinexamapply");
- HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
- hisApiGetMethodService.save(jsonObject, "Outpinexamapply", hisApiConfig,JSONUtil.toJsonStr(BeanUtil.beanToMap(outpinexamapplyDto)));
-
+ List<OutpintestapplyDetailsDto> details = outpinexamapplyDto.getDetails();
+ for (OutpintestapplyDetailsDto detail : details) {
+ LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
+ tree.setCardId(outpinexamapplyDto.getHisRegistrationId());
+ LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
+ wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
+ TjCustomer tjCustomer = tjCustomerService.getOne(wrapper4);
+ tree.setPationid(tjCustomer.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("妫�鏌�");
+ LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
+ List<TjProject> list = projectService.list(wrapper);
+ String tj_price = "";
+ for (TjProject project : list) {
+ tj_price += project.getProPrice() + "銆�";
+ }
+ tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
+ 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());
+ }
+ ltkjJianchajianyanTreeService.save(tree);
+ }
}
}
@@ -856,17 +927,47 @@
JSONObject mzylyzsq3 = getJSONObject(mzylyzsq2);
String code5 = mzylyzsq3.getStr("ResultCode");
if (code5.equals("0")) {
- Map<String, Object> map = mzylyzsq3.getJSONObject("ResultData");
- map.put("cardId", order.getCardId());
- JSONObject jsonObject = JSONUtil.parseObj(map);
- LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
- lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpintreatapply");
- HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
- hisApiGetMethodService.save(jsonObject, "Outpintreatapply", hisApiConfig,JSONUtil.toJsonStr(BeanUtil.beanToMap(dao)));
+ List<OutpintestapplyDetailsDto> details1 = dao.getDetails();
+ for (OutpintestapplyDetailsDto detail : details1) {
+ LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
+ tree.setCardId(dao.getHisRegistrationId());
+ LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
+ wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
+ TjCustomer tjCustomer = tjCustomerService.getOne(wrapper4);
+ tree.setPationid(tjCustomer.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("澶勭疆");
+ LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
+ List<TjProject> list = projectService.list(wrapper);
+ String tj_price = "";
+ for (TjProject project : list) {
+ tj_price += project.getProPrice() + "銆�";
+ }
+ tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
+ 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());
+ }
+ ltkjJianchajianyanTreeService.save(tree);
+ }
}
}
-
-
}
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 eacdf66..683b6a5 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
@@ -856,7 +856,7 @@
// }
TjOrder order = tjOrderService.getOne(wqq);
if (null != order) {
- transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(),tjCustomer.getCardId());
+ transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjCustomer.getCardId());
return AjaxResult.error("涓嶅彲閲嶅鐧昏");
}
@@ -1034,18 +1034,18 @@
/*璋冪敤his鎺ュ彛*/
String config = configService.selectConfigByKey("sfkqdyhis");
- if(null !=config && config.equals("Y")){
+ if (null != config && config.equals("Y")) {
AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder.getOrderId());
- if(!result.get("code").toString().equals("200")){
+ if (!result.get("code").toString().equals("200")) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error("鎸傚彿澶辫触!"+result.get("msg").toString());
+ return AjaxResult.error("鎸傚彿澶辫触!" + result.get("msg").toString());
}
- }else {
- tjCustomer.setCardId(tjOrder.getTjNumber());
- tjCustomerService.updateById(tjCustomer);
- transitionService.updateCardIdByTjNumAndIdCard(tjCustomer.getCusIdcard(),tjOrder.getTjNumber(),tjOrder.getTjNumber());
- tjOrder.setCardId(tjOrder.getTjNumber());
- tjOrderService.updateById(tjOrder);
+ } else {
+ tjCustomer.setCardId(tjOrder.getTjNumber());
+ tjCustomerService.updateById(tjCustomer);
+ transitionService.updateCardIdByTjNumAndIdCard(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), tjOrder.getTjNumber());
+ tjOrder.setCardId(tjOrder.getTjNumber());
+ tjOrderService.updateById(tjOrder);
}
return AjaxResult.success(tjNumber);
}
@@ -1056,7 +1056,7 @@
@PostMapping("/addPlOrderAndDetail")
@ApiOperation(value = "浣撴鎵归噺绛惧埌鐧昏鎺ュ彛")
@Transactional //(鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�)
- public AjaxResult addPlOrderAndDetail(@RequestBody QianDaoDto daoDto,HttpServletResponse response) {
+ public AjaxResult addPlOrderAndDetail(@RequestBody QianDaoDto daoDto, HttpServletResponse response) {
SysUser sysUser = UserHoder.getLoginUser().getUser();
List<String> cusIds = daoDto.getCusIds();
ArrayList<String> tjNumbers = new ArrayList<>();
@@ -1441,7 +1441,7 @@
tjCustomer.setCardId("0");
tjCustomerService.updateById(tjCustomer);
- return AjaxResult.success().put("tjNumber",tjNumber);
+ return AjaxResult.success().put("tjNumber", tjNumber);
}
}
return AjaxResult.error();
@@ -1540,7 +1540,7 @@
if (null != ppList && ppList.size() > 0) {
//寮傛淇濆瓨鏁版嵁搴�
// asyncService.addRedisTransitionPac(cusId, pacId, ppList);
- asyncService.saveRedisTransitionByPacId(cusId,cardId, pacId, null);
+ asyncService.saveRedisTransitionByPacId(cusId, cardId, pacId, null);
for (TjPackageProject tjPackageProject : ppList) {
TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId()));
if (null != project) {
@@ -1585,7 +1585,7 @@
//鍗曢」
if (null != proIds && proIds.size() > 0) {
//寮傛淇濆瓨鏁版嵁搴撹〃
- asyncService.saveRedisTransitionByPacId(cusId,cardId,null, proIds);
+ asyncService.saveRedisTransitionByPacId(cusId, cardId, null, proIds);
for (Long proId : proIds) {
List<TbTransition> transitions = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
if (null != transitions && transitions.size() > 0) {
@@ -1918,7 +1918,7 @@
for (Map.Entry<Long, List<TbTransition>> entry : collect.entrySet()) {
Map<String, Object> map = new HashMap<>();
Long pacId = entry.getValue().get(0).getPacId();
- map.put("proPrantId",entry.getKey().toString());
+ map.put("proPrantId", entry.getKey().toString());
if (null != pacId) {
TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
map.put("pacName", aPackage.getPacName());
@@ -1954,7 +1954,7 @@
}
- private List<Map<String, Object>> getMap(String cusId, String cardId,List<TbTransition> transitionList) {
+ private List<Map<String, Object>> getMap(String cusId, String cardId, List<TbTransition> transitionList) {
// List<TbTransition> transitionList = null;
// if (redisCache.hasKey(cardId + cusId)) {
@@ -1968,7 +1968,7 @@
for (Map.Entry<Long, List<TbTransition>> entry : collect.entrySet()) {
Map<String, Object> map = new HashMap<>();
Long pacId = entry.getValue().get(0).getPacId();
- map.put("proPrantId",entry.getKey().toString());
+ map.put("proPrantId", entry.getKey().toString());
if (null != pacId) {
TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
map.put("pacName", aPackage.getPacName());
@@ -2395,39 +2395,41 @@
remarkService.deletedOrderRemarkByTjNum(tjNum);
tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
transitionService.deletedTbTransitionByTjNum(tjNum);
- transitionService.updateTbTransitionByTjNum(tjNum);
+
TjCustomer customer = tjCustomerService.getById(order.getUserId());
- if(null !=customer){
+ if (null != customer) {
customer.setCardId("0");
tjCustomerService.updateById(customer);
}
String configByKey = configService.selectConfigByKey("sfkqdyhis");
- if (configByKey.equals("Y")){
+ if (configByKey.equals("Y")) {
HashMap<String, Object> map = new HashMap<>();
- map.put("cardtype","4");
- map.put("input",order.getCardId());
+ map.put("cardtype", "4");
+ map.put("input", order.getCardId());
LocalDate currentDate = LocalDate.now();
LocalDateTime startOfDay = currentDate.atStartOfDay();
LocalDateTime nineteenOClock = currentDate.atTime(LocalTime.of(19, 0));
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
String ksrq = startOfDay.format(formatter);
String jsrq = nineteenOClock.format(formatter);
- map.put("ksrq",ksrq);
- map.put("jsrq",jsrq);
+ map.put("ksrq", ksrq);
+ map.put("jsrq", jsrq);
AjaxResult result = hisApiGetMethodService.getHISDataNew("Getoutpatientcostinfo", map);
- if (Integer.parseInt(String.valueOf(result.get("code"))) == 200){
+ if (Integer.parseInt(String.valueOf(result.get("code"))) == 200) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error("鎾ら攢澶辫触,闂ㄨ瘖鎮ｈ�呰垂鐢ㄦ竻鍗曚俊鎭笉涓虹┖");
- }else {
+ } else {
boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
if (zfHisApiMethods) {
return AjaxResult.success("鎾ら攢鎴愬姛", map);
- }else {
+ } else {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
}
}
}
+
+// transitionService.updateTbTransitionByTjNum(tjNum);
return AjaxResult.success("鎾ら攢鎴愬姛!!!");
}
return AjaxResult.success("绛惧埌璁板綍涓嶅瓨鍦�!");
@@ -2508,7 +2510,7 @@
@ApiOperation(value = "鎵归噺鐢熸垚PDF")
public AjaxResult makeTjPDF(@RequestBody List<String> reservations) {
QueryWrapper<TjOrder> queryWrapper = new QueryWrapper<>();
- queryWrapper.in("reservation_id",reservations);
+ queryWrapper.in("reservation_id", reservations);
List<TjOrder> tjNumbers = tjOrderService.list(queryWrapper);
Map<String, Object> map = null;
try {
@@ -2551,12 +2553,71 @@
@ApiOperation(value = "鏍规嵁瀹㈡埛韬唤璇佸彿鍜岄」鐩埗椤筰d鍒犻櫎涓存椂琛ㄦ暟鎹�")
@Transactional
public AjaxResult delTbBycusCardIdAndProId(@RequestParam @ApiParam(value = "韬唤璇佸彿") String cusCardId,
- @RequestParam @ApiParam(value = "鐖堕」id") String proId) {
+ @RequestParam @ApiParam(value = "鐖堕」id") String proId) {
- if (transitionService.delTbBycusCardIdAndProId(cusCardId,proId)) {
+ if (transitionService.delTbBycusCardIdAndProId(cusCardId, proId)) {
return AjaxResult.success();
}
return AjaxResult.error("璁板綍涓嶅瓨鍦�!");
}
+
+
+ @GetMapping("/revokeTjOrderByTjCardId")
+ @ApiOperation(value = "鏍规嵁灏辫瘖鍙锋挙閿�鐢宠璁板綍")
+ @Transactional
+ public AjaxResult revokeTjOrderByTjCardId(@RequestParam @ApiParam(value = "灏辫瘖鍙�") String cardId) {
+
+ TjOrder order = new TjOrder();
+ order.setCardId(cardId);
+ String configByKey = configService.selectConfigByKey("sfkqdyhis");
+ if (configByKey.equals("Y")) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("cardtype", "4");
+ map.put("input", order.getCardId());
+ LocalDate currentDate = LocalDate.now();
+ LocalDateTime startOfDay = currentDate.atStartOfDay();
+ LocalDateTime nineteenOClock = currentDate.atTime(LocalTime.of(19, 0));
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ String ksrq = startOfDay.format(formatter);
+ String jsrq = nineteenOClock.format(formatter);
+ map.put("ksrq", ksrq);
+ map.put("jsrq", jsrq);
+ AjaxResult result = hisApiGetMethodService.getHISDataNew("Getoutpatientcostinfo", map);
+ if (Integer.parseInt(String.valueOf(result.get("code"))) == 200) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎾ら攢澶辫触,闂ㄨ瘖鎮ｈ�呰垂鐢ㄦ竻鍗曚俊鎭笉涓虹┖");
+ } else {
+ boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
+ if (zfHisApiMethods) {
+ return AjaxResult.success("鎾ら攢鎴愬姛", map);
+ } else {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
+ }
+ }
+ }
+ return AjaxResult.success();
+ }
+
+
+ @GetMapping("/revokeTjOrderByTjh")
+ @ApiOperation(value = "鏍规嵁灏变綋妫�鍙峰垹闄よ褰�")
+ @Transactional
+ public AjaxResult revokeTjOrderByTjh(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNum) {
+
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
+ if (null != order) {
+// String payByTjNum = tjOrderService.isPayByTjNum(String.valueOf(order.getOrderId()));
+// if (null != payByTjNum) {
+// return AjaxResult.error("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
+// }
+ tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
+ tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
+ remarkService.deletedOrderRemarkByTjNum(tjNum);
+ tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
+ transitionService.deletedTbTransitionByTjNum(tjNum);
+ }
+ return AjaxResult.success();
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
index d2f9037..18ad6ad 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
@@ -230,21 +230,20 @@
Map<String ,Object > selectDjdUserInfo(@Param("tjNumber")String tjNumber);
- @Select("SELECT a.jcsqdh FROM ltkj_outpinexamapply a WHERE a.cardId=#{cardId}")
- String getHuoQuJcsqdh(String cardId);
- @Delete("DELETE FROM ltkj_outpinexamapply WHERE cardId=#{cardId}")
+ @Select("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id=#{cardId} AND a.type='妫�鏌�' GROUP BY a.sqdh")
+ List<String> getHuoQuJcsqdh(String cardId);
+ @Delete("DELETE FROM ltkj_jianchajianyan_tree WHERE card_id=#{cardId} AND type='妫�鏌�'")
Boolean delHuoQuJcsqdh(String cardId);
- @Select("SELECT a.jysqdh FROM ltkj_outpintestapply a WHERE a.cardId=#{cardId} ")
- String getHuoQuJysqdh(String cardId);
- @Delete("DELETE FROM ltkj_outpintestapply WHERE cardId=#{cardId}")
+ @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);
+ @Delete("DELETE FROM ltkj_jianchajianyan_tree WHERE card_id=#{cardId} AND type='妫�楠�'")
Boolean delHuoQuJysqdh(String cardId);
- @Select("SELECT a.zlczh FROM ltkj_outpintreatapply a WHERE a.cardid=#{cardId}")
- String getHuoQuZlsqdh(String cardId);
-
- @Delete("DELETE FROM ltkj_outpintreatapply WHERE cardid=#{cardId}")
+ @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);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
index 3c01c22..9c7492d 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -139,12 +139,12 @@
Map<String ,Object > selectDjdUserInfo(String tjNumber);
- String getHuoQuJcsqdh(String cardId);
+ List<String> getHuoQuJcsqdh(String cardId);
Boolean delHuoQuJcsqdh(String cardId);
- String getHuoQuJysqdh(String cardId);
+ List<String> getHuoQuJysqdh(String cardId);
Boolean delHuoQuJysqdh(String cardId);
- String getHuoQuZlsqdh(String cardId);
+ List<String> getHuoQuZlsqdh(String cardId);
Boolean delHuoQuZlsqdh(String cardId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
index d82b4f2..1dfdd11 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -285,7 +285,7 @@
}
@Override
- public String getHuoQuJcsqdh(String cardId) {
+ public List<String> getHuoQuJcsqdh(String cardId) {
return tjOrderMapper.getHuoQuJcsqdh(cardId);
}
@@ -295,7 +295,7 @@
}
@Override
- public String getHuoQuJysqdh(String cardId) {
+ public List<String> getHuoQuJysqdh(String cardId) {
return tjOrderMapper.getHuoQuJysqdh(cardId);
}
@@ -305,7 +305,7 @@
}
@Override
- public String getHuoQuZlsqdh(String cardId) {
+ public List<String> getHuoQuZlsqdh(String cardId) {
return tjOrderMapper.getHuoQuZlsqdh(cardId);
}
--
Gitblit v1.8.0