From 4d537968ac6efb3a5e3d0f8ea5071d5254eb63c3 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期二, 29 七月 2025 14:37:17 +0800 Subject: [PATCH] 代码提交 --- smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 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 b6e641e..e4f500d 100644 --- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java +++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java @@ -396,6 +396,7 @@ //鏂板鎮h�呭熀鏈俊鎭柊澧炴垨淇敼 PatArchive patArchive = addPatArchive(externalInHospPatientInfo, externalInHospPatientAddrInfo, externalInHospPatientLiaisonInfo); + PatMedInhosp patMedInhosp = new PatMedInhosp(); patMedInhosp.setInhospno(externalInHospPatientInfo.getBingAnHao()); patMedInhosp.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID()); @@ -939,12 +940,13 @@ // 4. 鏂板缓(姝ゆ椂鍙墿鍐疯〃锛孭atMedOuthosp娌′簡锛岄渶瑕佹柊寤轰竴涓�) patMedOuthospMapper.createPatMedOuthosp(newName, oldName); - //璁剧疆鏂拌〃鑷涓婚敭 + + //5.璁剧疆鏂拌〃鑷涓婚敭 patMedOuthospMapper.createPatMedOuthospAutoAdd(oldName); - // 5. 璁剧疆鏂拌〃鑷璧峰鍊� + //6. 璁剧疆鏂拌〃鑷璧峰鍊� patMedOuthospMapper.setAutoIncrement(oldName, maxId + 1); - // 6. 鏇存柊/鏂板缓瑙嗗浘 + // 7. 鏇存柊/鏂板缓瑙嗗浘 // 閲嶆柊鑾峰彇鎵�鏈夎〃鍚嶏紙鍖呭惈鍒氭柊寤虹殑涓昏〃锛� List<String> allTables = patMedOuthospMapper.getAllOuthospTableNames(); StringBuilder sb = new StringBuilder(); @@ -1197,6 +1199,9 @@ PatArchive patArchive = new PatArchive(); //濡傛灉鏄垰鍑虹敓鐨勫皬瀛╁瓙锛屾槸娌℃湁韬唤璇佺殑锛屾�庝箞澶勭悊锛燂紵锛燂紵锛燂紵锛燂紵 patArchive.setIdcardno(externalInHospPatientInfo.getZhengJianHM()); + //濡傛灉韬唤璇佷负绌虹殑璇濓紝灏辩敤灏辫瘖鍗″彿浠f浛 + if (StringUtils.isEmpty(externalInHospPatientInfo.getZhengJianHM())) + patArchive.setIdcardno(externalInHospPatientInfo.getJiuZhenKH()); patArchive.setOrgid(externalInHospPatientInfo.getZuZhiJGID()); List<PatArchive> patArchives = null; if (ObjectUtils.isNotEmpty(patArchive.getIdcardno())) -- Gitblit v1.9.3