Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingTousseInstance.java =================================================================== diff -u -r38182 -r39143 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingTousseInstance.java (.../RecyclingTousseInstance.java) (revision 38182) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingTousseInstance.java (.../RecyclingTousseInstance.java) (revision 39143) @@ -25,22 +25,16 @@ ,@Index(columnList = "tousseInstanceId", name = "rtin_tiid_index")}) @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) public class RecyclingTousseInstance { - + /**主键*/ private Long id; - /** - * 被回收的申请单ID - */ + /**被回收的申请单ID*/ private Long invoicePlanId; - /** - * 所属回收记录ID - */ + /**所属回收记录ID*/ private Long recyclingRecordId; - /** - * 包实例ID - */ + /**包实例ID*/ private Long tousseInstanceId; @Id Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingDateDetails.java =================================================================== diff -u -r37885 -r39143 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingDateDetails.java (.../RecyclingDateDetails.java) (revision 37885) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingDateDetails.java (.../RecyclingDateDetails.java) (revision 39143) @@ -24,18 +24,13 @@ @Table(indexes = {@Index(columnList = "recyclingItemId", name = "rdd_recyclingItemId_index")}) @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) public class RecyclingDateDetails { + /**主键*/ private Long id; - /** - * 所属回收项 - */ + /**所属回收项*/ private Long recyclingItemId; - /** - * 回收时间 - */ + /**回收时间*/ private Date recyclingDate; - /** - * 本次回收数量 - */ + /**本次回收数量*/ private Integer amount; @Id @GeneratedValue(strategy = GenerationType.AUTO) Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java =================================================================== diff -u -r37373 -r39143 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java (.../RecyclingItem.java) (revision 37373) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java (.../RecyclingItem.java) (revision 39143) @@ -45,89 +45,55 @@ }) @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) public class RecyclingItem { - + /**主键*/ private Long id; - + /**器械包名称*/ private String tousseName; - /** - * 回收数量 - */ + /**回收数量*/ private Integer amount; - /** - * 加急数量 - */ + /**加急数量*/ private Integer urgentAmount = 0; - /** - * 是否整包申请 - */ + /**是否整包申请*/ private String isApplyEntireTousse; - /** - * 是否整包清洗 - */ + /**是否整包清洗*/ private String isCleanedEntirely; - /** - * 是否追溯 - */ + /**是否追溯*/ private String isTraceable = TousseDefinition.STR_YES; - /** - * 器械包定义的ID - */ + /**器械包定义的ID*/ private Long tousseDefinitionId; - + /**包类型*/ private String tousseType; - /** - * 是否包含器械包标识牌 - */ + /**是否包含器械包标识牌*/ private String isThereIdentificationCard; - /** - * 用于回收记录记录的篮筐 - */ + /**篮筐名称*/ private String basketName; - + /**回收记录*/ private RecyclingRecord recyclingRecord; - /** - * 物品名称的拼音码 - */ + /**物品名称的拼音码*/ private String spelling; - /** - * 备注 - */ + /**备注*/ private String remark; - /** - * 丢失原因说明(录使用记录时用) - */ - private String errorRemark; + /**丢失原因说明*/ + private String errorRemark;//录使用记录时用 - /** - * 报损原因说明(录使用记录时用) - */ - private String damageRemark; - /** - * 加急等级 - */ + /**报损原因说明*/ + private String damageRemark;//录使用记录时用 + /**加急等级*/ private String urgentLevel; - /** - * 丢失报损添加质量监测的key - */ + /**丢失报损添加质量监测的key*/ private String errorDamageQmKey; - /** - * 丢失报损明细 - */ + /**丢失报损明细*/ private List errorDamageDetails = new ArrayList(); - /** - * 包定义id赋值时，包定义的材料数量 - */ + /**包定义id赋值时，包定义的材料数量*/ private Integer materialAmount; - /** - * 包定义id赋值时，包定义的材料数量(按材料拆分算) - */ + /**包定义id赋值时，包定义的材料数量(按材料拆分算)*/ private Integer materialSplitAmount; @Id @GeneratedValue(strategy = GenerationType.AUTO) Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingRecord.java =================================================================== diff -u -r37373 -r39143 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingRecord.java (.../RecyclingRecord.java) (revision 37373) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingRecord.java (.../RecyclingRecord.java) (revision 39143) @@ -49,99 +49,60 @@ ,@Index(columnList = "recyclingTime,id,orgUnitCoding,operator", name = "rr_rt_id_ouc_operator")}) @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) public class RecyclingRecord { - + /**主键*/ private Long id; - /** - * 装配任务的编号 - */ + /**装配任务的编号*/ private String packingTaskSerialNumber; - /** - * 回收时间 - */ + /**回收时间*/ private Date recyclingTime; - - /** - * 申请科室的名称 - */ + /**申请科室的名称*/ private String depart; - /** - * 申请科室的编码 - */ + /**申请科室的编码*/ private String departCode; - /** - * 操作员,就是页面上的清点人 - */ + /**操作员,就是页面上的清点人*/ 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 = "未保存"; - /** - * 回收项 - */ + /**回收的物品*/ @JsonIgnore private List items; - /** - * 清洗篮筐 - */ + /**清洗篮筐*/ @JsonIgnore private List classifyBaskets; - + /**申请单*/ private InvoicePlan recyclingApplication; - /** - * 回收的供应室的科室编码 - */ + /**回收的供应室的科室编码*/ private String orgUnitCoding; - /** - * 回收人 - */ + /**回收人*/ private String recyclingUser; - /** - * 自送人 - */ + /**自送人*/ private String departmentSender; - /** - * 申请单类型 - */ + /**申请单类型*/ private String recyclingApplicationType; - /** - * 申请单提交时间 - */ + /**申请单提交时间*/ private Date applySubmintDateTime; - /** - * 备注 - */ + /**备注*/ private String remark; - /** - * 回收数量是否需要确认。DGSFYBJY-12 申请数量跟回收数量不一致,需要确认。此值为是表示需要确认,其他都不需要确认。默认为否 - */ - private String recycleAmountNeedConfirm = Constants.STR_NO; - /** - * 回收数量沟通确认人名称 - */ + /**回收数量是否需要确认*/ + private String recycleAmountNeedConfirm = Constants.STR_NO;//DGSFYBJY-12 申请数量跟回收数量不一致,需要确认。此值为是表示需要确认,其他都不需要确认。默认为否 + /**回收数量沟通确认人名称*/ private String communicationUserName; - /** - * 回收数量沟通确认人编码 - */ + /**回收数量沟通确认人编码*/ private String communicationUserCode; public static final Integer RECYCLINGTIMES_TWO = 2;//外来器械二次回收记录 - /** - * 回收次数(目前只是用来区分外来器械包二次回收记录) - */ - private Integer recyclingTimes; + /**回收次数*/ + private Integer recyclingTimes;//目前只是用来区分外来器械包二次回收记录 @Id @GeneratedValue(strategy = GenerationType.AUTO) public Long getId() { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingBasketSequence.java =================================================================== diff -u -r23492 -r39143 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingBasketSequence.java (.../RecyclingBasketSequence.java) (revision 23492) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingBasketSequence.java (.../RecyclingBasketSequence.java) (revision 39143) @@ -29,26 +29,17 @@ }) @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) public class RecyclingBasketSequence { + /**主键*/ private Long id; - /** - * 回收记录的id - */ + /**回收记录的id*/ private Long recyclingRecordId; - /** - * 篮筐实例的id - */ + /**篮筐实例的id*/ private Long classifyBasketId; - /** - * 包定义id - */ + /**包定义id*/ private Long tousseDefinitionId; - /** - * 篮筐实例在这个回收记录中的序号 - */ + /**篮筐实例在这个回收记录中的序号*/ private Integer sequence; - /** - * 是否已装配 - */ + /**是否已装配*/ private Boolean packed; @Id