From 35bf4a558e23d5016bccaa2145c4bed20aed920f Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 02 十二月 2024 00:18:13 +0800
Subject: [PATCH] zjh20241202-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 deletions(-)
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 cbb0c92..1144249 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
@@ -997,10 +997,18 @@
}
// TODO 鍜岀鍒扮櫥璁颁竴鏍� 鍙湁閰嶇疆涓殑浠ュ強鏀惰垂绫诲瀷涓轰綋妫�绁ㄦ椂鎵嶅鍔犲埌閲囨牱绠＄悊琛�
- if (lisApiMethod.isUseLisAndPacsRegister(order) && tjFlowingWater.getPayType() == 6L) {
+ if(config.equals("Y")){
+ if (lisApiMethod.isUseLisAndPacsRegister(order) && tjFlowingWater.getPayType() == 6L) {
+ List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(), jxbz);
+ addCaiYangDengJi(detailLists, !detailLists.isEmpty(), order, sysUser, jxbz);
+ }
+ }else {
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(order.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(), jxbz);
addCaiYangDengJi(detailLists, !detailLists.isEmpty(), order, sysUser, jxbz);
}
+
}
// Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
@@ -1282,6 +1290,9 @@
public AjaxResult tijianbulushenqing(TjCustomer customer, String date,String cardId,String jxbz,ArrayList<TjProject> jianChaProjects,Boolean isTuanTiPiao) {
TjOrder order = orderService.getOrderByCardId(cardId);
if(null !=order){
+ String dept = configService.selectConfigByKey("request_default_dept");
+ String ysbm = configService.selectConfigByKey("request_default_ysbm");
+ String ysmc = configService.selectConfigByKey("request_default_ysmc");
List<TbTransition> detailList = transitionService.getBlTbTransitionListByCusId(customer.getCusIdcard(),cardId,jxbz);
Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =new ArrayList<>();
@@ -1332,11 +1343,11 @@
OutpintestapplyDto dto = new OutpintestapplyDto();
dto.setHisRegistrationId(cardId);
dto.setSfzh(customer.getCusIdcard());
- dto.setSqysbm("00029");
- dto.setMzksbm("0101");
+ dto.setSqysbm(ysbm);
+ dto.setMzksbm(dept);
dto.setSjrq(date);
- dto.setCzybm("00029");
- dto.setCzyksbm("0101");
+ dto.setCzybm(ysbm);
+ dto.setCzyksbm(dept);
dto.setSfjz("0");
List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
@@ -1437,10 +1448,10 @@
OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto();
outpinexamapplyDto.setHisRegistrationId(cardId);
outpinexamapplyDto.setSfzh(customer.getCusIdcard());
- outpinexamapplyDto.setSqysbm("00029");
- outpinexamapplyDto.setMzksbm("0101");
- outpinexamapplyDto.setCzybm("00029");
- outpinexamapplyDto.setCzyksbm("0101");
+ outpinexamapplyDto.setSqysbm(ysbm);
+ outpinexamapplyDto.setMzksbm(dept);
+ outpinexamapplyDto.setCzybm(ysbm);
+ outpinexamapplyDto.setCzyksbm(dept);
outpinexamapplyDto.setSfjz("0");
// List<TbTransition> detailLists = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>();
@@ -1539,11 +1550,11 @@
OutpintreatapplyDto dao = new OutpintreatapplyDto();
dao.setHisRegistrationId(cardId);
dao.setSfzh(customer.getCusIdcard());
- dao.setSqysbm("00029");
- dao.setMzksbm("0101");
+ dao.setSqysbm(ysbm);
+ dao.setMzksbm(dept);
dao.setSjrq(date);
- dao.setCzybm("00029");
- dao.setCzyksbm("0101");
+ dao.setCzybm(ysbm);
+ dao.setCzyksbm(dept);
dao.setSfjz("0");
// List<TbTransition> details = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>();
@@ -1642,11 +1653,11 @@
OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
dto1.setHisRegistrationId(cardId);
dto1.setSfzh(customer.getCusIdcard());
- dto1.setSqysbm("00029");
- dto1.setMzksbm("0101");
+ dto1.setSqysbm(ysbm);
+ dto1.setMzksbm(dept);
dto1.setSjrq(date);
- dto1.setCzybm("00029");
- dto1.setCzyksbm("0101");
+ dto1.setCzybm(ysbm);
+ dto1.setCzyksbm(dept);
dto1.setCflxbm("A");
dto1.setYfbm("1");
dto1.setFyts("1");
@@ -1667,11 +1678,11 @@
cf.setCardId(cardId);
cf.setSfzh(customer.getCusIdcard());
cf.setCfh(cfh);
- cf.setSqysbm("00029");
- cf.setSqysxm("鐜嬪仴钀�");
- cf.setMzksbn("0101");
+ cf.setSqysbm(ysbm);
+ cf.setSqysxm(ysmc);
+ cf.setMzksbn(dept);
cf.setSqrq(date);
- cf.setCzybm("00029");
+ cf.setCzybm(ysbm);
cf.setYpbm(detilsDto.getYpbm());
cf.setYpmc("灏跨礌[14C]鍛兼皵璇曢獙鑽洅");
cf.setSl(String.valueOf(detilsDto.getSl()));
--
Gitblit v1.8.0