Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java =================================================================== diff -u -r29233 -r29239 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java (.../QualityMonitoringInstanceManagerImpl.java) (revision 29233) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java (.../QualityMonitoringInstanceManagerImpl.java) (revision 29239) @@ -52,6 +52,7 @@ import com.forgon.disinfectsystem.tousse.imagefilemanager.service.ImageFileManager; import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; +import com.forgon.exception.SystemException; import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; import com.forgon.reflect.ReflectUtil; @@ -935,5 +936,25 @@ return washAndDisinfectRecordArr; } + + @Override + public JSONObject getGoodsAmountBySterilizationRecord(String sterilizationRecordId) { + if(!DatabaseUtil.isPoIdValid(sterilizationRecordId)){ + throw new SystemException("灭菌记录id不能为空!"); + } + SterilizationRecord sterilizationRecord = (SterilizationRecord) objectDao.getById(SterilizationRecord.class.getSimpleName(), sterilizationRecordId); + if(sterilizationRecord == null){ + throw new SystemException("灭菌记录不存在!"); + } + Integer goodsAmount = sterilizationRecord.getAmount(); + if(goodsAmount.intValue() == 0){ + throw new SystemException("没有灭菌物品!"); + } + JSONObject json = new JSONObject(); + json.put("tousseName", "整炉器械包"); + json.put("goodsAmount", goodsAmount); + return json; + } + } Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManager.java =================================================================== diff -u -r27704 -r29239 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManager.java (.../QualityMonitoringInstanceManager.java) (revision 27704) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManager.java (.../QualityMonitoringInstanceManager.java) (revision 29239) @@ -57,5 +57,12 @@ * @return */ public JSONObject buildTousseJSON(TousseInstance ti); + + /** + * 灭菌管理页面登记质量监测,勾选“是否整炉”时,返回器械包的名称为“整炉器械包”,“数量”为整炉器械包的总数的数据(系统不存在名称为“整炉器械包”的包定义)(ZJJSRM-30 质量监测的问题) + * @param sterilizationRecordId + * @return + */ + public JSONObject getGoodsAmountBySterilizationRecord(String sterilizationRecordId); } Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java =================================================================== diff -u -r28812 -r29239 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java (.../QualityMonitoringInstanceAction.java) (revision 28812) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java (.../QualityMonitoringInstanceAction.java) (revision 29239) @@ -35,6 +35,7 @@ import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringGoods; import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringInstance; import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition; +import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord; import com.forgon.disinfectsystem.qualitymonitoring.instance.service.QualityMonitoringInstanceManager; import com.forgon.disinfectsystem.tousse.imagefilemanager.service.ImageFileManager; @@ -575,6 +576,21 @@ StrutsResponseUtils.output(jsonObj); } } + + /** + * 灭菌管理页面登记质量监测,勾选“是否整炉”时,返回器械包的名称为“整炉器械包”,“数量”为整炉器械包的总数的数据(ZJJSRM-30 质量监测的问题) + */ + public void getGoodsAmountBySterilizationRecord(){ + String sterilizationRecordId = StrutsParamUtils.getPraramValue("sterilizationRecordId", null); + JSONObject result = JSONUtil.buildJsonObject(true); + try { + JSONObject json = qualityMonitoringInstanceManager.getGoodsAmountBySterilizationRecord(sterilizationRecordId); + result = JSONUtil.buildJsonObject(true, json); + } catch (Exception e) { + result = JSONUtil.buildJsonObject(false, e.getMessage()); + } + StrutsResponseUtils.output(result); + } public void iniInfo() {