From 9155df2aeab5b0d95c89dd928dbaefbfbaeae9d1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 九月 2024 17:10:35 +0800
Subject: [PATCH] zjh 2024-09-05
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 131 +++++++++++--------------------------------
1 files changed, 33 insertions(+), 98 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 5e97d13..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
@@ -14,6 +14,7 @@
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import jdk.nashorn.internal.runtime.logging.Logger;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -28,6 +29,7 @@
* */
@Component
+@Slf4j
public class HisApiMethod {
@Autowired
private HisApiMethodService controller;
@@ -73,10 +75,10 @@
//瀵规帴his鎬绘帴鍙� 娉ㄥ唽鎸傚彿鎺ヨ瘖鐢宠鍗曟搷浣�
@Logger
- public AjaxResult HisApiMethods(TjCustomer customer, Long orderId) {
+ public AjaxResult HisApiMethods(TjCustomer customer,TjOrder tjOrder) {
String jzh=null;
try {
- TjOrder tjOrder = orderService.getById(orderId);
+// TjOrder tjOrder = orderService.getById(orderId);
Date dates = new Date();
final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
@@ -109,7 +111,14 @@
hisApiGetMethodService.save(object4, "Outpinregapply", hisApiConfig, JSONUtil.toJsonStr(BeanUtil.beanToMap(outpinregapplyDto)));
//闂ㄨ瘖鍖荤敓鎺ヨ瘖
- controller.Outpinconapply(hisRegistrationId, date, "00029");
+ AjaxResult result = controller.Outpinconapply(hisRegistrationId, date, "00029");
+ String result3 = getAjaxResult(result);
+ JSONObject object2 = getJSONObject(result3);
+ String code2 = object2.getStr("ResultCode");
+ if (!code2.equals("0")) {
+ return AjaxResult.error(object2.getStr("ResultContent"));
+ }
+ log.info("his鎺ュ彛-----鍖荤敓鎺ヨ瘖鎴愬姛!");
if(null != tjOrder.getTjCategory() && !tjOrder.getTjCategory().equals("13")){
customer.setCardId(hisRegistrationId);
}else {
@@ -147,7 +156,7 @@
dto.setSfqj("0");
dto.setJzqk(9);
controller.Outpinimpapply(dto);
- return tijianshenqing(customer, date,tjOrder.getCardId());
+ return AjaxResult.success();
}
return AjaxResult.error();
} catch (Exception e) {
@@ -158,7 +167,11 @@
//浣撴瀵筯is鐢宠鍗曡皟鐢ㄦ柟娉�
- private AjaxResult tijianshenqing(TjCustomer customer, String date,String cardId) {
+ public AjaxResult tijianshenqing(TjCustomer customer, String date,String cardId) {
+
+
+ List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
+
//妫�楠岀敵璇�
OutpintestapplyDto dto = new OutpintestapplyDto();
dto.setHisRegistrationId(cardId);
@@ -169,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) {
@@ -241,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"))
@@ -289,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) {
@@ -360,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"))
@@ -396,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("妫�鏌ョ敵璇峰け璐�!");
-// }
}
@@ -421,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) {
@@ -493,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"))
@@ -521,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("澶勭疆鐢宠澶辫触!");
-// }
}
//鑽搧鐢宠
@@ -553,11 +497,11 @@
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
- if(null !=code && code.equals("200")){
- JSONArray resultData = object.getJSONArray("ResultData");
- Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0);
- String cfh = resultDatasss.get("cfh").toString();
-
+ 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);
@@ -661,7 +605,7 @@
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
- if(null !=code && code.equals("200")){
+ if(null !=code && code.equals("0")){
cfService.delCfByCardId(cfh);
}
}
@@ -751,7 +695,7 @@
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
- if(null !=code && code.equals("200")){
+ if(null !=code && code.equals("0")){
cfService.delCfByCardId(cfh);
}
}
@@ -792,9 +736,6 @@
if (code.equals("0")) {
orderService.delHuoQuJcsqdh(jzh);
}
-// else {
-// return false;
-// }
}
}
@@ -816,9 +757,6 @@
if (code1.equals("0")) {
orderService.delHuoQuJysqdh(jzh);
}
-// else {
-// return false;
-// }
}
}
@@ -842,7 +780,7 @@
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
- if(null !=code && code.equals("200")){
+ if(null !=code && code.equals("0")){
cfService.delCfByCardId(cfh);
}
}
@@ -854,9 +792,6 @@
result2 = getAjaxResult(ajaxResult);
object1 = getJSONObject(result2);
code1 = object1.getStr("ResultCode");
-// if (!code1.equals("0")) {
-// return false;
-// }
return true;
}
--
Gitblit v1.8.0