Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js =================================================================== diff -u -r21198 -r21219 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js (.../washForTouchScreen.js) (revision 21198) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js (.../washForTouchScreen.js) (revision 21219) @@ -409,14 +409,19 @@ } } } - personInCharge = $("#personInCharge").val(); - var personInChargeCode = $("#personInChargeCode").val(); + var basketName = result.data.container.name; var amount = result.data.container.amount; + personInCharge = result.data.container.personInCharge; //篮筐有责任人则显示 + var personInChargeCode = result.data.container.personInChargeCode; var classifyBasketId = result.data.id; var basketBarcode = result.data.container.barcode; var itemsInfo = result.data.itemAmountInfos; var isExist = isBasketExist(classifyBasketId); + if(personInCharge == null || personInCharge == ''){ //没有篮筐责任人取界面传的责任人 + personInCharge = $("#personInCharge").val(); + personInChargeCode = $("#personInChargeCode").val(); + } if(!isExist){ createBasketUiElement(basketBarcode,classifyBasketId,type,basketName,amount,position,personInCharge,personInChargeCode,itemsInfo); $("#scanContainerBarcodeTipUl").hide(); @@ -678,6 +683,8 @@ var classifyBasketInfo = getClassifyBasketInfo(); var materialData = getMaterialData(); + var washPersonInCharge = $("#personInCharge").val(); //界面最后显示的责任人保存为清洗责任人 + var washPersonInChargeCode = $("#personInChargeCode").val(); var disinfectIdentification = $("#disinfectIdentification").val(); var disinfectProgram = $("#disinfectProgram").val(); var startDateStr = $("#startDate").val(); @@ -696,7 +703,9 @@ endDateStr : endDateStr, cycleCounter : 0, materialData :materialData, - classifyBasketInfo : classifyBasketInfo + classifyBasketInfo : classifyBasketInfo, + washPersonInCharge : washPersonInCharge, + washPersonInChargeCode : washPersonInChargeCode }, success : function(result) { if(result.success){ Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js =================================================================== diff -u -r20781 -r21219 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js (.../washAndDisinfectForm.js) (revision 20781) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js (.../washAndDisinfectForm.js) (revision 21219) @@ -541,9 +541,13 @@ } var root = top.Ext.getCmp('basketTreePanel').root; root.appendChild(basket); - if(basket.attributes.personInCharge != null && basket.attributes.personInCharge != ''){ - top.Ext.getCmp('personInCharge').setValue(basket.attributes.personInCharge); - top.Ext.getCmp('personInChargeCode').setValue(basket.attributes.personInChargeCode); +// if(basket.attributes.personInCharge != null && basket.attributes.personInCharge != ''){ +// top.Ext.getCmp('personInCharge').setValue(basket.attributes.personInCharge); +// top.Ext.getCmp('personInChargeCode').setValue(basket.attributes.personInChargeCode); +// } + if(basketJson.washPersonInCharge != null && basketJson.washPersonInCharge != ''){ //清洗记录责任人取清洗记录自己保存的责任人 + top.Ext.getCmp('personInCharge').setValue(basketJson.washPersonInCharge); + top.Ext.getCmp('personInChargeCode').setValue(basketJson.washPersonInCharge); } if(basket.attributes.position != null && basket.attributes.position != ''){ top.Ext.getCmp('position').setValue(basket.attributes.position); @@ -559,6 +563,10 @@ amount : materialJson.amount }); materialStore.add(material); + if(materialJson.washPersonInCharge != null && materialJson.washPersonInCharge != ''){ //清洗记录责任人取自己清洗记录保存的责任人 + top.Ext.getCmp('personInCharge').setValue(materialJson.washPersonInCharge); + top.Ext.getCmp('personInChargeCode').setValue(materialJson.washPersonInCharge); + } } resetContainerCount();//编辑时计算已扫描篮筐数量 }, @@ -1604,11 +1612,14 @@ var conCurrent = top.Ext.getCmp("conCurrent").getValue(); var orgWashStartTime = top.Ext.getCmp('orgWashStartTime').getValue(); var orgWashEndTime = top.Ext.getCmp('orgWashEndTime').getValue(); + var washPersonInCharge = top.Ext.getCmp('personInCharge').getValue(); //取界面最后显示的责任人为清洗责任人 + var washPersonInChargeCode = top.Ext.getCmp('personInChargeCode').getValue(); + Ext.getCmp('washSaveSubmitResult').setValue("0"); top.Ext.getCmp("disinfectProgram").setValue(top.Ext.getCmp("disinfectProgram").getRawValue()); formObj.form.submit({ url : WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!saveWashAndDisinfectRecord.do', - params : {conCurrent :conCurrent, orgWashStartTime : orgWashStartTime, orgWashEndTime : orgWashEndTime}, + params : {conCurrent :conCurrent, orgWashStartTime : orgWashStartTime, orgWashEndTime : orgWashEndTime, washPersonInCharge : washPersonInCharge, washPersonInChargeCode : washPersonInChargeCode}, method : 'POST', waitMsg : '正在保存数据，请稍候', waitTitle : '提交表单', Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java =================================================================== diff -u -r20911 -r21219 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 20911) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 21219) @@ -523,6 +523,8 @@ Long recordId = washRecord.getId(); String orgWashStartTime = paramMap.get("orgWashStartTime"); String orgWashEndTime = paramMap.get("orgWashEndTime"); + String washPersonInCharge = paramMap.get("washPersonInCharge"); //清洗记录责任人 + String washPersonInChargeCode = paramMap.get("washPersonInChargeCode"); //清洗记录人编号 String startDateStr = ""; String endDateStr = ""; try { @@ -540,6 +542,8 @@ washRecord.setStartDate(sdf .parse(startDateStr)); washRecord.setEndDate(sdf.parse(endDateStr)); + washRecord.setWashPersonInCharge(washPersonInCharge); + washRecord.setWashPersonInChargeCode(washPersonInChargeCode); } catch (ParseException e) { e.printStackTrace(); } @@ -2004,6 +2008,8 @@ baskeJson.put("containerBarcode", classifyBasket.getContainerBarcode()); baskeJson.put("personInCharge", personInCharge); baskeJson.put("personInChargeCode", personInChargeCode); + baskeJson.put("washPersonInCharge", washAndDisinfectRecord.getWashPersonInCharge()); //给前端传清洗记录自己保存的责任人 + baskeJson.put("washPersonInChargeCode", washAndDisinfectRecord.getWashPersonInChargeCode()); baskeJson.put("position", position); if(IDcardInstanceBarcode != null){ baskeJson.put("IDcardInstanceBarcode", IDcardInstanceBarcode); @@ -2020,6 +2026,8 @@ materialJson.put("id", material.getId()); materialJson.put("name", material.getName()); materialJson.put("amount", material.getAmount()); + materialJson.put("washPersonInCharge", washAndDisinfectRecord.getWashPersonInCharge()); + materialJson.put("washPersonInChargeCode", washAndDisinfectRecord.getWashPersonInChargeCode()); materialArray.add(materialJson); } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java =================================================================== diff -u -r20892 -r21219 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java (.../WashAndDisinfectRecord.java) (revision 20892) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java (.../WashAndDisinfectRecord.java) (revision 21219) @@ -41,57 +41,100 @@ private Long id; - // 流水号 + /** + * 流水号 + */ private String serialNumber; - //记录生成时间 + /** + * 记录生成时间 + */ private Date recordCreateDate; - // 开始时间 + /** + * 开始时间 + */ private Date startDate; private String startDateStr; - // 结束时间 + /** + * 结束时间 + */ private Date endDate; private String endDateStr; - private String washStatus;//清洗状态 + /** + * 清洗状态 + */ + private String washStatus; public static final String STATUS_WASHING = "清洗中"; public static final String STATUS_WASHED = "清洗完成"; public static final String STATUS_WASHFAILD = "清洗失败"; - private String washingMode;//清洗方式-->人工或清洗机 + /** + * 清洗方式-->人工或清洗机 + */ + private String washingMode; public static String WASHINGMODE_MACHINE = "清洗机清洗"; public static String WASHINGMODE_MANUAL = "人工清洗"; - // 操作员 + /** + * 操作员 + */ private String operator; - //清洗人编码 + /** + * 清洗人编码 + */ private String operatorCode; - - // 清洗机名称 + + /** + * 清洗记录责任人 + */ + private String washPersonInCharge; + + /** + * 清洗记录责任人编号 + */ + private String washPersonInChargeCode; + + /** + * 清洗机名称 + */ private String disinfectIdentification; - //清洗机ID + /** + * 清洗机ID + */ private Long rinserId; - // 清洗机的循环次数 + /** + * 清洗机的循环次数 + */ private Long cycleCounter; - // 清洗温度记录的数量 + /** + * 清洗温度记录的数量 + */ private Long washDataAmount; - // 清洗程序 + /** + * 清洗程序 + */ private String disinfectProgram; - private String orgUnitCoding; //所属科室编码 + /** + * 所属科室编码 + */ + private String orgUnitCoding; - //本次记录清洗材料数量 + /** + *本次记录清洗材料数量 + */ private Integer generalMaterialAmount = 0;//普通器械清洗总数 private Integer operateMaterialAmount = 0;//手术器械清洗总数 /** @@ -105,14 +148,21 @@ private Integer disinfectMaterialAmount = 0; //消毒物品器械清洗总数 private Integer washMaterialAmount = 0;//清洗总数量 - // 器械包 + /** + * 器械包 + */ @JsonIgnore private List tousseInstanceList; + /** + * 清洗的篮筐 + */ @JsonIgnore - private List classifyBaskets = new ArrayList(); //清洗的篮筐 + private List classifyBaskets = new ArrayList(); - //清洗的未入筐材料 + /** + * 清洗的未入筐材料 + */ @JsonIgnore private List washAndDisinfectMaterials = new ArrayList(); @@ -378,4 +428,20 @@ this.secondWashForeignAmount = secondWashForeignAmount; } + public String getWashPersonInCharge() { + return washPersonInCharge; + } + + public void setWashPersonInCharge(String washPersonInCharge) { + this.washPersonInCharge = washPersonInCharge; + } + + public String getWashPersonInChargeCode() { + return washPersonInChargeCode; + } + + public void setWashPersonInChargeCode(String washPersonInChargeCode) { + this.washPersonInChargeCode = washPersonInChargeCode; + } + }