Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r13484 -r13499
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 13484)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 13499)
@@ -1735,7 +1735,7 @@
SterilizationRecord record = getSterilizationRecordById(recordId);
if(ti != null && record != null){
Long oldRecordId = ti.getSterilizationRecord_id();
- if(oldRecordId.equals(recordId)){
+ if(oldRecordId != null && oldRecordId.equals(recordId)){
return;
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView.js
===================================================================
diff -u -r12599 -r13499
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView.js (.../interfereSterilizationView.js) (revision 12599)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView.js (.../interfereSterilizationView.js) (revision 13499)
@@ -55,7 +55,7 @@
function renderCallTousseInstanceInfoShowFun(v, p, record){
var status = record.data.status;
var str = "";
- if(status != '已装配' && status != '已审核' && status != '已消毒'){
+ if(status != '已装配' && status != '已审核' && status != '已消毒' && status != '灭菌中'){
var reviewBasket_id = record.data.reviewBasket_id;
var hideIsBasketConvert = true;
if(reviewBasket_id != null){
@@ -64,7 +64,6 @@
str = "";
str += "";
}
-
return str;
}