Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r31095 -r31203 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 31095) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 31203) @@ -7781,7 +7781,8 @@ TousseInstance ti = (TousseInstance) bd; // 获取器械包的祖先包 TousseDefinition ancestor = ti.getTousseDefinition(); - + // 外来器械申请单 + ForeignTousseApplication foreignTousseApp = new ForeignTousseApplication(); if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(ancestor.getTousseType()) || TousseDefinition.PACKAGE_TYPE_FOREIGN.equals(ancestor.getTousseType())){ // 消毒物品、外来器械包需要根据祖先包进行判断 @@ -7872,6 +7873,9 @@ return obj; } } + if(DatabaseUtil.isPoIdValid(ti.getForeignTousseApp_id())){ + foreignTousseApp = (ForeignTousseApplication) objectDao.getById(ForeignTousseApplication.class.getSimpleName(), ti.getForeignTousseApp_id().toString()); + } } // 验证是否过期 @@ -7964,6 +7968,10 @@ JSONUtil.addProperty(obj, "operator", ti.getOperator()); JSONUtil.addProperty(obj, "remark", ti.getRemark()); JSONUtil.addProperty(obj, "materialInstances", td.getMaterialInstancesJsonArray()); + // 外来器械申请单的住院号、诊疗号、病人信息(GDSZYY-88外来器械包录入病人使用记录检查包关联的病人信息与使用记录中的病人信息是否一致) + obj.put("hospitalNumber", foreignTousseApp.getHospitalNumber()); + obj.put("clinicNumber", foreignTousseApp.getClinicNumber()); + obj.put("patient", foreignTousseApp.getPatient()); //签收后录入使用记录 obj.put("registUseRecordAfterSigned", StringUtils.isBlank(ancestor.getRegistUseRecordAfterSigned()) ? Constants.STR_NO : ancestor.getRegistUseRecordAfterSigned()); //包的加急信息 @@ -8015,6 +8023,10 @@ JSONUtil.addProperty(obj, "operator", ti.getOperator()); JSONUtil.addProperty(obj, "remark", ti.getRemark()); JSONUtil.addProperty(obj, "materialInstances", td.getMaterialInstancesJsonArray()); + // 外来器械申请单的住院号、诊疗号、病人信息(GDSZYY-88外来器械包录入病人使用记录检查包关联的病人信息与使用记录中的病人信息是否一致) + obj.put("hospitalNumber", foreignTousseApp.getHospitalNumber()); + obj.put("clinicNumber", foreignTousseApp.getClinicNumber()); + obj.put("patient", foreignTousseApp.getPatient()); //签收后录入使用记录 obj.put("registUseRecordAfterSigned", StringUtils.isBlank(ancestor.getRegistUseRecordAfterSigned()) ? Constants.STR_NO : ancestor.getRegistUseRecordAfterSigned()); //包的加急信息 @@ -8304,6 +8316,10 @@ JSONUtil.addProperty(data, "operator", obj.opt("operator")); JSONUtil.addProperty(data, "remark", obj.opt("remark")); JSONUtil.addProperty(data, "materialInstances", obj.opt("materialInstances")); + // 外来器械申请单的住院号、诊疗号、病人信息(GDSZYY-88外来器械包录入病人使用记录检查包关联的病人信息与使用记录中的病人信息是否一致) + JSONUtil.addProperty(data, "hospitalNumber", obj.opt("hospitalNumber")); + JSONUtil.addProperty(data, "clinicNumber", obj.opt("clinicNumber")); + JSONUtil.addProperty(data, "patient", obj.opt("patient")); //签收后录入使用记录 JSONUtil.addProperty(data, "registUseRecordAfterSigned", obj.opt("registUseRecordAfterSigned")); JSONUtil.addDataProperty(obj, data);