From c466328ae0389f01ba2413fd75182ba799dba8f6 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 20 三月 2024 15:11:46 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/ServiceThirdData.java | 6 ++++++
smartor/src/main/java/com/smartor/yiwudataanalysis/ADT_A01.java | 8 +++++---
smartor/src/main/java/com/smartor/service/impl/ServiceThirdDataServiceImpl.java | 4 +++-
smartor/src/main/resources/mapper/smartor/ServiceThirdDataMapper.xml | 3 +++
smartor/src/main/java/com/smartor/yiwudataanalysis/ADT_A03.java | 6 ++++--
5 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceThirdData.java b/smartor/src/main/java/com/smartor/domain/ServiceThirdData.java
index b6f486f..60d77b6 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceThirdData.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceThirdData.java
@@ -75,6 +75,12 @@
@ApiModelProperty("澶囨敞")
@Excel(name = "澶囨敞")
private String remark;
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty("澶囨敞")
+ @Excel(name = "澶囨敞")
+ private Long userInfoId;
}
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..abd1101 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceThirdDataServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceThirdDataServiceImpl.java
@@ -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,6 +81,7 @@
iHospitalUserinfoService.insertHospitalUserinfo(hospitalUserinfo);
} else {
iHospitalUserinfoService.updateHospitalUserinfoByPatientID(hospitalUserinfo);
+ hospitalUserinfo.setID(hospitalUserinfos.get(0).getID());
}
}
@@ -97,6 +98,7 @@
if (StringUtils.isEmpty(hospitalUserinfo.getPatientID())) {
serviceThirdData2.setRemark("PatientID涓虹┖");
}
+ serviceThirdData2.setUserInfoId(hospitalUserinfo.getID());
int ii = serviceThirdDataMapper.updateIsDeal(serviceThirdData2);
System.out.println("鏄惁淇敼鎴愬姛锛�" + ii);
} catch (HL7Exception e) {
diff --git a/smartor/src/main/java/com/smartor/yiwudataanalysis/ADT_A01.java b/smartor/src/main/java/com/smartor/yiwudataanalysis/ADT_A01.java
index e1be69f..eb26c96 100644
--- a/smartor/src/main/java/com/smartor/yiwudataanalysis/ADT_A01.java
+++ b/smartor/src/main/java/com/smartor/yiwudataanalysis/ADT_A01.java
@@ -22,7 +22,7 @@
import java.util.Date;
import java.util.List;
-//鍑洪櫌鏁版嵁
+//鍏ラ櫌鏁版嵁
public class ADT_A01 {
//瑙ｆ瀽PID
public List<Object> explainPID(Message message, String dataInfo) throws HL7Exception {
@@ -463,7 +463,8 @@
//鏁版嵁鍏ュ簱
HospitalRecord hospitalRecord = new HospitalRecord();
hospitalRecord.setCreateTime(new Date());
- hospitalRecord.setPatientID(patientID);
+// hospitalRecord.setPatientID(patientID);
+ hospitalRecord.setPatientID(id1);
hospitalRecord.setOpreationTime(new Date());
//灏辫瘖鍙�
hospitalRecord.setOutMedNO(id1);
@@ -499,7 +500,8 @@
HospitalUserinfo hospitalUserinfo = new HospitalUserinfo();
// hospitalUserinfo.setCreateTime(null);
- hospitalUserinfo.setPatientID(patientID);
+// hospitalUserinfo.setPatientID(patientID);
+ hospitalUserinfo.setPatientID(id1);
hospitalUserinfo.setRegDate(rkdate);
hospitalUserinfo.setIdentityID(SSNNumberPatient);
hospitalUserinfo.setPatName(patientName);
diff --git a/smartor/src/main/java/com/smartor/yiwudataanalysis/ADT_A03.java b/smartor/src/main/java/com/smartor/yiwudataanalysis/ADT_A03.java
index 9b599c2..7e1505f 100644
--- a/smartor/src/main/java/com/smartor/yiwudataanalysis/ADT_A03.java
+++ b/smartor/src/main/java/com/smartor/yiwudataanalysis/ADT_A03.java
@@ -425,7 +425,8 @@
//鏁版嵁鍏ュ簱
HospitalRecord hospitalRecord = new HospitalRecord();
hospitalRecord.setCreateTime(new Date());
- hospitalRecord.setPatientID(patientID);
+// hospitalRecord.setPatientID(patientID);
+ hospitalRecord.setPatientID(id1);
hospitalRecord.setOpreationTime(new Date());
//灏辫瘖鍙�
hospitalRecord.setOutMedNO(id1);
@@ -462,7 +463,8 @@
HospitalUserinfo hospitalUserinfo = new HospitalUserinfo();
// hospitalUserinfo.setCreateTime(null);
- hospitalUserinfo.setPatientID(patientID);
+// hospitalUserinfo.setPatientID(patientID);
+ hospitalUserinfo.setPatientID(id1);
hospitalUserinfo.setRegDate(rkdate);
hospitalUserinfo.setIdentityID(SSNNumberPatient);
hospitalUserinfo.setPatName(patientName);
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceThirdDataMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceThirdDataMapper.xml
index afaf329..3b79ba3 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceThirdDataMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceThirdDataMapper.xml
@@ -12,6 +12,7 @@
<result property="factory" column="factory"/>
<result property="createTime" column="create_time"/>
<result property="isDeal" column="is_deal"/>
+ <result property="userInfoId" column="user_info_id"/>
</resultMap>
<sql id="selectServiceThirdDataVo">
@@ -22,6 +23,7 @@
factory,
create_time,
is_deal,
+ user_info_id,
remark
from service_third_data
</sql>
@@ -104,6 +106,7 @@
update service_third_data
<trim prefix="SET" suffixOverrides=",">
is_deal=1,
+ user_info_id=#{userInfoId}
<if test="remark != null and remark != ''">remark = #{remark}</if>
</trim>
where id = #{id}
--
Gitblit v1.9.3