From c27e4ce95a0489907ba3848851f14ac7cca1caca Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 07 十一月 2025 17:43:31 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ExternalInfoServiceImpl.java | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ExternalInfoServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ExternalInfoServiceImpl.java
index ee6a7a5..dcf173e 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ExternalInfoServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ExternalInfoServiceImpl.java
@@ -50,9 +50,17 @@
private WuxiSysUserRoleMapper sysUserRoleMapper;
@Override
- public PatArchive getExternalPatientInfo(Long brid) {
+ public PatArchive getExternalPatientInfo(Long brid, String zyOrmz) {
log.error("getExternalPatientInfo鐨勬暟鎹叆鍙備负:{}", brid);
- List<ExternalPatientInfo> externalPatientInfo = externalInfoMapper.getExternalPatientInfo(brid.toString());
+ List<ExternalPatientInfo> externalPatientInfo = null;
+ if (zyOrmz.equals("zy")) {
+ //鍑哄叆闄㈡偅鑰呭熀鏈俊鎭�
+ externalPatientInfo = externalInfoMapper.getExternalPatientInfo(brid.toString());
+ } else {
+ //闂ㄦ�ヨ瘖鎮ｈ�呭熀鏈俊鎭�
+ externalPatientInfo = externalInfoMapper.getExternalOutHospPatientInfo(null, null, brid.toString());
+ }
+
List<ExternalInHospPatientInfo> externalInHospPatientInfos = externalInfoMapper.getExternalInHospPatientInfo(null, null, brid);
@@ -168,7 +176,7 @@
if (CollectionUtils.isNotEmpty(externalOutHospInfo)) {
for (ExternalOutHospInfo externalOutHospInfo1 : externalOutHospInfo) {
//鍏堝鎮ｈ�呭熀鏈俊鎭繘琛屽鐞�
- Long patid = dealPatArchive(externalOutHospInfo1.getBrid());
+ Long patid = dealPatArchive(externalOutHospInfo1.getBrid(), "mz");
log.error("闂ㄦ�ヨ瘖鑾峰彇鎮ｈ�匢D:{}", patid);
//鏂板闂ㄦ�ヨ瘖淇℃伅
PatMedOuthosp patMedOuthosp = new PatMedOuthosp();
@@ -177,10 +185,11 @@
patMedOuthosp.setPatid(patid);
PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patid);
patMedOuthosp.setPatname(patArchive.getName());
+ patMedOuthosp.setPatno(patArchive.getPatientno());
patMedOuthosp.setDeptcode("" + externalOutHospInfo1.getKsdm());
patMedOuthosp.setDeptname(externalOutHospInfo1.getKsmc());
- patMedOuthosp.setDiagname(externalOutHospInfo1.getZddm());
- patMedOuthosp.setIcd10code(externalOutHospInfo1.getZdmc());
+ patMedOuthosp.setDiagname(externalOutHospInfo1.getZdmc());
+ patMedOuthosp.setIcd10code(externalOutHospInfo1.getZddm());
patMedOuthosp.setDrcode(externalOutHospInfo1.getYsdm().toString());
patMedOuthosp.setDrname(externalOutHospInfo1.getYsmc());
patMedOuthosp.setAdmitdate(externalOutHospInfo1.getJzrq());
@@ -226,13 +235,14 @@
log.error("鍏ラ櫌鑾峰彇鏁版嵁鏁伴噺锛歿}", externalInHospPatientInfo1.size());
for (ExternalInHospPatientInfo externalInHospPatientInfo : externalInHospPatientInfo1) {
//鍏堝鎮ｈ�呭熀鏈俊鎭繘琛屽鐞�
- Long patid = dealPatArchive(externalInHospPatientInfo.getBrid());
+ Long patid = dealPatArchive(externalInHospPatientInfo.getBrid(), "zy");
PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patid);
//鏂板鍏ラ櫌鏁版嵁
PatMedInhosp patMedInhosp = new PatMedInhosp();
patMedInhosp.setInhospno(externalInHospPatientInfo.getZyhm());
List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList2(patMedInhosp);
if (CollectionUtils.isNotEmpty(patMedInhospList) && patMedInhospList.size() > 0) {
+ log.error("****patMedInhospList鐨勫�间负锛歿}",patMedInhospList.get(0).getInhospid());
continue;
}
@@ -282,7 +292,7 @@
log.error("鍏ラ櫌鑾峰彇鏁版嵁鏁伴噺锛歿}", externalInHospPatientInfo1.size());
for (ExternalInHospPatientInfo externalInHospPatientInfo : externalInHospPatientInfo1) {
//鍏堝鎮ｈ�呭熀鏈俊鎭繘琛屽鐞�
- Long patid = dealPatArchive(externalInHospPatientInfo.getBrid());
+ Long patid = dealPatArchive(externalInHospPatientInfo.getBrid(), "zy");
PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patid);
//鏂板鍏ラ櫌鏁版嵁
PatMedInhosp patMedInhosp = new PatMedInhosp();
@@ -496,7 +506,7 @@
List<ExternalLeaveHospPatientInfo> externalLeaveHospPatientInfo = externalInfoMapper.getExternalLeaveHospPatientInfo(startTime, endTime);
for (ExternalLeaveHospPatientInfo externalLeaveHospPatientInfo1 : externalLeaveHospPatientInfo) {
//鍏堝鎮ｈ�呭熀鏈俊鎭繘琛屽鐞�
- Long patid = dealPatArchive(externalLeaveHospPatientInfo1.getBrid());
+ Long patid = dealPatArchive(externalLeaveHospPatientInfo1.getBrid(), "zy");
//鏂板鍑洪櫌鏁版嵁
//鏍规嵁浣忛櫌鍙锋煡璇㈠叆闄俊鎭�
PatMedInhosp pmi = new PatMedInhosp();
@@ -509,7 +519,7 @@
List<ExternalInHospPatientInfo> externalInHospPatientInfo1 = externalInfoMapper.getExternalInHospPatientInfo(null, null, externalLeaveHospPatientInfo1.getBrid());
if (CollectionUtils.isNotEmpty(externalInHospPatientInfo1)) {
//鍏堝鎮ｈ�呭熀鏈俊鎭繘琛屽鐞�
- Long pid = dealPatArchive(externalInHospPatientInfo1.get(0).getBrid());
+ Long pid = dealPatArchive(externalInHospPatientInfo1.get(0).getBrid(), "zy");
PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patid);
//鏂板鍏ラ櫌鏁版嵁
PatMedInhosp inhosp = new PatMedInhosp();
@@ -586,7 +596,8 @@
public Boolean getExternalLeaveHospPatientInfo30Day() {
try {
// 鍥哄畾寮�濮嬫椂闂�
- String fixedStartTime = "2025-03-25";
+// String fixedStartTime = "2025-03-25";
+ String fixedStartTime = "2025-02-01";
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
String today = formatter.format(new Date());
@@ -599,7 +610,8 @@
try {
startCal.setTime(formatter.parse(fixedStartTime));
- endCal.setTime(formatter.parse(today));
+ endCal.setTime(formatter.parse("2025-06-08"));
+// endCal.setTime(formatter.parse(today));
} catch (ParseException e) {
log.error("鏃ユ湡瑙ｆ瀽澶辫触锛歿}", e.getMessage(), e);
return false;
@@ -645,7 +657,7 @@
for (ExternalOutHospInfo externalOutHospInfo : externalOutHospInfos) {
try {
// 澶勭悊鎮ｈ�呮。妗�
- Long patid = dealPatArchive(externalOutHospInfo.getBrid());
+ Long patid = dealPatArchive(externalOutHospInfo.getBrid(), "mz");
PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patid);
// 鍒涘缓闂ㄨ瘖璁板綍瀵硅薄
@@ -655,6 +667,7 @@
patMedOuthosp.setOuthospno(externalOutHospInfo.getJzkh());
patMedOuthosp.setSerialnum(externalOutHospInfo.getJzkh());
patMedOuthosp.setPatid(patid);
+ patMedOuthosp.setPatno(patArchive.getPatientno());
// 璁剧疆鎮ｈ�呭鍚�
if (ObjectUtils.isNotEmpty(patArchive)) {
@@ -737,11 +750,11 @@
* @return
*/
@Override
- public Long dealPatArchive(Long brid) {
+ public Long dealPatArchive(Long brid, String zyOrmz) {
PatArchive patArchive = new PatArchive();
patArchive.setPatidHis(brid);
List<PatArchive> patArchives = patArchiveMapper.selectPatArchiveList(patArchive);
- PatArchive patientInfo = getExternalPatientInfo(brid);
+ PatArchive patientInfo = getExternalPatientInfo(brid, zyOrmz);
if (ObjectUtils.isNotEmpty(patientInfo)) {
if (CollectionUtils.isNotEmpty(patArchives)) {
//濡傛灉涓嶄负绌�,鍒欒蛋鏇存柊鎿嶄綔
--
Gitblit v1.9.3