Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/Constants.java =================================================================== diff -u -r26116 -r37354 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/Constants.java (.../Constants.java) (revision 26116) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/Constants.java (.../Constants.java) (revision 37354) @@ -81,4 +81,9 @@ "授权方没有此物品的授权权利","厂商类型与证件类型不匹配","证件类型无效","授权方不是生产厂家","授权方没有一次性物品可以授权","科室不存在", "已存在该科室编码的科室"}; + /** + * 手术仪器管理的发货功能 + */ + public static final String OPERATION_INVOICE = "发货"; + } Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r37351 -r37354 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 37351) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 37354) @@ -257,6 +257,7 @@ import com.google.gson.FieldAttributes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; @@ -5771,10 +5772,34 @@ public String getInfoByBarcode_SurgicalStruments(JSONObject params) { String barcode = params.optString("barcode"); String operation = params.optString("operation"); + if(StringUtils.equals(operation, getOperationInvoiceNameParseAliasNameOfSurgicalInstrumentsManagementFromConfigJs())){ + operation = com.forgon.disinfectsystem.common.Constants.OPERATION_INVOICE; + } JSONObject data = tousseInstanceManager.loadTousseInstanceForChangePosition(barcode, operation); return JSONUtil.buildJsonObject(true, data).toString(); } - public String getSterileTransitionRecordList(JSONObject params){ + + /** + * 解析所访问的项目的config.js的配置项aliasNameOfSurgicalInstrumentsManagement的json数组的值 + */ + private String getOperationInvoiceNameParseAliasNameOfSurgicalInstrumentsManagementFromConfigJs(){ + String operationInvoiceName = com.forgon.disinfectsystem.common.Constants.OPERATION_INVOICE; + String aliasNameOfSurgicalInstrumentsManagementJson = CssdUtils.getSystemSetConfigByName("aliasNameOfSurgicalInstrumentsManagement"); + if(StringUtils.isNotBlank(aliasNameOfSurgicalInstrumentsManagementJson)){ + JsonArray jsonArray = (JsonArray)new JsonParser().parse(aliasNameOfSurgicalInstrumentsManagementJson); + if(jsonArray != null && !jsonArray.isJsonNull() && jsonArray.size() > 0){ + for (int i = 0; i < jsonArray.size(); i++) { + JsonObject jsonElement = jsonArray.get(i).getAsJsonObject(); + if(org.apache.commons.lang3.StringUtils.equals(jsonElement.get("fieldName").getAsString(),"invoiceTypeOfPDA")){ + operationInvoiceName = jsonElement.get("displayText").getAsString(); + } + } + } + } + return operationInvoiceName; + } + + public String getSterileTransitionRecordList(JSONObject params){ return sterilizationTransitionManager.getTodaySterilizationTransitionRecords().toString(); } public String getSterilizationTransitionRecordById(JSONObject params){