diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/empi/domain/EmpiPerson.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/empi/domain/EmpiPerson.java
index 9e9eeee70..a957af7fc 100644
--- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/empi/domain/EmpiPerson.java
+++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/empi/domain/EmpiPerson.java
@@ -1,14 +1,37 @@
package com.healthlink.his.empi.domain;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.baomidou.mybatisplus.annotation.*;
import com.core.common.core.domain.HisBaseEntity;
-import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
import java.util.Date;
-@Data @TableName("empi_person") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false)
+
+@Data
+@TableName("empi_person")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
public class EmpiPerson extends HisBaseEntity {
- @TableId(type = IdType.ASSIGN_ID) private Long id;
- private String globalId; private String idCardNo; private String name;
- private String gender; private Date birthDate; private String phone;
- private String mergeStatus; private String sourceSystem;
+ @TableId(type = IdType.ASSIGN_ID)
+ private Long id;
+ @TableField("global_id")
+ private String globalId;
+ @TableField("id_card_no")
+ private String idCardNo;
+ @TableField("patient_name")
+ private String name;
+ @TableField("gender")
+ private String gender;
+ @TableField("birth_date")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date birthDate;
+ @TableField("phone")
+ private String phone;
+ @TableField("address")
+ private String address;
+ @TableField("merge_status")
+ private String mergeStatus;
+ @TableField("source_system")
+ private String sourceSystem;
}
diff --git a/healthlink-his-ui/src/views/empienhanced/api.js b/healthlink-his-ui/src/views/empienhanced/api.js
index decc88fd4..273ad72f5 100644
--- a/healthlink-his-ui/src/views/empienhanced/api.js
+++ b/healthlink-his-ui/src/views/empienhanced/api.js
@@ -1,8 +1,17 @@
import request from '@/utils/request'
-export function getPhotos(p){return request({url:'/empi-enhanced/photo/list',method:'get',params:p})}
-export function addPhoto(d){return request({url:'/empi-enhanced/photo/add',method:'post',data:d})}
-export function getFamilyMembers(p){return request({url:'/empi-enhanced/family/list',method:'get',params:p})}
-export function addFamilyMember(d){return request({url:'/empi-enhanced/family/add',method:'post',data:d})}
-export function deleteFamilyMember(id){return request({url:'/empi-enhanced/family/delete',method:'delete',params:{id}})}
-export function getMergeLogPage(p){return request({url:'/empi-enhanced/merge-log/page',method:'get',params:p})}
-export function addMergeLog(d){return request({url:'/empi-enhanced/merge-log/add',method:'post',data:d})}
+
+export function registerPerson(data) { return request({ url: '/healthlink-his/api/v1/empi/person', method: 'post', data }) }
+export function mergePersons(primaryId, secondaryIds) { return request({ url: '/healthlink-his/api/v1/empi/merge', method: 'post', params: { primaryId, secondaryIds: secondaryIds.join(',') } }) }
+export function findByGlobalId(globalId) { return request({ url: '/healthlink-his/api/v1/empi/person/global/' + globalId, method: 'get' }) }
+export function findByIdCard(idCardNo) { return request({ url: '/healthlink-his/api/v1/empi/person/idcard/' + idCardNo, method: 'get' }) }
+export function getMappings(globalId) { return request({ url: '/healthlink-his/api/v1/empi/mappings/' + globalId, method: 'get' }) }
+export function getStatistics() { return request({ url: '/healthlink-his/api/v1/empi/statistics', method: 'get' }) }
+
+export function getPhotos(patientId) { return request({ url: '/empi-enhanced/photo/list', method: 'get', params: { patientId } }) }
+export function addPhoto(data) { return request({ url: '/empi-enhanced/photo/add', method: 'post', data }) }
+export function getFamilyMembers(patientId) { return request({ url: '/empi-enhanced/family/list', method: 'get', params: { patientId } }) }
+export function addFamilyMember(data) { return request({ url: '/empi-enhanced/family/add', method: 'post', data }) }
+export function deleteFamilyMember(id) { return request({ url: '/empi-enhanced/family/delete', method: 'delete', params: { id } }) }
+export function getMergeLogPage(params) { return request({ url: '/empi-enhanced/merge-log/page', method: 'get', params }) }
+export function addMergeLog(data) { return request({ url: '/empi-enhanced/merge-log/add', method: 'post', data }) }
+export function undoMergeLog(data) { return request({ url: '/empi-enhanced/merge-log/undo', method: 'post', data }) }
diff --git a/healthlink-his-ui/src/views/empienhanced/merge/index.vue b/healthlink-his-ui/src/views/empienhanced/merge/index.vue
new file mode 100644
index 000000000..543f5f045
--- /dev/null
+++ b/healthlink-his-ui/src/views/empienhanced/merge/index.vue
@@ -0,0 +1,54 @@
+
+
+
+ 患者合并管理
+
+
+
+
+ 合并
+
+
+
+
+ 合并日志
+
+
+
+
+
+
+
+ {{ s.row.status === 'ACTIVE' ? '有效' : '已撤销' }}
+
+
+
+ 撤销
+
+
+
+
+
+
+
+
diff --git a/healthlink-his-ui/src/views/empienhanced/patient/index.vue b/healthlink-his-ui/src/views/empienhanced/patient/index.vue
new file mode 100644
index 000000000..71db9a7cf
--- /dev/null
+++ b/healthlink-his-ui/src/views/empienhanced/patient/index.vue
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
+
+
+ 患者主索引管理
+ 注册患者
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+ {{ patientData.globalId }}
+ {{ patientData.patientName }}
+ {{ patientData.gender === 'M' ? '男' : '女' }}
+ {{ patientData.birthDate }}
+ {{ patientData.idCardNo }}
+ {{ patientData.phone }}
+ {{ patientData.address }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+
+
+
+
+ EMPI统计概览
+
+
+
+
+
+
+
+
+
+