From 0abbee42ed08582645795b4b98e2637cc10cfed0 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期日, 19 四月 2026 20:12:01 +0800
Subject: [PATCH] 修改一下fuFlag的默认值 fuFlag:0不要 1要（默认）
---
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
index 7a53d20..aab600e 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -154,6 +154,9 @@
sysUser.setCampusid("1");
//鏍规嵁userName鍒ゆ柇涓�涓嬶紝鏄笉鏄箣鍓嶆湁鏂板
SysUser sysUser1 = null;
+ if (StringUtils.isEmpty(sysUser.getUserName()) || StringUtils.isEmpty(sysUser.getOrgid())) {
+ return false;
+ }
List<SysUser> sysUserList = sysUserMapper.selectUserList(sysUser);
if (CollectionUtils.isNotEmpty(sysUserList)) {
sysUser1 = sysUserList.get(0);
@@ -550,9 +553,9 @@
if (CollectionUtils.isNotEmpty(epli)) externalInHospPatientLiaisonInfo = epli2.get(0);
List<HashMap<String, Object>> bingRenKZXXList = ObjectUtils.isNotEmpty(yeWuXX) ? (List<HashMap<String, Object>>) yeWuXX.get("BingRenKZXXList") : null;
if (CollectionUtils.isNotEmpty(bingRenKZXXList)) {
- for(HashMap<String, Object> bingRenKZXX : bingRenKZXXList){
+ for (HashMap<String, Object> bingRenKZXX : bingRenKZXXList) {
String XiangMuDM = ObjectUtils.isNotEmpty(bingRenKZXX.get("XiangMuDM")) ? bingRenKZXX.get("XiangMuDM").toString() : null;
- if(StringUtils.isNotEmpty(XiangMuDM) && XiangMuDM.equals("DuanHaoXX")){
+ if (StringUtils.isNotEmpty(XiangMuDM) && XiangMuDM.equals("DuanHaoXX")) {
externalInHospPatientInfo.setDuanHaoXX(ObjectUtils.isNotEmpty(bingRenKZXX.get("XiangMuZMC")) ? bingRenKZXX.get("XiangMuZMC").toString() : null);
break;
}
@@ -607,7 +610,7 @@
patMedInhosp1.setDeptcode(externalInHospPatientInfo.getDangQianKSID());
if (ObjectUtils.isNotEmpty(SuiFangJH)) {
- patMedInhosp1.setFuflag(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangBS")) ? SuiFangJH.get("SuiFangBS").toString() : null);
+ patMedInhosp1.setFuflag(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangBS")) ? SuiFangJH.get("SuiFangBS").toString() : "1");
if (ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangRQ"))) {
try {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -641,9 +644,10 @@
patMedInhosp1.setInhospstate("1");
if (deathFlag) {
//鐥呬汉姝讳骸鏃犻』闅忚
- patMedInhosp1.setFuflag("1");
+ patMedInhosp1.setFuflag("0");
//鏇存柊鐥呬汉 notrequiredFlag
patArchive.setNotrequiredFlag("1");
+ patArchive.setNotrequiredreason("鎮ｈ�呭凡绂讳笘");
patArchiveMapper.updatePatArchive(patArchive);
//瀵瑰凡缁忕敓鎴愮殑闅忚浠诲姟杩涜澶勭悊
ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
@@ -651,8 +655,8 @@
serviceSubtaskVO.setSendstate(2L);
List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
- serviceSubtask.setSendstate(6L);
- serviceSubtask.setRemark(serviceSubtask.getRemark() + ";鐥呬汉宸叉浜★紝涓嶉殢璁�");
+ serviceSubtask.setSendstate(4L);
+ serviceSubtask.setRemark(serviceSubtask.getRemark() + ";鎮ｈ�呭凡绂讳笘锛屼笉闅忚");
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
}
}
@@ -663,7 +667,7 @@
patMedInhosp1.setCampusid("1");
if (CollectionUtils.isNotEmpty(noLongTask) && noLongTask.contains(patMedInhosp1.getOrgid())) {
//涓嶉渶瑕侀暱鏈熶换鍔￠殢璁�
- patMedInhosp1.setFuflag("1");
+ patMedInhosp1.setFuflag("0");
}
int i = patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
if (i != 1) return false;
@@ -686,7 +690,7 @@
patMedInhosp1.setCreateTime(new Date());
if (CollectionUtils.isNotEmpty(noLongTask) && noLongTask.contains(patMedInhosp1.getOrgid())) {
//涓嶉渶瑕侀暱鏈熶换鍔￠殢璁�
- patMedInhosp1.setFuflag("1");
+ patMedInhosp1.setFuflag("0");
}
int i = patMedInhospMapper.insertPatMedInhosp(patMedInhosp1);
@@ -765,7 +769,7 @@
patMedInhosp1.setDeptcode(externalInHospPatientInfo.getDangQianKSID());
if (ObjectUtils.isNotEmpty(SuiFangJH)) {
- patMedInhosp1.setFuflag(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangBS")) ? SuiFangJH.get("SuiFangBS").toString() : null);
+ patMedInhosp1.setFuflag(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangBS")) ? SuiFangJH.get("SuiFangBS").toString() : "1");
if (ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangRQ"))) {
try {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -808,7 +812,7 @@
patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX) && ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
if (CollectionUtils.isNotEmpty(noLongTask) && noLongTask.contains(patMedInhosp1.getOrgid())) {
//涓嶉渶瑕侀暱鏈熶换鍔￠殢璁�
- patMedInhosp1.setFuflag("1");
+ patMedInhosp1.setFuflag("0");
}
int i = patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
if (i != 1) return false;
@@ -831,7 +835,7 @@
patMedInhosp1.setCreateTime(new Date());
if (CollectionUtils.isNotEmpty(noLongTask) && noLongTask.contains(patMedInhosp1.getOrgid())) {
//涓嶉渶瑕侀暱鏈熶换鍔￠殢璁�
- patMedInhosp1.setFuflag("1");
+ patMedInhosp1.setFuflag("0");
}
int i = patMedInhospMapper.insertPatMedInhosp(patMedInhosp1);
if (i != 1) return false;
@@ -981,7 +985,7 @@
patMedInhosp1.setDeptcode(externalInHospPatientInfo.getDangQianKSID());
if (ObjectUtils.isNotEmpty(SuiFangJH)) {
- patMedInhosp1.setFuflag(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangBS")) ? SuiFangJH.get("SuiFangBS").toString() : null);
+ patMedInhosp1.setFuflag(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangBS")) ? SuiFangJH.get("SuiFangBS").toString() : "1");
if (ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangRQ"))) {
try {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -1171,7 +1175,7 @@
patMedOuthosp.setDrcode(externalDiagnosisInfo.getZhenDuanYSID());
patMedOuthosp.setDrname(externalDiagnosisInfo.getZhenDuanYSXM());
patMedOuthosp.setIcd10code(externalDiagnosisInfo.getIcd10());
- patMedOuthosp.setFuflag("0");
+ patMedOuthosp.setFuflag("1");
}
}
for (ExternalWZInfo externalWZInfo : ExternalWZInfoList) {
@@ -1188,7 +1192,7 @@
patMedOuthosp.setUpdateTime(new Date());
if (CollectionUtils.isNotEmpty(noLongTask) && noLongTask.contains(patMedOuthosp.getOrgid())) {
//涓嶉渶瑕侀暱鏈熶换鍔￠殢璁匡紝鐢卞尰鐢熻嚜宸卞幓闅忚锛堜附姘翠腑鍖婚櫌棣栨鎻愬嚭锛�
- patMedOuthosp.setFuflag("1");
+ patMedOuthosp.setFuflag("0");
}
i = patMedOuthospService.updatePatMedOuthosp(patMedOuthosp);
} else {
@@ -1196,7 +1200,7 @@
patMedOuthosp.setUpdateTime(new Date());
if (CollectionUtils.isNotEmpty(noLongTask) && noLongTask.contains(patMedOuthosp.getOrgid())) {
//涓嶉渶瑕侀暱鏈熶换鍔￠殢璁�
- patMedOuthosp.setFuflag("1");
+ patMedOuthosp.setFuflag("0");
}
i = patMedOuthospService.insertPatMedOuthosp(patMedOuthosp);
@@ -1466,7 +1470,7 @@
patArchive.setPatientno(externalInHospPatientInfo.getJiuZhenKH());
patArchive.setBirthdate(parse);
patArchive.setPatidHis(externalInHospPatientInfo.getBingRenID());
- patArchive.setSourcefrom(1);
+ patArchive.setSourcefrom(1L);
patArchive.setPattype("2");
patArchive.setName(externalInHospPatientInfo.getXingMing());
if (StringUtils.isNotEmpty(externalInHospPatientInfo.getXingBieDM()))
--
Gitblit v1.9.3