diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java index a4413ea0d..097c944f2 100644 --- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java @@ -143,6 +143,9 @@ public class SysWorkplaceResponse { @TableField(value = "workPlaceClass") private Integer workPlaceClass; + + private Integer productType; + private String queueStatus; /** diff --git a/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java b/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java index 6757eba25..c45260db2 100644 --- a/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java @@ -85,4 +85,9 @@ public class UserWorkResponse { private Integer queueStatus; + /** + * 1 器械业务 2药品业务 + */ + private Integer productType; + } diff --git a/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml index 5eecdd037..bd8e85804 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml @@ -14,7 +14,9 @@ sw.workplaceStatus, sw.workplaceType, sw.invRemindNumber, - sw.workPlaceClass,sw.queueStatus, + sw.workPlaceClass, + sw.queueStatus, + sw.productType, ad.name deptCodeName from basic_collect_user bcu left join auth_user au on bcu.userId = au.id