From da583ad2beefb9887dca12a7574ea2d0b853fc9a Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期一, 17 六月 2024 12:39:50 +0800
Subject: [PATCH] zjh 本地 2024/06/17 --1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 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 ea5b23b..db53294 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
@@ -7,7 +7,6 @@
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.AjaxResult;
-import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.hisDto.*;
import com.ltkj.hosp.service.*;
@@ -88,10 +87,10 @@
String pationid = resultData.get("PationId").toString();
if (null != pationid) {
customer.setPationId(pationid);
-// customerService.updateById(customer);
- /* OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
+ customerService.updateById(customer);
+ OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
outpinregapplyDto.setPationid(pationid);
- outpinregapplyDto.setSqysbm(SecurityUtils.getUsername());
+ outpinregapplyDto.setSqysbm("00029");
outpinregapplyDto.setMzksbm("0101");
outpinregapplyDto.setCzybm("00029");
outpinregapplyDto.setSfjz("0");
@@ -110,16 +109,14 @@
Map<String, Object> resultDatasss = (Map<String, Object>) resultDatas.get(0);
String hisRegistrationId = resultDatasss.get("his_registration_id").toString();
//闂ㄨ瘖鍖荤敓鎺ヨ瘖
- controller.Outpinconapply(hisRegistrationId, date, SecurityUtils.getUsername());
+ controller.Outpinconapply(hisRegistrationId, date,"00029");
customer.setCardId(hisRegistrationId);
customerService.updateById(customer);
- transitionService.updateCardIdByTjNumAndIdCard(customer.getCusIdcard(),hisRegistrationId);
- if(null !=tjOrder){
- tjOrder.setCardId(hisRegistrationId);
- orderService.updateById(tjOrder);
- }
+ transitionService.updateCardIdByTjNumAndIdCard(customer.getCusIdcard(),hisRegistrationId,tjOrder.getTjNumber());
+ tjOrder.setCardId(hisRegistrationId);
+ orderService.updateById(tjOrder);
}
- }*/
+ }
AjaxResult error = tijianshenqing(customer, date);
if (error != null) return error;
return AjaxResult.success();
@@ -136,7 +133,7 @@
OutpintestapplyDto dto = new OutpintestapplyDto();
dto.setHisRegistrationId(customer.getCardId());
dto.setSfjz(customer.getCusIdcard());
- dto.setSqysbm(SecurityUtils.getUsername());
+ dto.setSqysbm("00029");
dto.setMzksbm("0101");
dto.setSjrq(date);
dto.setCzybm("00029");
@@ -231,7 +228,7 @@
OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto();
outpinexamapplyDto.setHisRegistrationId(customer.getCardId());
outpinexamapplyDto.setSfzh(customer.getCusIdcard());
- outpinexamapplyDto.setSqysbm(SecurityUtils.getUsername());
+ outpinexamapplyDto.setSqysbm("00029");
outpinexamapplyDto.setMzksbm("0101");
outpinexamapplyDto.setCzybm("00029");
outpinexamapplyDto.setCzyksbm("0101");
@@ -326,7 +323,7 @@
OutpintreatapplyDto dao = new OutpintreatapplyDto();
dao.setHisRegistrationId(customer.getCardId());
dao.setSfzh(customer.getCusIdcard());
- dao.setSqysbm(SecurityUtils.getUsername());
+ dao.setSqysbm("00029");
dao.setMzksbm("0101");
dao.setSjrq(date);
dao.setCzybm("00029");
@@ -338,7 +335,7 @@
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.isNull(TjProject::getDeptId);
+// wq.isNull(TjProject::getDeptId);
List<TjProject> projects = projectService.list(wq);
if (null != projects && projects.size() > 0) {
for (TjProject project : projects) {
--
Gitblit v1.8.0