Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingRecord.java =================================================================== diff -u -r17763 -r18759 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingRecord.java (.../RecyclingRecord.java) (revision 17763) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingRecord.java (.../RecyclingRecord.java) (revision 18759) @@ -41,9 +41,11 @@ public class RecyclingRecord { private Long id; + /** + * 回收时间 + */ + private Date recyclingTime; - private Date recyclingTime; // 回收时间 - /** * 申请科室的名称 */ @@ -53,35 +55,48 @@ * 申请科室的编码 */ private String departCode; + /** + * 操作员,就是页面上的清点人 + */ + private String operator; + /** + * 未确认、已确认 + */ + private String status = STATUS_SAVED; - private String operator; // 操作员 - - private String status = STATUS_SAVED; // 未确认、已确认 - public static final String STATUS_CONFIRMED = "已确认"; public static final String STATUS_UNCONFIRMED = "未确认"; public static final String STATUS_SAVED = "已保存"; - public static final String STATUS_UNSAVED = "未保存";// 只供召回已灭菌的器械包时,在转换成回收单时要将状态改为未保存 + /** + * 只供召回已灭菌的器械包时,在转换成回收单时要将状态改为未保存 + */ + public static final String STATUS_UNSAVED = "未保存"; /** * 回收项 */ @JsonIgnore private List items; - + /** + * 清洗篮筐 + */ @JsonIgnore - private List classifyBaskets; // 分类篮筐 + private List classifyBaskets; private InvoicePlan recyclingApplication; /** * 回收的供应室的科室编码 */ private String orgUnitCoding; - - private String recyclingUser;// 回收人 - - private String recyclingApplicationType;// 申请单类型 + /** + * 回收人 + */ + private String recyclingUser; + /** + * 申请单类型 + */ + private String recyclingApplicationType; /** * 申请单提交时间