Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r26676 -r26765 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 26676) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 26765) @@ -4694,7 +4694,8 @@ String deviceBrand = di.getDeviceBrand(); //是否为珠江医院项目 Boolean isProject_ZJYY = CssdUtils.isProject("zjyy"); - + //是否为珠江医院项目 + Boolean isProject_XJJQZYY = CssdUtils.isProject("xjjqzyy"); //2、防止因为灭菌器参数的对象太多导致打印超多,所以只取关键的点 //取峰值,谷值,中间值 //3、根据灭菌阶段分组 @@ -4721,8 +4722,8 @@ //【关键】记录该阶段的灭菌参数的关键点 List printSrForPhase = new ArrayList(); this.printSterilizerRecords_SetKeyPoint(srList, printSrForPhase); - //珠江医院个性化: - if(isProject_ZJYY){ + //珠江医院新建军区总医院个性化: + if(isProject_ZJYY || isProject_XJJQZYY){ //若新华清洗机阶段为升温,真空干燥,脉动空气干燥,则打印数据只需要15个 if(DeviceInterface.XINHUA.equals(deviceBrand) && (SterilizerRecord.STERILIZERRECORD_PHASE_XINHUA.get("07").equals(key) Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java =================================================================== diff -u -r26016 -r26765 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java (.../SterilizerRecordLineChartAction.java) (revision 26016) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java (.../SterilizerRecordLineChartAction.java) (revision 26765) @@ -171,6 +171,8 @@ srData.put("startTime",StringUtils.defaultString(getTimeDateStr(firstSlrProcStartTime,DateTools.COMMON_DATE_HMS ), " ")); //开始时间 srData.put("sterilizationTime",StringUtils.defaultString(getTimeDateStr(firstSlrProcStartTime, DateTools.COMMON_DATE_PATTEN ))); //灭菌开始时间(年月日) srData.put("printUser",AcegiHelper.getLoginUser().getUserName()); //打印用户 + srData.put("sterilizationUser",StringUtils.defaultString(sterilizationRecord.getSterilizationUser(), " ")); //灭菌员 + srData.put("finishComfirmer",StringUtils.defaultString(sterilizationRecord.getFinishComfirmer(), " ")); //灭菌完成确认人 //4、返回打印数据 JSONUtil.addSuccess(result, true); JSONUtil.addProperty(data, "chart", chartDatas);