Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/controller/SterilizationRecordController.java =================================================================== diff -u -r24440 -r24561 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/controller/SterilizationRecordController.java (.../SterilizationRecordController.java) (revision 24440) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/controller/SterilizationRecordController.java (.../SterilizationRecordController.java) (revision 24561) @@ -483,6 +483,7 @@ if(container.isDisinfectionBasket()){ //灭菌篮筐 JSONUtil.addProperty(result, "barcodeType", BarcodeDevice.BARCODE_TYPE_STERILINGCONTAINER); JSONObject jsonObject = new JSONObject(); + JSONUtil.addProperty(jsonObject, "type", BarcodeDevice.TYPE_CODE_CONTAINER); JSONUtil.addProperty(jsonObject, "barcode", barcode); JSONUtil.addProperty(jsonObject, "name", container.getContainerName()); //篮筐内的器械包 @@ -517,6 +518,7 @@ }else if(container.isCleaningShelf()){ //灭菌架 JSONUtil.addProperty(result, "barcodeType", BarcodeDevice.BARCODE_TYPE_STERILINGSHELF); JSONObject jsonObject = new JSONObject(); + JSONUtil.addProperty(jsonObject, "type", BarcodeDevice.TYPE_CODE_STERILINGSHELF); JSONUtil.addProperty(jsonObject, "barcode", barcode); JSONUtil.addProperty(jsonObject, "name", container.getContainerName()); rows.add(jsonObject); @@ -528,6 +530,7 @@ TousseInstance tousseInstance = (TousseInstance)barcodeDevice; JSONUtil.addProperty(result, "barcodeType", BarcodeDevice.BARCODE_TYPE_PACKAGE); JSONObject jsonObject = new JSONObject(); + JSONUtil.addProperty(jsonObject, "type", BarcodeDevice.TYPE_CODE_TOUSSE); JSONUtil.addProperty(jsonObject, "barcode", barcode); JSONUtil.addProperty(jsonObject, "name", tousseInstance.getTousseName()); JSONUtil.addProperty(jsonObject, "amount", 1); @@ -545,27 +548,31 @@ }else if (barcodeDevice instanceof Sterilizer){ //灭菌炉 JSONUtil.addProperty(result, "barcodeType", BarcodeDevice.BARCODE_TYPE_STERILIZER); JSONObject jsonObject = new JSONObject(); + JSONUtil.addProperty(jsonObject, "type", BarcodeDevice.TYPE_CODE_STERILIZER); JSONUtil.addProperty(jsonObject, "barcode", barcode); JSONUtil.addProperty(jsonObject, "name", ((Sterilizer)barcodeDevice).getName()); rows.add(jsonObject); JSONUtil.addProperty(result, JSONUtil.JSON_KEY_SUCCESS, true); }else if (barcodeDevice instanceof Sterilisation){ //灭菌程序 JSONUtil.addProperty(result, "barcodeType", BarcodeDevice.BARCODE_TYPE_STERILISATION); JSONObject jsonObject = new JSONObject(); + JSONUtil.addProperty(jsonObject, "type", BarcodeDevice.TYPE_CODE_STERILISATION); JSONUtil.addProperty(jsonObject, "barcode", barcode); JSONUtil.addProperty(jsonObject, "name", ((Sterilisation)barcodeDevice).getSterilisation()); rows.add(jsonObject); JSONUtil.addProperty(result, JSONUtil.JSON_KEY_SUCCESS, true); }else if (barcodeDevice instanceof User){ //灭菌员 JSONUtil.addProperty(result, "barcodeType", BarcodeDevice.BARCODE_TYPE_USER); JSONObject jsonObject = new JSONObject(); + JSONUtil.addProperty(jsonObject, "type", BarcodeDevice.TYPE_CODE_USER); JSONUtil.addProperty(jsonObject, "barcode", barcode); JSONUtil.addProperty(jsonObject, "name", ((User)barcodeDevice).getFullName()); rows.add(jsonObject); JSONUtil.addProperty(result, JSONUtil.JSON_KEY_SUCCESS, true); }else if (barcodeDevice instanceof Position){ //位置 JSONUtil.addProperty(result, "barcodeType", BarcodeDevice.BARCODE_TYPE_POSITION); JSONObject jsonObject = new JSONObject(); + JSONUtil.addProperty(jsonObject, "type", BarcodeDevice.TYPE_CODE_POSITION); JSONUtil.addProperty(jsonObject, "barcode", barcode); JSONUtil.addProperty(jsonObject, "name", ((Position)barcodeDevice).getPositionName()); rows.add(jsonObject); Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r24533 -r24561 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 24533) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 24561) @@ -3853,7 +3853,7 @@ obj.put("barcode", tousse.getFixedBarcode());//固定条码 obj.put("typeForSterilizationStatistics", getTypeForSterilizationStatistics(null , tousse.getTousseType() , tousse.getIsForeignTousse())); obj.put("name", tousseName); - obj.put("type", 2); + obj.put("type", BarcodeDevice.TYPE_CODE_TOUSSE); obj.put("tousseType", tousse.getTousseType()); //覆盖 bMap.put(key, obj); @@ -3866,7 +3866,7 @@ jsonObj.put("typeForSterilizationStatistics", getTypeForSterilizationStatistics(tousse.getProxyDisinfectionId() , tousse.getTousseType() , tousse.getIsForeignTousse())); jsonObj.put("depart", StringUtils.defaultString(tousse.getDepart(), "")); jsonObj.put("tousseType", tousse.getTousseType()); - jsonObj.put("type", 2); + jsonObj.put("type", BarcodeDevice.TYPE_CODE_TOUSSE); jsonObj.put("position", tousse.getSterilizerPosition()); jsonObj.put("isUrgentTousse", tousse.getIsUrgentTousse()); jsonObj.put("reviewTime", tousse.getReviewTime()); @@ -3890,7 +3890,7 @@ JSONObject jsonObj = new JSONObject(); jsonObj.put("barcode", reviewedBasket.getContainer().getBarcode()); jsonObj.put("name", reviewedBasket.getContainer().getContainerName()); - jsonObj.put("type", 1); + jsonObj.put("type", BarcodeDevice.TYPE_CODE_CONTAINER); jsonObj.put("position", reviewedBasket.getSterilizerPosition()); JSONArray tousseInBasketArray = new JSONArray(); @@ -3935,7 +3935,7 @@ getTypeForSterilizationStatistics(tousseSimpleVO.getProxyDisinfectionId() , tousseSimpleVO.getItemDefinition().getTousseType() , tousseSimpleVO.getIsForeignTousse())); tousseObj.put("depart", StringUtils.defaultString(tousseSimpleVO.getDepart(), "")); jsonObj.put("tousseType", tousseSimpleVO.getTousseType()); - jsonObj.put("type", 1); + jsonObj.put("type", BarcodeDevice.TYPE_CODE_CONTAINER); jsonObj.put("position", tousseSimpleVO.getSterilizerPosition()); jsonObj.put("isUrgentTousse", tousseSimpleVO.getIsUrgentTousse()); jsonObj.put("reviewTime", tousseSimpleVO.getReviewTime()); Index: forgon-core/src/main/java/com/forgon/directory/model/BarcodeDevice.java =================================================================== diff -u -r24396 -r24561 --- forgon-core/src/main/java/com/forgon/directory/model/BarcodeDevice.java (.../BarcodeDevice.java) (revision 24396) +++ forgon-core/src/main/java/com/forgon/directory/model/BarcodeDevice.java (.../BarcodeDevice.java) (revision 24561) @@ -61,6 +61,17 @@ public static final String BARCODE_TYPE_STERILINGCONTAINER = "灭菌篮筐"; public static final String BARCODE_TYPE_STERILINGSHELF = "灭菌架"; + /** + * 条码类型(数字代号) + */ + public static final int TYPE_CODE_CONTAINER = 1; + public static final int TYPE_CODE_TOUSSE = 2; + public static final int TYPE_CODE_USER = 3; + public static final int TYPE_CODE_STERILIZER = 4; + public static final int TYPE_CODE_STERILISATION = 5; + public static final int TYPE_CODE_STERILINGSHELF = 6; + public static final int TYPE_CODE_POSITION = 7; + @Override @Id @GeneratedValue(strategy = GenerationType.AUTO)