Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java =================================================================== diff -u -r32340 -r32467 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 32340) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 32467) @@ -770,23 +770,13 @@ private String tousseNameAlias; /** - * 核对状态(GDSZYY-102) - * 1、目前只用于代理灭菌单上物品的核对; - * 2、一级供应室打开在装配记录里生成的代理灭菌单扫描就是核对; - * 3、核对状态为"已核对"的代理灭菌单物品,才能录入灭菌记录。 + * 接收状态(GDSZYY-102),"待接收"的物品,字段值为“否” + * 1、目前只用于代理灭菌单上物品的接收核对; + * 2、一级供应室打开在装配记录里生成的代理灭菌单扫描就是接收; + * 3、"已接收"的代理灭菌单物品,才能录入灭菌记录。 */ - private String checkStatus; + private String hasReceived; - /** - * 已核对 - */ - public static final String STATUS_CHECKED = "已核对"; - - /** - * 待核对(代理灭菌物品需要核对后,再灭菌) - */ - public static final String STATUS_UNCHECKED = "待核对"; - public static final String[] filterProperties = { "handler", "hibernateLazyInitializer", "fieldHandler", "materialInstances", "sterilizationRecords", "isUploadImage", "isUploadVideo", "images", @@ -2770,12 +2760,20 @@ this.tousseNameAlias = tousseNameAlias; } - public String getCheckStatus() { - return checkStatus; + public String getHasReceived() { + return hasReceived; } - - public void setCheckStatus(String checkStatus) { - this.checkStatus = checkStatus; + + public void setHasReceived(String hasReceived) { + this.hasReceived = hasReceived; } + + @Transient + public String hasReceived(){ + if(StringUtils.equals(Constants.STR_NO,hasReceived)){ + return Constants.STR_NO; + } + return Constants.STR_YES; + } } \ No newline at end of file