Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r37477 -r37563 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 37477) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 37563) @@ -1186,6 +1186,7 @@ /** * 更新器械包实例的一些属性(所属仓库及失效期). + * 此方法是有隐患的 聚合小包的一些信息会被大包的信息覆盖 * @param sdf * @param sterilizationRecord * @param tousseInstanceList 包实例的集合 @@ -1211,6 +1212,8 @@ Long warehouseId = warehouse.getId(); String warehouseName = warehouse.getName(); Map expirationDateInfoMap = new HashMap(); + String rapidFurnace = sterilizationRecord.getSterilizer().getRapidFurnace(); + /*int index = 1; for (TousseInstance tousseInstance : tousseInstanceList) { String status = TousseInstance.STATUS_STERILED; @@ -1295,7 +1298,8 @@ Date nowDate = new Date(); jdbcTemplate.batchUpdate("update TousseInstance set status=?,sterileFrequency=?,sterilizationUser=?,sterilizerName=?," + "sterileStartTime=?,sterileEndTime=?,SterilingType=?,sterilizationRecord_id=?,warehouseId=?,warehouseName=?,validUntil=?,warningUntil=?" - + ",price=?,discountPrice=?,fluctuationPrice=? where id=? or comboTousseInstanceId=? ", new BatchPreparedStatementSetter() { + + (Constants.STR_YES.equals(rapidFurnace)?",price=?,discountPrice=?,fluctuationPrice=? ":"") + + "where id=? or comboTousseInstanceId=? ", new BatchPreparedStatementSetter() { @Override public void setValues(PreparedStatement ps, int i) throws SQLException { @@ -1368,29 +1372,33 @@ }else{ ps.setTimestamp(12, null); } - - //包实例的单价、折扣价、浮动价 - Double unitPrice = tousseInstance.getPrice(); - Double discountPrice = tousseInstance.getDiscountPrice(); - Double fluctuationPrice = tousseInstance.getFluctuationPrice(); - if(unitPrice != null){ - ps.setDouble(13, unitPrice); + if(Constants.STR_YES.equals(rapidFurnace)){ + //包实例的单价、折扣价、浮动价 + Double unitPrice = tousseInstance.getPrice(); + Double discountPrice = tousseInstance.getDiscountPrice(); + Double fluctuationPrice = tousseInstance.getFluctuationPrice(); + if(unitPrice != null){ + ps.setDouble(13, unitPrice); + }else{ + ps.setNull(13, Types.DOUBLE); + } + if(discountPrice != null){ + ps.setDouble(14, discountPrice); + }else{ + ps.setNull(14, Types.DOUBLE); + } + if(fluctuationPrice != null){ + ps.setDouble(15, fluctuationPrice); + }else{ + ps.setNull(15, Types.DOUBLE); + } + + ps.setLong(16, tousseInstance.getId()); + ps.setLong(17, tousseInstance.getId()); }else{ - ps.setNull(13, Types.DOUBLE); + ps.setLong(13, tousseInstance.getId()); + ps.setLong(14, tousseInstance.getId()); } - if(discountPrice != null){ - ps.setDouble(14, discountPrice); - }else{ - ps.setNull(14, Types.DOUBLE); - } - if(fluctuationPrice != null){ - ps.setDouble(15, fluctuationPrice); - }else{ - ps.setNull(15, Types.DOUBLE); - } - - ps.setLong(16, tousseInstance.getId()); - ps.setLong(17, tousseInstance.getId()); } @Override