Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java =================================================================== diff -u -r27543 -r27865 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 27543) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 27865) @@ -2975,6 +2975,11 @@ int includeImplantIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "工具/植入物"); int dismantleAmountIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "可拆卸数量"); int washClassifyTypeIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "清洗分类类型"); + int sterilizationMethodIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "灭菌方法"); + int sterilizationTemperatureIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "灭菌温度"); + int sterilizationTimeIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "灭菌时间"); + int dryTimeIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "干燥时间"); + int explainIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "清洗消毒特别要求和说明"); TousseDefinition tousseDefinition = null; List materialInstanceList = null; @@ -3041,6 +3046,17 @@ } } tousseDefinition.setPackageType(packageType); + // CSSDSYY-15 外来器械包定义中新增加：灭菌方法、灭菌温度(°C)、灭菌时间(分钟)、干燥时间(分钟)、清洗消毒特别要求和说明 + String sterilizationMethod = ParerUtils.getCellFormatValue(row, sterilizationMethodIndex); + String sterilizationTemp = ParerUtils.getCellFormatValue(row, sterilizationTemperatureIndex); + String sterilizationTime = ParerUtils.getCellFormatValue(row, sterilizationTimeIndex); + String dryTime = ParerUtils.getCellFormatValue(row, dryTimeIndex); + String explain = ParerUtils.getCellFormatValue(row, explainIndex); + tousseDefinition.setSterilizationMethod(sterilizationMethod); + tousseDefinition.setSterilizationTemp(StringUtils.isNotBlank(sterilizationTemp) ? Double.parseDouble(sterilizationTemp) : null); + tousseDefinition.setSterilizationTime(StringUtils.isNotBlank(sterilizationTime) ? Double.parseDouble(sterilizationTime) : null); + tousseDefinition.setDryTime(StringUtils.isNotBlank(dryTime) ? Double.parseDouble(dryTime) : null); + tousseDefinition.setExplain(explain); // 材料数量 String materialDefinitionNumStr = ParerUtils.getCellFormatValue(row, materialDefinitionAmountIndex); // 是否植入物 Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java =================================================================== diff -u -r26840 -r27865 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java (.../ExportBasedataManagerImpl.java) (revision 26840) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java (.../ExportBasedataManagerImpl.java) (revision 27865) @@ -759,6 +759,26 @@ inertStringValueToCell(row, cellNumer, contentCellStyleArray[cellNumer++], tousseDefinition.getPackageType()); + // 灭菌方法 + inertStringValueToCell(row, cellNumer, + contentCellStyleArray[cellNumer++], + tousseDefinition.getSterilizationMethod()); + // 灭菌温度 + inertStringValueToCell(row, cellNumer, + contentCellStyleArray[cellNumer++], + tousseDefinition.getSterilizationTemp() == null ? "" : String.format("%.2f", tousseDefinition.getSterilizationTemp())); + // 灭菌时间 + inertStringValueToCell(row, cellNumer, + contentCellStyleArray[cellNumer++], + tousseDefinition.getSterilizationTime() == null ? "" : String.format("%.2f", tousseDefinition.getSterilizationTime())); + // 干燥时间 + inertStringValueToCell(row, cellNumer, + contentCellStyleArray[cellNumer++], + tousseDefinition.getDryTime() == null ? "" : String.format("%.2f", tousseDefinition.getDryTime())); + // 清洗消毒特别要求和说明 + inertStringValueToCell(row, cellNumer, + contentCellStyleArray[cellNumer++], + tousseDefinition.getExplain()); boolean isInsertMaterial = false; // 器械 @@ -828,32 +848,32 @@ MaterialInstance materialInstance) { if( materialInstance.getMaterialDefinition() != null) { - inertStringValueToCell(row, 3, contentCellStyleArray[2], + inertStringValueToCell(row, 8, contentCellStyleArray[7], materialInstance.getMaterialDefinition().getName()); }else { - inertStringValueToCell(row, 3, contentCellStyleArray[2], + inertStringValueToCell(row, 8, contentCellStyleArray[7], materialInstance.getMaterialName()); } String spec = ""; if (materialInstance.getMaterialDefinition() != null) { spec = materialInstance.getMaterialDefinition().getSpecification(); } - inertStringValueToCell(row, 4, contentCellStyleArray[3], spec); + inertStringValueToCell(row, 9, contentCellStyleArray[8], spec); // 4 是否植入物 if("是".equals(materialInstance.materialIsImplant())){ - inertStringValueToCell(row, 5, contentCellStyleArray[4], "植入物"); + inertStringValueToCell(row, 10, contentCellStyleArray[9], "植入物"); }else{ - inertStringValueToCell(row, 5, contentCellStyleArray[4], "工具"); + inertStringValueToCell(row, 10, contentCellStyleArray[9], "工具"); } // 5 材料数量 - inertDoubleValueToCell(row, 6, contentCellStyleArray[5], + inertDoubleValueToCell(row, 11, contentCellStyleArray[10], (double) materialInstance.getCount()); // 6 可拆卸数量 - inertStringValueToCell(row, 7, contentCellStyleArray[6], + inertStringValueToCell(row, 12, contentCellStyleArray[10], materialInstance.getMinDismantleAmount()); // 7清洗分类类型 - inertStringValueToCell(row, 8, contentCellStyleArray[7], + inertStringValueToCell(row, 13, contentCellStyleArray[12], materialInstance.getWashClassifyType()); } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java =================================================================== diff -u -r27223 -r27865 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java (.../ForeignTousseApplication.java) (revision 27223) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java (.../ForeignTousseApplication.java) (revision 27865) @@ -131,6 +131,31 @@ * 关联的所有外来器械包实例条码的集合（如果拆包也需要体现出来，之间用分号分隔），此属性没有值，显示时动态查出来的 */ private String barcodes; + + /** + * 灭菌方法(外来器械包定义) + */ + private String sterilizationMethod; + + /** + * 灭菌温度(°C)(外来器械包定义) + */ + private Double sterilizationTemp; + + /** + * 灭菌时间(分钟)(外来器械包定义) + */ + private Double sterilizationTime; + + /** + * 干燥时间(分钟)(外来器械包定义) + */ + private Double dryTime; + + /** + * 清洗消毒特别要求和说明(外来器械包定义) + */ + private String explain; public static final String APPLICATION_STATUS_SHIPPED = "待发货"; public static final String APPLICATION_STATUS_SIGNED = "已接收"; @@ -467,4 +492,53 @@ this.returnContactPhoneNumber = returnContactPhoneNumber; } + public String getSterilizationMethod() { + return sterilizationMethod; + } + + + public void setSterilizationMethod(String sterilizationMethod) { + this.sterilizationMethod = sterilizationMethod; + } + + + public Double getSterilizationTemp() { + return sterilizationTemp; + } + + + public void setSterilizationTemp(Double sterilizationTemp) { + this.sterilizationTemp = sterilizationTemp; + } + + + public Double getSterilizationTime() { + return sterilizationTime; + } + + + public void setSterilizationTime(Double sterilizationTime) { + this.sterilizationTime = sterilizationTime; + } + + + public Double getDryTime() { + return dryTime; + } + + + public void setDryTime(Double dryTime) { + this.dryTime = dryTime; + } + + + public String getExplain() { + return explain; + } + + + public void setExplain(String explain) { + this.explain = explain; + } + } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java =================================================================== diff -u -r27811 -r27865 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 27811) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 27865) @@ -628,6 +628,32 @@ * 1:通用包 */ private Integer isCommonTousse; + + /** + * 灭菌方法(外来器械包定义) + */ + private String sterilizationMethod; + + /** + * 灭菌温度(°C)(外来器械包定义) + */ + private Double sterilizationTemp; + + /** + * 灭菌时间(分钟)(外来器械包定义) + */ + private Double sterilizationTime; + + /** + * 干燥时间(分钟)(外来器械包定义) + */ + private Double dryTime; + + /** + * 清洗消毒特别要求和说明(外来器械包定义) + */ + private String explain; + @Override @Id @GeneratedValue(strategy = GenerationType.AUTO) @@ -2046,4 +2072,55 @@ } this.materialSplitAmount = materialSplitAmount; } + + + public String getSterilizationMethod() { + return sterilizationMethod; + } + + + public void setSterilizationMethod(String sterilizationMethod) { + this.sterilizationMethod = sterilizationMethod; + } + + + public Double getSterilizationTemp() { + return sterilizationTemp; + } + + + public void setSterilizationTemp(Double sterilizationTemp) { + this.sterilizationTemp = sterilizationTemp; + } + + + public Double getSterilizationTime() { + return sterilizationTime; + } + + + public void setSterilizationTime(Double sterilizationTime) { + this.sterilizationTime = sterilizationTime; + } + + + public Double getDryTime() { + return dryTime; + } + + + public void setDryTime(Double dryTime) { + this.dryTime = dryTime; + } + + + public String getExplain() { + return explain; + } + + + public void setExplain(String explain) { + this.explain = explain; + } + } Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls =================================================================== diff -u -r26840 -r27865 Binary files differ Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r27721 -r27865 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 27721) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 27865) @@ -931,6 +931,12 @@ // temp.put("contactName", ""); // temp.put("phoneNumber", ""); // } + // CSSDSYY-15 外来器械申请单页面新增加字段 + temp.put("sterilizationMethod", tousseDefinition.getSterilizationMethod() == null ? "" : tousseDefinition.getSterilizationMethod()); + temp.put("sterilizationTemp", tousseDefinition.getSterilizationTemp() == null ? "" : String.format("%.2f", tousseDefinition.getSterilizationTemp())); + temp.put("sterilizationTime", tousseDefinition.getSterilizationTime() == null ? "" : String.format("%.2f", tousseDefinition.getSterilizationTime())); + temp.put("dryTime", tousseDefinition.getDryTime() == null ? "" : String.format("%.2f", tousseDefinition.getDryTime())); + temp.put("explain", tousseDefinition.getExplain() == null ? "" : tousseDefinition.getExplain()); mapList.add(temp); } Map map = new HashMap(); @@ -3287,6 +3293,21 @@ || (origineTdIsCom == 1 && tousseDefinitionIsCom == 0)){ modifyContent.append("字段：是否通用包，原值：").append(TousseDefinition.getIsCommonTousseStr(origineTdIsCom)).append("，新值：").append(TousseDefinition.getIsCommonTousseStr(tousseDefinitionIsCom)).append("。"); } + if(!StringUtils.equals(origineTd.getSterilizationMethod(), tousseDefinition.getSterilizationMethod())){ + modifyContent.append("字段：灭菌方法，原值：").append(origineTd.getSterilizationMethod()).append("，新值：").append(tousseDefinition.getSterilizationMethod()).append("。"); + } + if((origineTd.getSterilizationTemp() == null ? 0 : origineTd.getSterilizationTemp().doubleValue()) != (tousseDefinition.getSterilizationTemp() == null ? 0 : tousseDefinition.getSterilizationTemp().doubleValue())){ + modifyContent.append("字段：灭菌温度(°C)，原值：").append(origineTd.getSterilizationTemp()).append("，新值：").append(tousseDefinition.getSterilizationTemp()).append("。"); + } + if((origineTd.getSterilizationTime() == null ? 0 : origineTd.getSterilizationTime().doubleValue()) != (tousseDefinition.getSterilizationTime() == null ? 0 : tousseDefinition.getSterilizationTime().doubleValue())){ + modifyContent.append("字段：灭菌时间(分钟)，原值：").append(origineTd.getSterilizationTime()).append("，新值：").append(tousseDefinition.getSterilizationTime()).append("。"); + } + if((origineTd.getDryTime() == null ? 0 : origineTd.getDryTime().doubleValue()) != (tousseDefinition.getDryTime() == null ? 0 : tousseDefinition.getDryTime().doubleValue())){ + modifyContent.append("字段：干燥时间(分钟)，原值：").append(origineTd.getDryTime()).append("，新值：").append(tousseDefinition.getDryTime()).append("。"); + } + if(!StringUtils.equals(origineTd.getExplain(), tousseDefinition.getExplain())){ + modifyContent.append("字段：清洗消毒特别要求和说明，原值：").append(origineTd.getExplain()).append("，新值：").append(tousseDefinition.getExplain()).append("。"); + } return modifyContent.toString(); }