From f55c563e2a0b52e4569ce6b5f81632cac598f7fe Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 30 十月 2024 18:36:55 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/ServiceThirdDataServiceImpl.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceThirdDataServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceThirdDataServiceImpl.java
index cd5a2f3..d4122ac 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceThirdDataServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceThirdDataServiceImpl.java
@@ -45,9 +45,9 @@
     @Override
     public List<ServiceThirdData> queryList(ServiceThirdData serviceThirdData) {
 
-        log.info("------serviceThirdData鐨勫叆鍙傦細{}", serviceThirdData);
+        log.error("------serviceThirdData鐨勫叆鍙傦細{}", serviceThirdData);
         List<ServiceThirdData> serviceThirdDataList = serviceThirdDataMapper.selectServiceThirdDataList(serviceThirdData);
-        log.info("------serviceThirdDataList鑾峰彇鏁版嵁鐨勬暟閲忥細{}", serviceThirdDataList.size());
+        log.error("------serviceThirdDataList鑾峰彇鏁版嵁鐨勬暟閲忥細{}", serviceThirdDataList.size());
         for (ServiceThirdData std : serviceThirdDataList) {
             PipeParser parser = new PipeParser();
             Message message = null;
@@ -72,7 +72,7 @@
                 hospitalUserinfo.setCreateTime(formattedDate);
 
                 //鍙湁鍏ラ櫌鎵嶄細寰�userInfo閲屽啓鐢ㄦ埛淇℃伅
-                if (serviceThirdData.getDataType().equals("ADT^A01") && StringUtils.isNotBlank(hospitalUserinfo.getPatientID())) {
+                if (serviceThirdData.getDataType().equals("ADT^A03") && StringUtils.isNotBlank(hospitalUserinfo.getPatientID())) {
                     //鍏堝垽鏂竴涓嬶紝patientid鏄惁宸茬粡鍦ㄨ〃涓瓨鍦紝濡傛灉瀛樺湪锛屽氨涓嶆彃鍏ヤ簡锛屼笉瀛樺湪锛屽氨鎻掑叆
                     HospitalUserinfo hospitalUserinfo1 = new HospitalUserinfo();
                     hospitalUserinfo1.setPatientID(hospitalUserinfo.getPatientID());
@@ -81,11 +81,12 @@
                         iHospitalUserinfoService.insertHospitalUserinfo(hospitalUserinfo);
                     } else {
                         iHospitalUserinfoService.updateHospitalUserinfoByPatientID(hospitalUserinfo);
+                        hospitalUserinfo.setID(hospitalUserinfos.get(0).getID());
                     }
                 }
 
                 HospitalRecord hospitalRecord = (HospitalRecord) objectList.get(0);
-                log.info("hospitalRecord鐨勫�间负锛歿}", hospitalRecord);
+                log.error("hospitalRecord鐨勫�间负锛歿}", hospitalRecord);
                 //濡傛灉patientid涓虹┖锛屽啀瀛榬ecord灏辨垚鑴忔暟鎹簡
                 if (StringUtils.isNotBlank(hospitalUserinfo.getPatientID())) {
                     hospitalRecord.setMessageID(std.getId().toString());
@@ -97,8 +98,10 @@
                 if (StringUtils.isEmpty(hospitalUserinfo.getPatientID())) {
                     serviceThirdData2.setRemark("PatientID涓虹┖");
                 }
+                serviceThirdData2.setUserInfoId(hospitalUserinfo.getID());
+                log.error("serviceThirdData2鐨勫弬鏁帮細{}", serviceThirdData2);
                 int ii = serviceThirdDataMapper.updateIsDeal(serviceThirdData2);
-                System.out.println("鏄惁淇敼鎴愬姛锛�" + ii);
+                log.error("鏄惁淇敼鎴愬姛锛歿}", ii);
             } catch (HL7Exception e) {
                 e.printStackTrace();
             }

--
Gitblit v1.9.3