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 a2774b2..f405747 100644
--- a/src/main/java/com/docus/server/collection/dto/TBasicDto.java
+++ b/src/main/java/com/docus/server/collection/dto/TBasicDto.java
@@ -34,4 +34,5 @@ public class TBasicDto {
private String admissDays;
private String wardCode;
private String wardName;
+ private String sdryIndex;
}
diff --git a/src/main/java/com/docus/server/collection/entity/TBasicExtend.java b/src/main/java/com/docus/server/collection/entity/TBasicExtend.java
index 7c36569..fa6a227 100644
--- a/src/main/java/com/docus/server/collection/entity/TBasicExtend.java
+++ b/src/main/java/com/docus/server/collection/entity/TBasicExtend.java
@@ -33,4 +33,7 @@ public class TBasicExtend implements Serializable {
@ApiModelProperty(value = "病区名称")
private String wardName;
+
+ @ApiModelProperty(value = "第三方索引")
+ private String sdryIndex;
}
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 0702d1b..9cae1cc 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
@@ -105,6 +105,7 @@ public class TBasicServiceImpl implements ITBasicService {
tBasicExtend.setPatientId(patientId.toString());
tBasicExtend.setWardCode(tBasicDto.getWardCode());
tBasicExtend.setWardName(tBasicDto.getWardName());
+ tBasicExtend.setSdryIndex(tBasicDto.getSdryIndex());
//持久化
tBasicMapper.insert(tBasic);
@@ -183,6 +184,7 @@ public class TBasicServiceImpl implements ITBasicService {
tBasicExtend.setPatientId(patientId);
tBasicExtend.setWardCode(tBasicDto.getWardCode());
tBasicExtend.setWardName(tBasicDto.getWardName());
+ tBasicExtend.setSdryIndex(tBasicDto.getSdryIndex());
//持久化
tBasicMapper.update(tBasic);
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 db614d2..901a680 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
@@ -205,7 +205,12 @@ public class BasicServiceImpl implements BasicService {
if(Func.isNotEmpty(wardNameNode)){
wardName=wardNameNode.getTextContent();
}
-
+ //顺德人医第三方索引
+ String sdryIndex=null;
+ Node sdryIndexNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/subject/patient/id/item/@extension");
+ if(Func.isNotEmpty(sdryIndexNode)){
+ sdryIndex=sdryIndexNode.getNodeValue();
+ }
//设置dto
TBasicDto dto=new TBasicDto();
@@ -231,6 +236,7 @@ public class BasicServiceImpl implements BasicService {
dto.setAdmissDays(admissDays);
dto.setWardCode(wardCode);
dto.setWardName(wardName);
+ dto.setSdryIndex(sdryIndex);
return dto;
}
@@ -368,7 +374,12 @@ public class BasicServiceImpl implements BasicService {
if(Func.isNotEmpty(wardNameNode)){
wardName=wardNameNode.getTextContent();
}
-
+ //顺德人医第三方索引
+ String sdryIndex=null;
+ Node sdryIndexNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/subject/patient/id/item/@extension");
+ if(Func.isNotEmpty(sdryIndexNode)){
+ sdryIndex=sdryIndexNode.getNodeValue();
+ }
//设置dto
TBasicDto dto=new TBasicDto();
@@ -394,6 +405,7 @@ public class BasicServiceImpl implements BasicService {
dto.setAdmissDays(admissDays);
dto.setWardCode(wardCode);
dto.setWardName(wardName);
+ dto.setSdryIndex(sdryIndex);
return dto;
}
diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml
index 0a06bee..1a74554 100644
--- a/src/main/resources/bootstrap.yml
+++ b/src/main/resources/bootstrap.yml
@@ -28,7 +28,7 @@ spring:
redis:
host: redis.docus.cn
- password: JSdocus@702
+# password: JSdocus@702
cloud:
nacos:
discovery:
diff --git a/src/main/resources/mapper/TBasicMapper.xml b/src/main/resources/mapper/TBasicMapper.xml
index e962b07..569191b 100644
--- a/src/main/resources/mapper/TBasicMapper.xml
+++ b/src/main/resources/mapper/TBasicMapper.xml
@@ -24,9 +24,9 @@
INSERT INTO `docus_medicalrecord`.`t_basic_extend`
- (`patient_id`,`ward_code`,`ward_name`)
+ (`patient_id`,`ward_code`,`ward_name`,`sdry_index`)
VALUES
- (#{tBasicExtend.patientId},#{tBasicExtend.wardCode},#{tBasicExtend.wardName})
+ (#{tBasicExtend.patientId},#{tBasicExtend.wardCode},#{tBasicExtend.wardName},#{tBasicExtend.sdryIndex})
@@ -86,16 +86,14 @@
- UPDATE `docus_medicalrecord`.`t_basic_extend`
-
-
- `ward_code`=#{tBasicExtend.wardCode},
-
-
- `ward_name`=#{tBasicExtend.wardName},
-
-
- WHERE `patient_id`=#{tBasicExtend.patientId};
+ INSERT INTO `docus_medicalrecord`.`t_basic_extend`
+ (`patient_id`,`ward_code`,`ward_name`,`sdry_index`)
+ VALUES
+ (#{tBasicExtend.patientId},#{tBasicExtend.wardCode},#{tBasicExtend.wardName},#{tBasicExtend.sdryIndex})
+ on DUPLICATE KEY UPDATE
+ `ward_code`=#{tBasicExtend.wardCode},
+ `ward_name`=#{tBasicExtend.wardName},
+ `sdry_index`=#{tBasicExtend.sdryIndex}