From a759cc61ab81dd2b3f6a9a6b43d33e31d5d19a2f Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Thu, 12 Mar 2026 15:55:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LtHisConnectionServiceImpl.java | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/LtHisConnectionServiceImpl.java b/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/LtHisConnectionServiceImpl.java index b84341c..fb30b72 100644 --- a/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/LtHisConnectionServiceImpl.java +++ b/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/LtHisConnectionServiceImpl.java @@ -28,10 +28,7 @@ import com.ccsens.common.utils.SecurityUtils; import com.ccsens.framework.datasource.DynamicDataSourceContextHolder; import com.ccsens.system.domain.SysUserRole; import com.ccsens.system.domain.dto.PmsPatientDto; -import com.ccsens.system.domain.po.PmsPatient; -import com.ccsens.system.domain.po.PmsPatientBody; -import com.ccsens.system.domain.po.PmsPatientBodyExample; -import com.ccsens.system.domain.po.PmsPatientExample; +import com.ccsens.system.domain.po.*; import com.ccsens.system.domain.vo.PmsPatientVo; import com.ccsens.system.persist.mapper.*; import lombok.extern.slf4j.Slf4j; @@ -173,7 +170,7 @@ public class LtHisConnectionServiceImpl implements ILtHisConnectionService { if (CollUtil.isEmpty(pmsPatientBodies)) { Map>> patientOtherMsgByCardNo = getPatientOtherMsgByCardNo(visitNo, cardNo, patientByCardNo.getPatientId()); log.info("查询其他信息成功:{}", patientOtherMsgByCardNo); - addOtherMsg(patientOtherMsgByCardNo, patientByCardNo); +// addOtherMsg(patientOtherMsgByCardNo, patientByCardNo); } } catch (Exception e) { log.error("获取患者其他信息失败", e); @@ -277,6 +274,10 @@ public class LtHisConnectionServiceImpl implements ILtHisConnectionService { @Override public Map>> getPatientOtherMsgByCardNo(String visitNo, String cardNo, Long patientId) { + PmsPatientPersonal pmsPatientPersonal = new PmsPatientPersonal(); + PmsPatientBody pmsPatientBody = new PmsPatientBody(); + + //1.查询所有需要的信息 Map params = new HashMap<>(); params.put("cardNo", cardNo); @@ -321,14 +322,6 @@ public class LtHisConnectionServiceImpl implements ILtHisConnectionService { Map drinkMap = extractDrinkInfo((String) item.get("是否饮酒")); personal.putAll(smokingMap); personal.putAll(drinkMap); -// personal.put("smokingHistory", item.get("是否吸烟")); -// personal.put("smokingYear", item.get("吸烟年限")); -// personal.put("smokingQuit", item.get("是否戒烟")); -// personal.put("smokingQuitYear", item.get("戒烟年限")); -// personal.put("drinkHistory", item.get("是否饮酒")); -// personal.put("drinkYear", item.get("饮酒年限")); -// personal.put("drinkQuit", item.get("是否戒酒")); -// personal.put("drinkQuitYear", item.get("戒酒年限")); } // 过敏信息 - 也放入PmsPatientPersonal if (CollUtil.isNotEmpty(gmxx)) {