暂存

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.*;
-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.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<String, List<Map<String, Object>>> 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<String, List<Map<String, Object>>> getPatientOtherMsgByCardNo(String visitNo, String cardNo, Long patientId) {
+        PmsPatientPersonal pmsPatientPersonal = new PmsPatientPersonal();
+        PmsPatientBody pmsPatientBody = new PmsPatientBody();
+
+
         //1.查询所有需要的信息
         Map<String, Object> params = new HashMap<>();
         params.put("cardNo", cardNo);
@@ -321,14 +322,6 @@ public class LtHisConnectionServiceImpl implements ILtHisConnectionService {
             Map<String, Object> 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)) {