From d9b1730bab30deb63273f17d4caf9aaf82d3e730 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 27 二月 2026 16:20:01 +0800
Subject: [PATCH] 【丽水】增加患者离抢数据修正，修正出院转院记录的时间
---
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 201 insertions(+), 0 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 8e2c498..d31b278 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -1,10 +1,13 @@
package com.smartor.service.impl;
import cn.hutool.core.bean.BeanUtil;
+import com.google.gson.Gson;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.entity.SysUserDept;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.*;
import com.smartor.mapper.*;
@@ -40,6 +43,8 @@
private SysDept2Mapper sysDeptMapper;
@Autowired
private SysUser2Mapper sysUserMapper;
+ @Autowired
+ private SysUserDeptMapper sysUserDeptMapper;
@Autowired
private BaseOrganizationMapper baseOrganizationMapper;
@Autowired
@@ -89,6 +94,8 @@
}
SysDept sysDept = new SysDept();
sysDept.setOrgid(externalDept.getZuZhiJGID());
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ sysDept.setCampusid("1");
sysDept.setHisDeptId(externalDept.getKeShiID());
sysDept.setHisParentId(externalDept.getFuKeSID());
//閫氳繃his鐨勭埗绉戝ID鍘绘壘鍒扮瀹D,濉厖parentId
@@ -130,6 +137,7 @@
log.info("ServiceExternalServiceImpl---addUserInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
Map yeWuXX = (Map) dataMap.get("YeWuXX");
Map<String, Object> yongHuXX = (Map<String, Object>) yeWuXX.get("YongHuXX");
+
ExternalUserInfo externalUserInfo = BeanUtil.mapToBean(yongHuXX, ExternalUserInfo.class, true);
if (ObjectUtils.isEmpty(externalUserInfo)) {
throw new BaseException("externalUserInfo鏄┖鐨勶紝娌℃湁鏁版嵁锛侊紒锛�");
@@ -137,6 +145,8 @@
SysUser sysUser = new SysUser();
sysUser.setUserName(externalUserInfo.getYongHuDLM());
sysUser.setOrgid(externalUserInfo.getZuZhiJGID());
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ sysUser.setCampusid("1");
//鏍规嵁userName鍒ゆ柇涓�涓嬶紝鏄笉鏄箣鍓嶆湁鏂板
SysUser sysUser1 = null;
List<SysUser> sysUserList = sysUserMapper.selectUserList(sysUser);
@@ -176,6 +186,116 @@
return true;
}
+ @Override
+ public Boolean addUserDeptInfo(Map dataMap) {
+ log.info("ServiceExternalServiceImpl---addUserDeptInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+ Map yeWuXX = (Map) dataMap.get("YeWuXX");
+ Map<String, Object> keShiYH = (Map<String, Object>) yeWuXX.get("KeShiYH");
+
+ ExternalUserDeptInfo externalUserDeptInfo = BeanUtil.mapToBean(keShiYH, ExternalUserDeptInfo.class, true);
+ if (ObjectUtils.isEmpty(externalUserDeptInfo)) {
+ throw new BaseException("externalUserDeptInfo鏄┖鐨勶紝娌℃湁鏁版嵁锛侊紒锛�");
+ }
+
+ //鑾峰彇褰撳墠鐢ㄦ埛Name瀵瑰簲鐨剈ser淇℃伅
+ SysUser sysUser = null;
+ SysUser sysUserVo = new SysUser();
+ sysUserVo.setUserName(externalUserDeptInfo.getYongHuDLM());
+ sysUserVo.setOrgid(externalUserDeptInfo.getZuZhiJGID());
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ sysUserVo.setCampusid("1");
+ //鏍规嵁userName鍒ゆ柇涓�涓嬶紝鏄笉鏄箣鍓嶆湁鏂板
+ List<SysUser> sysUserList = sysUserMapper.selectUserList(sysUserVo);
+ if (CollectionUtils.isNotEmpty(sysUserList)) {
+ sysUser = sysUserList.get(0);
+ }
+
+ //鑾峰彇褰撳墠绉戝hisDeptId瀵瑰簲鐨刣ept淇℃伅
+ SysDept sysDept = null;
+ SysDept sysDeptVo = new SysDept();
+ sysDeptVo.setOrgid(externalUserDeptInfo.getZuZhiJGID());
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ sysDeptVo.setCampusid("1");
+ sysDeptVo.setHisDeptId(externalUserDeptInfo.getKeShiID());
+ List<SysDept> sysDepts = sysDeptMapper.selectDeptList(sysDeptVo);
+ if (CollectionUtils.isNotEmpty(sysDepts)) {
+ sysDept = sysDepts.get(0);
+ }
+ if(ObjectUtils.isEmpty(sysUser)){
+ log.error("ServiceExternalServiceImpl---addUserDeptInfo 鎵句笉鍒板搴旂殑鐢ㄦ埛 username: {}", externalUserDeptInfo.getYongHuDLM());
+ return false;
+ }else if(ObjectUtils.isEmpty(sysDept)){
+ log.error("ServiceExternalServiceImpl---addUserDeptInfo 鎵句笉鍒板搴旂殑绉戝 hisDeptId: {}", externalUserDeptInfo.getKeShiID());
+ return false;
+ }else {
+ SysUserDept sysUserDept = new SysUserDept();
+ sysUserDept.setDelFlag(0L);
+ sysUserDept.setUserId(sysUser.getUserId());
+ sysUserDept.setUserCode(sysUser.getUserCode());
+ sysUserDept.setDeptType(sysDept.getDeptType());
+ sysUserDept.setGuid(externalUserDeptInfo.getZuZhiJGID());
+ sysUserDept.setDeptId(sysDept.getDeptId());
+ sysUserDept.setDeptCode(sysDept.getDeptCode());
+ sysUserDept.setDeptName(sysDept.getDeptName());
+ sysUserDept.setOrgid(externalUserDeptInfo.getZuZhiJGID());
+ sysUserDept.setCampusid("1");
+
+ sysUserDept.setCreateBy(externalUserDeptInfo.getChuangJianRXM());
+ sysUserDept.setCreateTime(externalUserDeptInfo.getChuangJianSJ());
+ sysUserDept.setUpdateTime(externalUserDeptInfo.getXiuGaiSJ());
+ sysUserDept.setUpdateBy(externalUserDeptInfo.getXiuGaiRXM());
+
+ if (StringUtils.isNotEmpty(externalUserDeptInfo.getShiJianDM()) && externalUserDeptInfo.getShiJianDM().equals("3")) {
+ sysUserDept.setDelFlag(1L);
+ }
+ SysUserDept sysUserDeptVo = new SysUserDept();
+ sysUserDeptVo.setUserId(sysUser.getUserId());
+ sysUserDeptVo.setDeptId(sysDept.getDeptId());
+ sysUserDeptVo.setOrgid(externalUserDeptInfo.getZuZhiJGID());
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ sysUserDeptVo.setCampusid("1");
+ //鏍规嵁userName鍒ゆ柇涓�涓嬶紝鏄笉鏄箣鍓嶆湁鏂板
+ SysUserDept sysUserDeptOld = null;
+ List<SysUserDept> sysUserDeptList = sysUserDeptMapper.selectSysUserDeptList(sysUserDeptVo);
+ if (CollectionUtils.isNotEmpty(sysUserDeptList)) {
+ sysUserDeptOld = sysUserDeptList.get(0);
+ }
+ if (ObjectUtils.isEmpty(sysUserDeptOld)) {
+ int i = sysUserDeptMapper.insertSysUserDept(sysUserDept);
+ log.info("ServiceExternalServiceImpl---addUserDeptInfo鏄惁鏂板鎴愬姛锛歿}", i);
+ } else {
+ sysUserDept.setUserId(sysUserDeptOld.getUserId());
+ int i = sysUserDeptMapper.updateSysUserDept(sysUserDept);
+ log.info("ServiceExternalServiceImpl---addUserDeptInfo鏄惁淇敼鎴愬姛03锛歿}", i);
+ }
+ //鏇存柊sys-user deptId
+ if(StringUtils.isNotEmpty(externalUserDeptInfo.getKeShiID())){
+ sysUser.setDeptId(Long.valueOf(externalUserDeptInfo.getKeShiID()));
+ //鏌ヨ鐢ㄦ埛绉戝鍏崇郴
+ SysUserDept sysUserDeptTemp = new SysUserDept();
+ sysUserDeptTemp.setUserId(sysUser.getUserId());
+ sysUserDeptTemp.setOrgid(externalUserDeptInfo.getZuZhiJGID());
+ List<SysUserDept> sysUserDepts = sysUserDeptMapper.selectSysUserDeptList(sysUserDeptTemp);
+ List<String> userDepts = sysUserDepts.stream().map(SysUserDept::getDeptCode).
+ distinct().collect(Collectors.toList());
+ //鍜宷ueryHospUserInfoList閲囬泦鐨勬暟鎹牸寮忎繚鎸佷竴鑷�
+ List<List<String>> userDeptsList = new ArrayList<>();
+ if(!userDepts.isEmpty()){
+ for(String userDept: userDepts){
+ List<String> uDept = new ArrayList<>();
+ uDept.add(userDept);
+ userDeptsList.add(uDept);
+ }
+ }
+ //灏嗛儴闂ㄦ垜鐥呭尯鏀惧埌鎸囧畾瀛楁涓�
+ Gson gson = new Gson();
+ sysUser.setHospInfo(gson.toJson(userDeptsList));
+
+ sysUserMapper.updateUser(sysUser);
+ }
+ }
+ return true;
+ }
private SysUser getUser(List<SysUser> sysUserList) {
SysUser sysUser = null;
@@ -214,6 +334,8 @@
baseOrganization.setUpdateTime(externalOrganInfo.getUpdateTime());
baseOrganization.setUpdateBy(externalOrganInfo.getUpdateBy());
baseOrganization.setOrgid(externalOrganInfo.getZuZhiJGID());
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ baseOrganization.setCampusid("1");
if (StringUtils.isNotEmpty(externalOrganInfo.getShiJianDM()) && externalOrganInfo.getShiJianDM().equals("1")) {
int i = baseOrganizationMapper.insertBaseOrganization(baseOrganization);
log.info("ServiceExternalServiceImpl---addOrganInfo鏄惁鏂板鎴愬姛锛歿}", i);
@@ -494,6 +616,8 @@
if (CollectionUtils.isNotEmpty(patMedInhospList)) {
patMedInhosp1.setUpdateTime(new Date());
patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX) && ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ patMedInhosp1.setCampusid("1");
if (CollectionUtils.isNotEmpty(noLongTask) && noLongTask.contains(patMedInhosp1.getOrgid())) {
//涓嶉渶瑕侀暱鏈熶换鍔￠殢璁�
patMedInhosp1.setFuflag("1");
@@ -507,6 +631,8 @@
patMedInhosp1.setLeavehospitaldistrictname(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianBQMC")) ? BingRenXX.get("DangQianBQMC").toString() : null);
patMedInhosp1.setLeavehospitaldistrictcode(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianBQID")) ? BingRenXX.get("DangQianBQID").toString() : null);
patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ patMedInhosp1.setCampusid("1");
patMedInhosp1.setPatno(ObjectUtils.isNotEmpty(BingRenXX.get("BingRenID")) ? BingRenXX.get("BingRenID").toString() : null);
patMedInhosp1.setInhospno(ObjectUtils.isNotEmpty(BingRenXX.get("BingAnHao")) ? BingRenXX.get("BingAnHao").toString() : null);
patMedInhosp1.setSerialnum(ObjectUtils.isNotEmpty(BingRenXX.get("JiuZhenYWID")) ? BingRenXX.get("JiuZhenYWID").toString() : null);
@@ -650,6 +776,8 @@
patMedInhosp1.setLeavehospitaldistrictname(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianBQMC")) ? BingRenXX.get("DangQianBQMC").toString() : null);
patMedInhosp1.setLeavehospitaldistrictcode(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianBQID")) ? BingRenXX.get("DangQianBQID").toString() : null);
patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ patMedInhosp1.setCampusid("1");
patMedInhosp1.setPatno(ObjectUtils.isNotEmpty(BingRenXX.get("BingRenID")) ? BingRenXX.get("BingRenID").toString() : null);
patMedInhosp1.setInhospno(ObjectUtils.isNotEmpty(BingRenXX.get("BingAnHao")) ? BingRenXX.get("BingAnHao").toString() : null);
patMedInhosp1.setSerialnum(ObjectUtils.isNotEmpty(BingRenXX.get("JiuZhenYWID")) ? BingRenXX.get("JiuZhenYWID").toString() : null);
@@ -854,6 +982,8 @@
patMedInhosp1.setLeavehospitaldistrictname(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianBQMC")) ? BingRenXX.get("DangQianBQMC").toString() : null);
patMedInhosp1.setLeavehospitaldistrictcode(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianBQID")) ? BingRenXX.get("DangQianBQID").toString() : null);
patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ patMedInhosp1.setCampusid("1");
patMedInhosp1.setPatno(ObjectUtils.isNotEmpty(BingRenXX.get("BingRenID")) ? BingRenXX.get("BingRenID").toString() : null);
patMedInhosp1.setInhospno(ObjectUtils.isNotEmpty(BingRenXX.get("BingAnHao")) ? BingRenXX.get("BingAnHao").toString() : null);
patMedInhosp1.setSerialnum(ObjectUtils.isNotEmpty(BingRenXX.get("JiuZhenYWID")) ? BingRenXX.get("JiuZhenYWID").toString() : null);
@@ -868,6 +998,48 @@
return true;
}
+ /**
+ * 鐩墠锛屼粠鎬ヨ瘖鎶㈡晳鍚庤浆鍏ヤ綇闄㈢殑鎮ｈ�咃紝鍏舵暟鎹噰闆嗗瓨鍦ㄤ竴涓棶棰橈細鏈変袱鏉″叆闄㈣褰曘��
+ * 绗竴鏉★紙鎬ヨ瘖绉戝鐨勶級璁板綍缂哄皯鈥滃嚭闄㈡椂闂粹�濓紝瀵艰嚧璇ヨ褰曞湪缁熻涓缁堟樉绀轰负鈥滃湪闄⑩�濓紝
+ * 鑰岀浜屾潯锛堣浆鍏ョ瀹ょ殑锛夎褰曟槸瀹屾暣鐨勩�傛垜浠渶瑕侀噰闆� JZ_ZY_LiQiang鎺ュ彛鐨勬暟鎹紝
+ * 閲岄潰鐨勭鎶㈡椂闂存潵鍙嶅～绗竴鏉¤褰曠殑鈥滃嚭闄㈡椂闂粹�濓紝浠庤�屼慨姝ｇ涓�鏉¤褰曠殑鐘舵�併��
+ * @param dataMap
+ * @return
+ */
+ @Override
+ public Boolean editRescueFinishedOutHospInfo(Map dataMap) {
+ log.info("ServiceExternalServiceImpl---editRescueFinishedOutHospInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+ Map yeWuXX = (Map) dataMap.get("YeWuXX");
+ //鐥呬汉淇℃伅
+ Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
+ //灏辫瘖淇℃伅
+ Map<String, Object> JiuZhenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("JiuZhenXX") : null;
+
+ ExternalInHospPatientInfo externalInHospPatientInfo = BeanUtil.mapToBean(BingRenXX, ExternalInHospPatientInfo.class, true);
+ PatMedInhosp patMedInhosp = new PatMedInhosp();
+ patMedInhosp.setInhospno(externalInHospPatientInfo.getBingAnHao());
+ patMedInhosp.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID());
+ List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
+ PatMedInhosp patMedInhosp1 = null;
+ if (CollectionUtils.isNotEmpty(patMedInhospList)) patMedInhosp1 = patMedInhospList.get(0);
+ if(ObjectUtils.isNotEmpty(patMedInhosp1)){
+ if (ObjectUtils.isNotEmpty(JiuZhenXX.get("LiQiangSJ"))) {
+ try {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ patMedInhosp1.setEndtime(simpleDateFormat.parse(JiuZhenXX.get("LiQiangSJ").toString()));
+ patMedInhosp1.setUpdateTime(new Date());
+ int i = patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ if (i != 1) return false;
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
+ return true;
+ }else {
+ log.error("ServiceExternalServiceImpl---editRescueFinishedOutHospInfo鐨勬病鏈夋壘鍒板搴旂殑鍑洪櫌璁板綍锛歿}", dataMap);
+ return false;
+ }
+ }
@Override
public Boolean addFinshJZInfo(Map dataMap) {
log.info("ServiceExternalServiceImpl---addFinshJZInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
@@ -924,6 +1096,7 @@
pa.setAge2(ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
pa.setAgeUnit2(map.get("ageUnit2"));
patMedOuthosp1.setAge(pa.getAge() + pa.getAgeUnit() + pa.getAge2() + pa.getAgeUnit2());
+ patMedOuthosp1.setSex(patArchive.getSex());
patMedOuthosp1.setTelcode(patArchive.getTelcode());
patMedOuthosp1.setIdcardno(patArchive.getIdcardno());
}
@@ -1063,6 +1236,8 @@
icd10.setIcdcode(externalDiseaseInfo.getIcD10());
icd10.setDelFlag("0");
icd10.setOrgid(FaSongJGID);
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ icd10.setCampusid("1");
//閫氳繃icdCode鏌ヨ涓�涓嬶紝鏄惁瀛樺湪
List<Icd10> icd10s = icd10Mapper.selectIcd10List(icd10);
icd10.setHisIcdid(externalDiseaseInfo.getJiBingID());
@@ -1089,6 +1264,8 @@
ExternalWardArea externalWardArea = BeanUtil.mapToBean(bqxx, ExternalWardArea.class, true);
SysDept sysDept = new SysDept();
sysDept.setOrgid(externalWardArea.getZuZhiJGID());
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ sysDept.setCampusid("1");
sysDept.setHisDeptId(externalWardArea.getBingQuID());
sysDept.setDeptName(externalWardArea.getBingQuMC());
@@ -1196,6 +1373,8 @@
patMedOperation.setPatno(externalInHospPatientInfo.getBingRenID());
patMedOperation.setPatname(externalInHospPatientInfo.getXingMing());
patMedOperation.setOrgid(externalInHospPatientInfo.getZuZhiJGID());
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ patMedOperation.setCampusid("1");
patMedOperation.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID());
patMedOperation.setInhospno(externalInHospPatientInfo.getBingAnHao());
patMedOperation.setHospitalname(externalInHospPatientInfo.getZuZhiJGMC());
@@ -1259,6 +1438,8 @@
patMedOperationItem.setOpposition(externalOperationDetail.getShouShuBW());
patMedOperationItem.setDelFlag("0");
patMedOperationItem.setOrgid(patMedOperation.getOrgid());
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ patMedOperationItem.setCampusid("1");
if (externalOperationDetail.getZhuShouSBZ().equals("1") && addMianTableFalg == true) {
patMedOperation.setOpcode(externalOperationDetail.getShouShuMCID());
patMedOperation.setOpdesc(externalOperationDetail.getShouShuMC());
@@ -1293,6 +1474,8 @@
if (StringUtils.isEmpty(externalInHospPatientInfo.getZhengJianHM()))
patArchive.setIdcardno(externalInHospPatientInfo.getJiuZhenKH());
patArchive.setOrgid(externalInHospPatientInfo.getZuZhiJGID());
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ patArchive.setCampusid("1");
List<PatArchive> patArchives = null;
if (ObjectUtils.isNotEmpty(patArchive.getIdcardno()))
patArchives = patArchiveMapper.selectPatArchiveList(patArchive);
@@ -1355,6 +1538,8 @@
patArchivecontact.setPatid(patArchive.getId());
patArchivecontact.setContactname(external.getLianXiRXM());
patArchivecontact.setOrgid(patArchive.getOrgid());
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ patArchivecontact.setCampusid("1");
List<PatArchivecontact> patArchivecontacts = patArchivecontactMapper.selectPatArchivecontactList(patArchivecontact);
patArchivecontact.setContactway(external.getLianXiRDH());
patArchivecontact.setRelation(external.getGuanXiMC());
@@ -1390,6 +1575,8 @@
//杩欓噷鏄簥浣嶅悕绉拌繕鏄簥浣嶇紪鍙凤紵锛燂紵锛�
patMedInhosp.setBedNo(externalInHospPatientInfo.getDangQianCWMC());
patMedInhosp.setOrgid(externalInHospPatientInfo.getZuZhiJGID());
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ patMedInhosp.setCampusid("1");
patMedInhosp.setHospitaldistrictid(externalInHospPatientInfo.getDangQianBQID());
patMedInhosp.setGuid(externalInHospPatientInfo.getZuZhiJGID());
patMedInhosp.setInhospstate("0");
@@ -1506,6 +1693,8 @@
patMedInspection.setProjecttype(0);
}
patMedInspection.setOrgid(externalInHospPatientInfo.getZuZhiJGID());
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ patMedInspection.setCampusid("1");
patMedInspection.setInhospno(externalInHospPatientInfo.getBingAnHao());
patMedInspection.setPatidHis(externalInHospPatientInfo.getBingRenID());
patMedInspection.setPatname(externalInHospPatientInfo.getXingMing());
@@ -1588,6 +1777,8 @@
if (CollectionUtils.isNotEmpty(patMedInspections)) {
patMedInspection.setUpdateDate(new Date());
patMedInspection.setOrgid(ObjectUtils.isNotEmpty(xiaoXiTou) && ObjectUtils.isNotEmpty(xiaoXiTou.get("FaSongJGID")) ? xiaoXiTou.get("FaSongJGID").toString() : null);
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ patMedInspection.setCampusid("1");
// 鏇存柊鎿嶄綔
int i = patMedInspectionMapper.updatePatMedInspection(patMedInspection);
if (i != 1) return false;
@@ -1613,6 +1804,8 @@
PatMedInspection patMedInspection = new PatMedInspection();
PatMedInspectionItem patMedInspectionItem = new PatMedInspectionItem();
patMedInspection.setOrgid(BingRenXX.get("ZuZhiJGID").toString());
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ patMedInspection.setCampusid("1");
patMedInspection.setInhospno(BingRenXX.get("BingAnHao").toString());
patMedInspection.setPatidHis(BingRenXX.get("BingRenID").toString());
patMedInspection.setPatname(BingRenXX.get("XingMing").toString());
@@ -1628,6 +1821,8 @@
}
//妫�鏌ユ楠屾姤鍛婃暟鎹鐞�
patMedInspectionItem.setOrgid(BingRenXX.get("ZuZhiJGID").toString());
+ //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
+ patMedInspectionItem.setCampusid("1");
List<PatMedInspectionItem> patMedInspectionItems = patMedInspectionItemMapper.selectPatMedInspectionItemList(patMedInspectionItem);
if (ObjectUtils.isNotEmpty(JianChaBG)) {
patMedInspectionItem.setInspectionName(JianChaBG.get("JianChaHao").toString());
@@ -1744,6 +1939,9 @@
case "JG_YH_JiBenXX":
log.info("鐢ㄦ埛淇℃伅鍏ュ弬绫诲瀷涓猴細{}", type);
return addUserInfo(dataMap);
+ case "JG_YH_KeShiYH":
+ log.info("绉戝鐢ㄦ埛淇℃伅鍏ュ弬绫诲瀷涓猴細{}", type);
+ return addUserDeptInfo(dataMap);
case "fu_task":
log.info("fu_task鏈嶅姟鍏ュ弬绫诲瀷涓猴細{}", type);
return addTaskInfo(dataMap);
@@ -1774,6 +1972,9 @@
case "JZ_ZY_YuChuYuan":
log.info("鎮ｈ�呴鍑洪櫌鍏ュ弬绫诲瀷涓猴細{}", type);
return addPreOutHospInfo(dataMap);
+ case "JZ_ZY_LiQiang":
+ log.info("鎮ｈ�呯鎶㈠叆鍙傜被鍨嬩负锛歿}", type);
+ return editRescueFinishedOutHospInfo(dataMap);
case "JG_ZZ_BingQu":
log.info("鐥呭尯淇℃伅鍏ュ弬绫诲瀷涓猴細{}", type);
return addWardAreaInfo(dataMap);
--
Gitblit v1.9.3