Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/packingRecordVo.java =================================================================== diff -u -r32336 -r32767 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/packingRecordVo.java (.../packingRecordVo.java) (revision 32336) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/packingRecordVo.java (.../packingRecordVo.java) (revision 32767) @@ -18,6 +18,10 @@ */ private String sterilingMode; /** + * 灭菌员 + */ + private String sterilizationUser; + /** * 是否转换申请单 */ private String isTran; @@ -45,6 +49,14 @@ this.sterilingMode = sterilingMode; } + public String getSterilizationUser() { + return sterilizationUser; + } + + public void setSterilizationUser(String sterilizationUser) { + this.sterilizationUser = sterilizationUser; + } + public String getIsTran() { return isTran; } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java =================================================================== diff -u -r32543 -r32767 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 32543) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 32767) @@ -182,6 +182,16 @@ private String wrapperCode; /** + * 检查人（有配置项的） + */ + private String inspector; + + /** + * 检查人编码 + */ + private String inspectorCode; + + /** * 配包人 */ private String operator; @@ -1012,6 +1022,22 @@ this.wrapper = wrapper; } + public String getInspector() { + return inspector; + } + + public void setInspector(String inspector) { + this.inspector = inspector; + } + + public String getInspectorCode() { + return inspectorCode; + } + + public void setInspectorCode(String inspectorCode) { + this.inspectorCode = inspectorCode; + } + public Date getOperationTime() { return operationTime; } Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r32672 -r32767 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 32672) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 32767) @@ -784,7 +784,9 @@ .getTousseInstanceList(objectDao)) { JSONObject obj = new JSONObject(); setToussePrintProperties(packingRecord.getDepart(), tousseInstance, obj); - + if(StringUtils.isBlank(tousseInstance.getInspector())){ + obj.put("inspector", packingRecord.getInspector()); + } array.add(obj); } } @@ -3452,7 +3454,7 @@ * @param idToWashRecordMap * @param idToRecyclingRecordMap */ - private void packingSplitPackages(String operator, String operatorCode,String wrapper,String wrapperCode, + private void packingSplitPackages(String operator, String operatorCode,String wrapper,String wrapperCode,String inspector,String inspectorCode, String reviewer, String reviewerCode,String sterileUserName,String sterileUserCode, String sterilingType,String sterilizer, String frequency, JSONArray splitPackages,List splitsTousseList,TousseDefinition td, PackingRecord packingRecord,String taskGroup, String washBasket,ForeignTousseApplication foreignTousseApplication,String orgUnitCoding, @@ -3532,7 +3534,7 @@ // 包实例 TousseInstance tousseInstance = createTousseInstance(operator, - operatorCode,wrapper,wrapperCode, reviewer, reviewerCode,sterileUserName, sterileUserCode, packageType, + operatorCode,wrapper,wrapperCode, inspector, inspectorCode, reviewer, reviewerCode,sterileUserName, sterileUserCode, packageType, sterilingMethod, washBasket, sterilizer, frequency, sterileStartTime, validUntil, warningUntil, packingRecord,taskGroup, tousseDefinition, tousseType, tousseName, foreignTousseApplication, packingDate, price, @@ -4455,7 +4457,7 @@ // 汇总装配记录对应的一次性物品扣减信息 // summaryOutDisposableGoodsStockInfo(packingRecordToDisposableGoodsOutAmount, packingRecord, disposableGoodsIdToAmount); - packingSplitPackages(operator, operatorCode,wrapper,wrapperCode, + packingSplitPackages(operator, operatorCode,wrapper,wrapperCode,inspector, inspectorCode, reviewer, reviewerCode,sterileUserName, sterileUserCode, sterilingType, sterilizerName, sterileFrequency, splits, splitsTousseList, tdOfPackingTask,packingRecord,taskGroup, washBasket,foreignTousseApplication, orgUnitCoding,orgUnitName, packingDate,tousseWeight,remark, currentPackingTask,idToWashRecordMap,idToRecyclingRecordMap,sterileStartTime,errorDamageRemark); @@ -4521,7 +4523,7 @@ } JSONObject result = batchCreateTousseInstance( - operator, operatorCode,wrapper,wrapperCode, reviewer,reviewerCode,sterileUserName,sterileUserCode, packageType, + operator, operatorCode,wrapper,wrapperCode, inspector, inspectorCode, reviewer,reviewerCode,sterileUserName,sterileUserCode, packageType, sterilingType, idCardDefinitionId,idCardInstanceID, washBasket,sterilizerName, sterileFrequency,sterileStartTime, validUntil, warningUntil,currentPackingTaskAsList,packingRecord, tdOfPackingTask, tousseType,tousseName,foreignTousseApplication,packingDate, packingAmountForThisTask, @@ -5353,7 +5355,7 @@ * @return Map */ private JSONObject batchCreateTousseInstance(String operator, - String operatorCode,String wrapper,String wrapperCode, String reviewer, String reviewerCode,String sterileUserName, String sterileUserCode,String packageType, String sterilingType, + String operatorCode,String wrapper,String wrapperCode,String inspector,String inspectorCode, String reviewer, String reviewerCode,String sterileUserName, String sterileUserCode,String packageType, String sterilingType, String idCardDefinitionId,String idCardInstanceID, String washBasket,String sterilizerName, String sterileFrequency, Date sterileStartTime, Date validUntil, Date warningUntil,List packingTaskList, PackingRecord packingRecord, TousseDefinition tousseDefinition,String tousseType, String tousseName,ForeignTousseApplication foreignTousseApplication,Date packingDate, @@ -5441,7 +5443,7 @@ } TousseInstance tousseInstance = createTousseInstance(operator, - operatorCode,wrapper,wrapperCode, reviewer, reviewerCode,sterileUserName,sterileUserCode, packageType,sterilingType, + operatorCode,wrapper,wrapperCode, inspector, inspectorCode, reviewer, reviewerCode,sterileUserName,sterileUserCode, packageType,sterilingType, washBasket, sterilizerName, sterileFrequency, sterileStartTime, validUntil, warningUntil, packingRecord,taskGroup, tousseDefinition, tousseType, tousseName,foreignTousseApplication, packingDate, toussePrice, fluctuationPrice, tousseAmount, orgUnitCoding, orgUnitName,unTraceableTousse, barcodeStr, tousseWeight,remark, @@ -5813,7 +5815,7 @@ * @return */ private TousseInstance createTousseInstance(String operator, - String operatorCode,String wrapper,String wrapperCode, String reviewer, String reviewerCode, + String operatorCode,String wrapper,String wrapperCode, String inspector,String inspectorCode, String reviewer, String reviewerCode, String sterileUserName, String sterileUserCode, String packageType, String sterilingType, String washBasket, String sterilizerName, String sterileFrequency, @@ -5859,6 +5861,8 @@ tousseInstance.setOperatorCode(operatorCode); tousseInstance.setWrapper(wrapper); tousseInstance.setWrapperCode(wrapperCode); + tousseInstance.setInspector(inspector); + tousseInstance.setInspectorCode(inspectorCode); tousseInstance.setOperationTime(packingDate); //聚合包状态要保持一致 if(DatabaseUtil.isPoIdValid(comboTousseInstanceId)){ @@ -6155,10 +6159,17 @@ String packer = JSONUtil.optString(modificationInfoObj, "packer", "");// 配包人 String packerCode = JSONUtil.optString(modificationInfoObj, "packerCode", "");// 配包人 + String wrapper = JSONUtil.optString(modificationInfoObj, "wrapper", "");// 包装人 + String wrapperCode = JSONUtil.optString(modificationInfoObj, + "wrapperCode", "");// 包装人编码 String reviewer = JSONUtil.optString(modificationInfoObj, "reviewer", "");// 审核人 String reviewerCode = JSONUtil.optString(modificationInfoObj, "reviewerCode", "");// 审核人 + String inspector = JSONUtil.optString(modificationInfoObj, "inspector", "");// 检查人 + String inspectorCode = JSONUtil.optString(modificationInfoObj, "inspectorCode", "");// 检查人编码 + String sterilizationUser = JSONUtil.optString(modificationInfoObj, "sterilizationUser", "");// 灭菌员 + String sterilizationUserCode = JSONUtil.optString(modificationInfoObj, "sterilizationUserCode", "");// 灭菌员编码 String sterilingType = JSONUtil.optString(modificationInfoObj, "sterilingType", "");// 灭菌程序 String packageType = JSONUtil.optString(modificationInfoObj, @@ -6195,6 +6206,22 @@ tousseInstance.setOperatorCode(packerCode); modifyPackingRecord = true; } + if (StringUtils.isNotBlank(wrapperCode)) { + if(!StringUtils.equals(tousseInstance.getWrapper(), wrapper)){ + modifyContent.append("字段:包装人,原值：").append(tousseInstance.getWrapper()).append(",新值：").append(wrapper).append(";"); + } + tousseInstance.setWrapper(wrapper); + tousseInstance.setWrapperCode(wrapperCode); + modifyPackingRecord = true; + } + if (StringUtils.isNotBlank(inspectorCode)) { + if(!StringUtils.equals(tousseInstance.getInspector(), inspector)){ + modifyContent.append("字段:检查人,原值：").append(tousseInstance.getInspector()).append(",新值：").append(inspector).append(";"); + } + tousseInstance.setInspector(inspector); + tousseInstance.setInspectorCode(inspectorCode); + modifyPackingRecord = true; + } if (StringUtils.isNotBlank(reviewerCode)) { if(!StringUtils.equals(tousseInstance.getReviewer(), reviewer)){ modifyContent.append("字段:审核人,原值:").append(tousseInstance.getReviewer()).append(",新值:").append(reviewer).append(";"); @@ -6203,6 +6230,14 @@ tousseInstance.setReviewerCode(reviewerCode); modifyPackingRecord = true; } + if(StringUtils.isNotBlank(sterilizationUserCode)){ + if(!StringUtils.equals(tousseInstance.getSterilizationUser(), sterilizationUser)){ + modifyContent.append("字段:灭菌员,原值:").append(tousseInstance.getSterilizationUser()).append(",新值:").append(sterilizationUser).append(";"); + } + tousseInstance.setSterilizationUser(sterilizationUser); + tousseInstance.setSterilizationUserCode(sterilizationUserCode); + modifyPackingRecord = true; + } if (StringUtils.isNotBlank(remark)) { if(!StringUtils.equals(tousseInstance.getRemark(), remark)){ modifyContent.append("字段:备注,原值:").append(tousseInstance.getRemark()).append(",新值:").append(remark).append(";"); @@ -6309,6 +6344,14 @@ packingRecord.setReviewer(reviewer); update = true; } + if (StringUtils.isNotBlank(wrapperCode)) { + packingRecord.setWrapper(wrapper); + update = true; + } + if(StringUtils.isNotBlank(inspectorCode)){ + packingRecord.setInspector(inspector); + update = true; + } if(update){ objectDao.update(packingRecord); } @@ -6861,6 +6904,8 @@ tousseInstance.setWashOperatorCode(originalTousseInstance.getWashOperatorCode()); tousseInstance.setWrapper(originalTousseInstance.getWrapper()); tousseInstance.setWrapperCode(originalTousseInstance.getWrapperCode()); + tousseInstance.setInspector(originalTousseInstance.getInspector()); + tousseInstance.setInspectorCode(originalTousseInstance.getInspectorCode()); return tousseInstance; } @@ -6869,7 +6914,7 @@ @Override public void packingWithoutTask(JSONObject retObj,HttpServletRequest request) { String inspector = request.getParameter("inspector");// 检查人 -// String inspectorCode = request.getParameter("inspectorCode"); + String inspectorCode = request.getParameter("inspectorCode");// 检查人编码 String operator = request.getParameter("operator");// 配包者 String operatorCode = request.getParameter("operatorCode");// 配包者 String reviewer = request.getParameter("reviewer");// 审核者 @@ -7128,6 +7173,8 @@ tousseInstance.setOperatorCode(operatorCode); tousseInstance.setWrapper(wrapper); tousseInstance.setWrapperCode(wrapperCode); + tousseInstance.setInspector(inspector); + tousseInstance.setInspectorCode(inspectorCode); tousseInstance.setReviewerCode(reviewerCode); tousseInstance.setSterilizationUser(sterileUser); tousseInstance.setSterilizationUserCode(sterileCode); @@ -9035,7 +9082,7 @@ public Map queryPackingRecordVos( Set packingRecordIds) { StringBuilder sbd = new StringBuilder(500); - sbd.append("select packingRecord_id ,td.supplierName, min(ti.packageType) packageType,min(ss.sterilizationMode) sterilingMode,case when max(pr.invoicePlanId) is null then '否' else '是' end isTran from ") + sbd.append("select packingRecord_id ,td.supplierName, min(ti.packageType) packageType,min(ss.sterilizationMode) sterilingMode, min(ti.sterilizationUser) sterilizationUser,case when max(pr.invoicePlanId) is null then '否' else '是' end isTran from ") .append(TousseInstance.class.getSimpleName()) .append(" ti join ") .append(TousseDefinition.class.getSimpleName()) @@ -9057,6 +9104,7 @@ vo.setSupplierName(rs.getString("supplierName")); vo.setSterilingMode(rs.getString("sterilingMode")); vo.setIsTran(rs.getString("isTran")); + vo.setSterilizationUser(rs.getString("sterilizationUser")); packingRecordToPackageTypeMap.put(packingRecordId, vo); } } catch (Exception e) { Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java =================================================================== diff -u -r32336 -r32767 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java (.../PackingTableManager.java) (revision 32336) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java (.../PackingTableManager.java) (revision 32767) @@ -370,6 +370,7 @@ } packingRecordVo vo = packingRecordToPackageTypeMap.get(packingRecord.optLong("id")); packingRecord.put("sterilingMode", vo.getSterilingMode()); + packingRecord.put("sterileUser", vo.getSterilizationUser()); packingRecord.put("isTran", vo.getIsTran()); } resultStr = result.toString(); Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java =================================================================== diff -u -r32501 -r32767 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java (.../PackingAction.java) (revision 32501) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java (.../PackingAction.java) (revision 32767) @@ -813,6 +813,7 @@ packingRecord.put("packageType", vo.getPackageType()); packingRecord.put("supplierName", vo.getSupplierName()); packingRecord.put("sterilingMode", vo.getSterilingMode()); + packingRecord.put("sterileUser", vo.getSterilizationUser()); packingRecord.put("isTran", vo.getIsTran()); } }