From e75b172925502dbeca943f9d4a0cda04977c4c28 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 15 八月 2024 18:33:21 +0800
Subject: [PATCH] zjh 2024-08-15
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 87 +++++--------------------------------------
1 files changed, 11 insertions(+), 76 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 bce6b5c..a10136e 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
@@ -168,6 +168,10 @@
//浣撴瀵筯is鐢宠鍗曡皟鐢ㄦ柟娉�
public AjaxResult tijianshenqing(TjCustomer customer, String date,String cardId) {
+
+
+ List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
+
//妫�楠岀敵璇�
OutpintestapplyDto dto = new OutpintestapplyDto();
dto.setHisRegistrationId(cardId);
@@ -178,7 +182,7 @@
dto.setCzybm("00029");
dto.setCzyksbm("0101");
dto.setSfjz("0");
- List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
+
List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =new ArrayList<>();
if (null != detailList && detailList.size() > 0) {
@@ -250,23 +254,6 @@
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<TjProject> wrapper = new LambdaQueryWrapper<>();
-// wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
-// wrapper.eq(TjProject::getSl,1);
-// wrapper.groupBy(TjProject::getHisXmbm);
-// TjProject project = projectService.getOne(wrapper);
-// if(null !=project){
-// BigDecimal decimal = project.getProPrice().multiply(BigDecimal.valueOf(detail.getSl()));
-// tree.setTjPrice(String.valueOf(decimal));
-// }
tree.setTjPrice(String.valueOf(detail.getProjg()));
LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
if (detail.getSfzhfy().equals("1"))
@@ -298,13 +285,11 @@
outpinexamapplyDto.setCzybm("00029");
outpinexamapplyDto.setCzyksbm("0101");
outpinexamapplyDto.setSfjz("0");
- List<TbTransition> detailLists = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
+// List<TbTransition> detailLists = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>();
- if (null != detailLists && detailLists.size() > 0) {
+ if (null != detailList && detailList.size() > 0) {
LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
- wq.in(TjProject::getProId, detailLists.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
-// wq.groupBy(TjProject::getHisXmbm);
-// wq.in(TjProject::getDeptId, "247", "248", "249", "250", "251", "252", "271", "273", "274", "275", "298");
+ 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.size() > 0) {
@@ -369,23 +354,6 @@
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<TjProject> wrapper = new LambdaQueryWrapper<>();
-// wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
-// wrapper.eq(TjProject::getSl,1);
-// wrapper.groupBy(TjProject::getHisXmbm);
-// TjProject project = projectService.getOne(wrapper);
-// if(null !=project){
-// BigDecimal decimal = project.getProPrice().multiply(BigDecimal.valueOf(detail.getSl()));
-// tree.setTjPrice(String.valueOf(decimal));
-// }
tree.setTjPrice(String.valueOf(detail.getProjg()));
LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
if (detail.getSfzhfy().equals("1"))
@@ -405,18 +373,7 @@
tree.setCreateTime(DateUtil.date());
ltkjJianchajianyanTreeService.save(tree);
}
-// Map<String, Object> map = object5.getJSONObject("ResultData");
-// map.put("cardId", customer.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)));
-
}
-// else {
-// return AjaxResult.error("妫�鏌ョ敵璇峰け璐�!");
-// }
}
@@ -430,15 +387,12 @@
dao.setCzybm("00029");
dao.setCzyksbm("0101");
dao.setSfjz("0");
- List<TbTransition> details = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
+// List<TbTransition> details = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>();
- if (null != details && details.size() > 0) {
+ if (null != detailList && detailList.size() > 0) {
LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
- wq.in(TjProject::getProId, details.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
-// wq.groupBy(TjProject::getHisXmbm);
-// wq.in(TjProject::getDeptId, "100", "240", "253", "254", "255", "257", "258", "259", "269", "270");
+ wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
wq.in(TjProject::getDeptId,deptService.getCzDeptIds());
-// wq.isNull(TjProject::getDeptId);
List<TjProject> projects = projectService.list(wq);
if (null != projects && projects.size() > 0) {
for (TjProject project : projects) {
@@ -502,15 +456,6 @@
String mxfyxmbm = detail.getMxfyxmbm();
tree.setHisXmdm(mxfyxmbm);
tree.setType("澶勭疆");
-// LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
-// wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
-// wrapper.eq(TjProject::getSl,1);
-// wrapper.groupBy(TjProject::getHisXmbm);
-// TjProject project = projectService.getOne(wrapper);
-// if(null !=project){
-// BigDecimal decimal = project.getProPrice().multiply(BigDecimal.valueOf(detail.getSl()));
-// tree.setTjPrice(String.valueOf(decimal));
-// }
tree.setTjPrice(String.valueOf(detail.getProjg()));
LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
if (detail.getSfzhfy().equals("1"))
@@ -530,17 +475,7 @@
tree.setCreateTime(DateUtil.date());
ltkjJianchajianyanTreeService.save(tree);
}
-// Map<String, Object> map = mzylyzsq3.getJSONObject("ResultData");
-// map.put("cardId", customer.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)));
}
-// else {
-// return AjaxResult.error("澶勭疆鐢宠澶辫触!");
-// }
}
//鑽搧鐢宠
--
Gitblit v1.8.0