Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.8.6_4.8.7.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.8.6_4.8.7.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.8.6_4.8.7.sql (revision 19302) @@ -0,0 +1 @@ +update TousseInstance set recyclingUser=(select recyclingUser from RecyclingRecord rr where rr.id=TousseInstance.recyclingRecordId) where recyclingRecordId is not null; \ No newline at end of file Index: forgon-core/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r18500 -r19302 --- forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 18500) +++ forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 19302) @@ -21,7 +21,7 @@ "4.2.3","4.2.4","4.2.5","4.2.6","4.2.7","4.2.8","4.2.9","4.3.0","4.3.1","4.3.2","4.3.3","4.3.4","4.3.5","4.3.6","4.3.7","4.3.8","4.3.9", "4.4.0","4.4.1","4.4.2","4.4.3","4.4.4","4.4.5","4.4.6","4.4.7","4.4.8","4.4.9","4.5.0","4.5.1","4.5.2","4.5.3","4.5.4","4.5.5","4.5.6","4.5.7","4.5.8", "4.5.9","4.6.0","4.6.1","4.6.2","4.6.3","4.6.4","4.6.5","4.6.6","4.6.7","4.6.8","4.6.9","4.7.0","4.7.1","4.7.2","4.7.3","4.7.4","4.7.5","4.7.6","4.7.7", - "4.7.8","4.7.9","4.8.0","4.8.1","4.8.2","4.8.3","4.8.4","4.8.5","4.8.6"};// 版本列表 + "4.7.8","4.7.9","4.8.0","4.8.1","4.8.2","4.8.3","4.8.4","4.8.5","4.8.6","4.8.7"};// 版本列表 public final static List SOFTWARE_VERSION_LIST = Arrays .asList(SOFTWARE_VERSION_ARRAY); public final static String SOFTWARE_VERSION = SOFTWARE_VERSION_ARRAY[SOFTWARE_VERSION_ARRAY.length - 1];// 软件最新版本 Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/container/Container.java =================================================================== diff -u -r15819 -r19302 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/container/Container.java (.../Container.java) (revision 15819) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/container/Container.java (.../Container.java) (revision 19302) @@ -25,7 +25,7 @@ public static final String CONTAINERTYPE_SHELF = "灭菌架"; public static final String CONTAINERTYPE_BASKET = "篮筐"; - public static final String CONTAINERTYPE_TRAY = "托盘"; + public static final String CONTAINERTYPE_TRAY = "托盘"; //此类型已经没有用了 public static final String CONTAINERTYPE_CLEANINGSHELF = "清洗架"; public static final String CONTAINER_STATUS_FREE = "空闲"; Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java =================================================================== diff -u -r19036 -r19302 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 19036) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 19302) @@ -163,6 +163,11 @@ public static final String PACKAGE_TYPE_DRESSING = "敷料包"; public static final String PACKAGE_TYPE_HOMEMADE = "自制物品"; public static final String TOUSSE_GROUP_SPECIALIZED_INSTRUMENT = "专科器械组"; + + /** + * （注意：现在系统的器械包类型的值，没有这个类型，这个只用于灭菌记录统计物品时使用，即等于：外部代理灭菌的包+替其他供应室代理灭菌的包） + */ + public static final String PACKAGE_TYPE_PROXY = "代理灭菌包"; private static String MATERIALSMD5_SEPARATOR = "_#$&_";// 材料md5分隔符 Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java =================================================================== diff -u -r19298 -r19302 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 19298) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 19302) @@ -265,10 +265,14 @@ private Long departmentStock_id; - // 关联外部代理灭菌器械包项 + /** + * 外部代理灭菌器械包项的id + */ private Long foreignProxyItem_id; - // 二级供应室代理灭菌 + /** + * 代理灭菌单id + */ private Long proxyDisinfection_id; private Long idCardInstanceID;// 标识牌id Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java =================================================================== diff -u -r19041 -r19302 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java (.../UseRecord.java) (revision 19041) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java (.../UseRecord.java) (revision 19302) @@ -72,7 +72,10 @@ private String doctorName;//医生姓名 - private String surgeon;//主刀医生 + /** + * 主刀医生 + */ + private String surgeon; private String operation;//手术名称 @@ -98,7 +101,10 @@ private String operator; //登记人 - private String washHandNurse; // 洗手护士 + /** + * 洗手护士 + */ + private String washHandNurse; private String circuitNurse;//巡回护士 Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js =================================================================== diff -u -r19266 -r19302 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 19266) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 19302) @@ -177,7 +177,8 @@ {header : "流转位置",width : 80,dataIndex : 'location2'}, {header : "流转状态",width : 80,dataIndex : 'status2'}, - {header : "回收清点人",width : 100,dataIndex : 'recyclingOperator',sortable: false}, + {header : "回收人",width : 80,dataIndex : 'recyclingUser',sortable: false}, + {header : "回收清点人",width : 80,dataIndex : 'recyclingOperator',sortable: false}, {header : "清洗人",width : 60,dataIndex : 'washOperator',sortable: false}, {header : "清洗时间",width : 125,dataIndex : 'washStartTime',sortable: false}, {header : "失效日期",width : 80,dataIndex : 'validUntil',renderer : checkDate}, @@ -224,6 +225,7 @@ {name : 'stockBarcode'}, {name : 'sterilingType'}, {name : 'validUntil'}, + {name : 'recyclingUser'}, {name : 'recyclingOperator'}, {name : 'washOperator'}, {name : 'washStartTime'}, @@ -267,6 +269,7 @@ {type : 'date',dataIndex : 'validUntil'}, {type : 'date',dataIndex : 'reviewTime'}, {type : 'string',dataIndex : 'packageType'}, + {type : 'string',dataIndex : 'recyclingUser'}, {type : 'string',dataIndex : 'recyclingOperator'}, {type : 'string',dataIndex : 'washOperator'}, {type : 'string',dataIndex : 'reviewer'},