From 7d5a6a5b3352c535a85fe30a64c82b67cdfd83ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=87=E5=AE=99=E7=9A=AE=E7=9A=AE=E5=A8=83?=
<2964346877@qq.com>
Date: Wed, 26 Apr 2023 09:04:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=82=A3=E8=80=85=E5=9F=BA=E7=A1=80=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E5=85=A5=E5=8F=82=E4=B8=BB=E7=AE=A1=E5=8C=BB=E7=94=9F?=
=?UTF-8?q?=E5=B7=A5=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/docus/server/collection/dto/TBasicDto.java | 1 +
.../collection/service/impl/TBasicServiceImpl.java | 2 ++
.../webservice/impl/BasicServiceImpl.java | 14 ++++++++++++++
src/main/resources/mapper/TBasicMapper.xml | 7 +++++--
4 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/docus/server/collection/dto/TBasicDto.java b/src/main/java/com/docus/server/collection/dto/TBasicDto.java
index f405747..b33d641 100644
--- a/src/main/java/com/docus/server/collection/dto/TBasicDto.java
+++ b/src/main/java/com/docus/server/collection/dto/TBasicDto.java
@@ -24,6 +24,7 @@ public class TBasicDto {
private String admissDeptName ;
private String disDeptName ;
private String attendingName;
+ private String attending;
private String age;
private String sex;
private String idCard;
diff --git a/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java b/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java
index 9cae1cc..7909f14 100644
--- a/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java
+++ b/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java
@@ -91,6 +91,7 @@ public class TBasicServiceImpl implements ITBasicService {
tBasic.setDisDate(disDate);
tBasic.setAdmissDeptName(tBasicDto.getAdmissDeptName());
tBasic.setDisDeptName(tBasicDto.getDisDeptName());
+ tBasic.setAttending(tBasicDto.getAttending());
tBasic.setAttendingName(tBasicDto.getAttendingName());
tBasic.setAge(age);
tBasic.setSex(tBasicDto.getSex());
@@ -170,6 +171,7 @@ public class TBasicServiceImpl implements ITBasicService {
tBasic.setDisDate(disDate);
tBasic.setAdmissDeptName(tBasicDto.getAdmissDeptName());
tBasic.setDisDeptName(tBasicDto.getDisDeptName());
+ tBasic.setAttending(tBasicDto.getAttending());
tBasic.setAttendingName(tBasicDto.getAttendingName());
tBasic.setAge(age);
tBasic.setSex(tBasicDto.getSex());
diff --git a/src/main/java/com/docus/server/collection/webservice/impl/BasicServiceImpl.java b/src/main/java/com/docus/server/collection/webservice/impl/BasicServiceImpl.java
index 901a680..82e08be 100644
--- a/src/main/java/com/docus/server/collection/webservice/impl/BasicServiceImpl.java
+++ b/src/main/java/com/docus/server/collection/webservice/impl/BasicServiceImpl.java
@@ -140,6 +140,12 @@ public class BasicServiceImpl implements BasicService {
disDeptName=disDeptNameNode.getTextContent();
}
//主治医师[]
+ String attending=null;
+ Node attendingNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/authenticator[@displayName='主治医师']/assignedEntity/id/@extension");
+ if(Func.isNotEmpty(attendingNode)){
+ attending=attendingNode.getTextContent();
+ }
+ //主治医师[]
String attendingName=null;
Node attendingNameNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/authenticator[@displayName='主治医师']/assignedEntity/assignedPerson/name");
if(Func.isNotEmpty(attendingNameNode)){
@@ -225,6 +231,7 @@ public class BasicServiceImpl implements BasicService {
dto.setAdmissDate(admissDate);
dto.setDisDate(disDate);
dto.setAdmissTimes(admissTimes);
+ dto.setAttending(attending);
dto.setAttendingName(attendingName);
dto.setAge(age);
dto.setSex(sex);
@@ -309,6 +316,12 @@ public class BasicServiceImpl implements BasicService {
disDeptName=disDeptNameNode.getTextContent();
}
//主治医师[]
+ String attending=null;
+ Node attendingNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/authenticator[@displayName='主治医师']/assignedEntity/id/@extension");
+ if(Func.isNotEmpty(attendingNode)){
+ attending=attendingNode.getTextContent();
+ }
+ //主治医师[]
String attendingName=null;
Node attendingNameNode = xml.getNode("/PRPA_HIP0033/controlActProcess/subject/encounterEvent/authenticator[@displayName='主治医师']/assignedEntity/assignedPerson/name");
if(Func.isNotEmpty(attendingNameNode)){
@@ -394,6 +407,7 @@ public class BasicServiceImpl implements BasicService {
dto.setAdmissDate(admissDate);
dto.setDisDate(disDate);
dto.setAdmissTimes(admissTimes);
+ dto.setAttending(attending);
dto.setAttendingName(attendingName);
dto.setAge(age);
dto.setSex(sex);
diff --git a/src/main/resources/mapper/TBasicMapper.xml b/src/main/resources/mapper/TBasicMapper.xml
index 6f91abb..b61a642 100644
--- a/src/main/resources/mapper/TBasicMapper.xml
+++ b/src/main/resources/mapper/TBasicMapper.xml
@@ -15,12 +15,12 @@
INSERT INTO `docus_medicalrecord`.`t_basic`
- (`admiss_days`,`is_dead`,`sex_name`,`bed_num`,`age`,`sex`,`id_card`,`dis_dept`,`patient_id`, `admiss_times`, `inpatient_no`,`name`, `admiss_date`, `admiss_dept_name`, `dis_date`, `dis_dept_name`,`attending_name`,`jzh`,`create_time`)
+ (`admiss_days`,`is_dead`,`sex_name`,`bed_num`,`age`,`sex`,`id_card`,`dis_dept`,`patient_id`, `admiss_times`, `inpatient_no`,`name`, `admiss_date`, `admiss_dept_name`, `dis_date`, `dis_dept_name`,`attending`,`attending_name`,`jzh`,`create_time`)
VALUES
(#{tBasic.admissDays},#{tBasic.isDead},#{tBasic.sexName},#{tBasic.bedNum},#{tBasic.age},#{tBasic.sex},#{tBasic.idCard},
#{tBasic.disDept},#{tBasic.patientId},#{tBasic.admissTimes},#{tBasic.inpatientNo},
#{tBasic.name},#{tBasic.admissDate},#{tBasic.admissDeptName},#{tBasic.disDate},#{tBasic.disDeptName},
- #{tBasic.attendingName},#{tBasic.jzh},now())
+ #{tBasic.attending},#{tBasic.attendingName},#{tBasic.jzh},now())
INSERT INTO `docus_medicalrecord`.`t_basic_extend`
@@ -77,6 +77,9 @@
`dis_dept_name`=#{tBasic.disDeptName},
+
+ `attending`=#{tBasic.attending},
+
`attending_name`=#{tBasic.attendingName},