Index: ssts-web/src/main/webapp/homepage/portalPage.js =================================================================== diff -u -r37994 -r38053 --- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 37994) +++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 38053) @@ -329,7 +329,7 @@ }else{ setTimeout(function(){ if(objId!= 'packing' && objId != 'reviewPacking' && objId != 'sterilizationRecord'){ - //如果li的图标为使用记录且同时拥有病人使用记录与科室记录两个权限时,点击该图标不会有任何效果 + //如果li的图标为使用记录且同时拥有患者使用记录与科室记录两个权限时,点击该图标不会有任何效果 if(!(objId == 'useRecord' && hasTwoUseRecordOperation)){ addTab(objId, scrObj.getAttribute("title"), scrObj.getAttribute("href")); } @@ -523,13 +523,13 @@ if (useRecordImg && hasTwoUseRecordOperation){ //使用记录 var useRecordMenuBox = ''; $('#useRecord').append(useRecordMenuBox); $('#useRecord .child li').click(function(item){ var text = item.target.innerText; - if(text == '病人使用记录'){ + if(text == '患者使用记录'){ addTab('useRecord','/disinfectsystem/useRecord/useRecordView.jsp'); }else { addTab('useRecord','/disinfectsystem/useRecord/useRecordView.jsp?departmentUseRecord=true'); @@ -579,7 +579,7 @@ }); useRecordMenu.add({ - text : '病人使用记录', + text : '患者使用记录', url : '/disinfectsystem/useRecord/useRecordView.jsp' }); @@ -1438,7 +1438,7 @@ } if(itemId == 'useRecord'){ var itemTitle = item['title']; - //如果为使用记录时,只有一个使用记录权限(要么是病人使用记录、要么是科室使用记录) + //如果为使用记录时,只有一个使用记录权限(要么是患者使用记录、要么是科室使用记录) if(hasTwoUseRecordOperation){ returnContent += '
  • '; returnContent += '

    '; @@ -1447,7 +1447,7 @@ } var itemLinkUrl = item['itemLinkUrl']; if(!SSTS_UseRecord_Menu){ - itemTitle = "病人使用记录"; + itemTitle = "患者使用记录"; }else if(!SSTS_DepartmentUseRecord_Menu){ itemTitle = "科室使用记录"; itemLinkUrl = "/disinfectsystem/useRecord/useRecordView.jsp?departmentUseRecord=true"; Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r37676 -r38053 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 37676) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 38053) @@ -3178,13 +3178,13 @@ processType: '处理方式', hospitalNumber: '住院号', clinicNumber: '诊疗号', - patient: '病人姓名', + patient: '患者姓名', patientArea: '病区', roomNumber: '病室', bedNumber: '床位', patientAge: '年龄', patientSex: '性别', - ascriptionDepartment: '病人所属科室', + ascriptionDepartment: '患者所属科室', surgery: '手术名称', operationTime: '手术时间', doctor: '医生', @@ -3215,7 +3215,7 @@ patientAge: '年龄', patientSex: '性别', patientArea: '病区', - departNameOfpatient: '病人所在科室', + departNameOfpatient: '患者所在科室', roomNumber: '病室', bedNumber: '床位', patientIDCard: '身份证', Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js =================================================================== diff -u -r37868 -r38053 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 37868) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 38053) @@ -6,7 +6,7 @@ var recyclingApplicationFormHeight = 620; var recyclingApplicationInfoWidth = 950; -//预约或者自定义下的病人信息的显示与否 +//预约或者自定义下的患者信息的显示与否 var isPatient = false; var isPatientWidth = 425; var isPatientHeight = 140; @@ -833,7 +833,7 @@ hidden: isPatient, items: [{ xtype: 'textfield', - fieldLabel: '病人姓名', + fieldLabel: '患者姓名', maxLength: '41', id: 'patientName', name: 'patientName', @@ -910,7 +910,7 @@ hidden: isPatient, items: [{ xtype: 'textfield', - fieldLabel: '病人所属科室', + fieldLabel: '患者所属科室', maxLength: '41', id: 'ascriptionDepartment', name: 'ascriptionDepartment', Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js =================================================================== diff -u -r37956 -r38053 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 37956) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 38053) @@ -310,7 +310,7 @@ $Id('parm_s_frequency').value = $Id('frequency').value; //炉次 - $Id('parm_s_patientName').value = Ext.getCmp('patientName').getValue(); //病人姓名 + $Id('parm_s_patientName').value = Ext.getCmp('patientName').getValue(); //患者姓名 $Id('parm_s_hospitalNum').value = Ext.getCmp('hospitalNum').getValue(); //住院号 $Id('parm_s_treatmentNum').value = Ext.getCmp('treatmentNum').getValue(); //诊疗号 $Id('parm_s_isDisableIDCard').value = Ext.getCmp('isDisableIDCard').getValue(); @@ -388,7 +388,7 @@ queryCondition['frequency'] = $Id('frequency').value; //炉次 - queryCondition['patientName'] = Ext.getCmp('patientName').getValue(); //病人姓名 + queryCondition['patientName'] = Ext.getCmp('patientName').getValue(); //患者姓名 queryCondition['hospitalNum'] = Ext.getCmp('hospitalNum').getValue(); //住院号 queryCondition['treatmentNum'] = Ext.getCmp('treatmentNum').getValue(); //诊疗号 queryCondition['isDisableIDCard'] = Ext.getCmp('isDisableIDCard').getValue(); @@ -1307,7 +1307,7 @@ {header : "下送开始时间",width : 125,dataIndex : 'printTime',menuDisabled : false,renderer:myDateFormatBySecond,sortable: true}, {header : "签收人",width : 60,dataIndex : 'signedUser', hidden:!sstsConfig.showSignedItems, sortable: false,menuDisabled : true}, {header : "签收时间",width : 125,dataIndex : 'signedDate', hidden:!sstsConfig.showSignedItems, menuDisabled : false,renderer:myDateFormatBySecond,sortable: true}, - {header : "使用病人",width : 60,dataIndex : 'patientName',hidden:!sstsConfig.showUseRecordItems,sortable: false}, + {header : "使用患者",width : 60,dataIndex : 'patientName',hidden:!sstsConfig.showUseRecordItems,sortable: false}, {header : "使用医生",width : 60,dataIndex : 'doctorName',hidden:!sstsConfig.showUseRecordItems,sortable: false}, {header : "使用时间",width : 125,dataIndex : 'useTime',hidden:!sstsConfig.showUseRecordItems,renderer : myDateFormatBySecond}, {header : "废弃时间",width : 125,dataIndex : 'wasteDate',menuDisabled : false,renderer:myDateFormatBySecond,sortable: false}, @@ -2001,7 +2001,7 @@ labelAlign:"right", items : { xtype : 'textfield', - fieldLabel : '病人姓名', + fieldLabel : '患者姓名', name : 'patientName', id : 'patientName', anchor : '100%', Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js =================================================================== diff -u -r37623 -r38053 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 37623) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 38053) @@ -37,7 +37,7 @@ var patientSexAllowBlank = true; //病区 var patientAreaAllowBlank = true; -//病人所在科室 +//患者所在科室 var departNameOfpatientAllowBlank = true; //病室 var roomNumberAllowBlank = true; @@ -88,7 +88,7 @@ patientSexAllowBlank = allowBlankObj.patientSex; //病区 patientAreaAllowBlank = allowBlankObj.patientArea; - //病人所在科室 + //患者所在科室 departNameOfpatientAllowBlank = allowBlankObj.departNameOfpatient; //病室 roomNumberAllowBlank = allowBlankObj.roomNumber; @@ -193,7 +193,7 @@ { name: 'haveUnSupplementMaterials' }, { name: 'tousseMaterialErrorDamageJsonData' }, { name: 'urgentAdditionalInfo' }, - //病人名称，住院号，诊疗号 + //患者名称，住院号，诊疗号 { name: 'hospitalNumber' }, { name: 'clinicNumber' }, { name: 'patient' }, @@ -618,7 +618,7 @@ signGoodsWin.show(); } -//GDSZYY-88:验证外来器械包的病人信息与使用记录中的病人信息是否一致 +//GDSZYY-88:验证外来器械包的患者信息与使用记录中的患者信息是否一致 function validPatientInfo(arr) { var hospitalNum = top.Ext.getCmp('hospitalNum').getValue() || ''; var treatmentNum = top.Ext.getCmp('treatmentNum').getValue() || ''; @@ -670,7 +670,7 @@ } } if (nameArr.length > 0) { - showResult('请注意,以下外来器械包的病人信息与使用记录中的病人信息不一致：' + nameArr.join(",") + '！'); + showResult('请注意,以下外来器械包的患者信息与使用记录中的患者信息不一致：' + nameArr.join(",") + '！'); } } @@ -2736,7 +2736,7 @@ },{ layout : 'form', columnWidth :.33, - hidden: fromDepartmentUseRecord || !(sstsConfig.enableUseRecordFormExtensionFields && sstsConfig.enableUseRecordFormExtensionFields.contains('病人ID')), + hidden: fromDepartmentUseRecord || !(sstsConfig.enableUseRecordFormExtensionFields && sstsConfig.enableUseRecordFormExtensionFields.contains('患者ID')), items : [{ xtype : 'textfield', fieldLabel : 'ID', @@ -2845,7 +2845,7 @@ var _parentNode = top.Ext.getDom('treatmentNum').parentNode; top.Ext.get(_parentNode).createChild({ tag: 'span', - html: '' + html: '' }); } }, @@ -3749,21 +3749,21 @@ top.Ext.getCmp('reviewTime').setValue(formatDateYear(action.result.data.reviewTime)); top.Ext.getCmp('applicationTime').setValue(formatDateYear(action.result.data.applicationTime)); top.Ext.getCmp('operationTime').setValue(formatDateYear(action.result.data.operationTime)); - //ext下拉框赋值前先判空,防止出现漏洞导致广医二院的情况(病人所在科室显示为"番禺。。。",实际值为空) + //ext下拉框赋值前先判空,防止出现漏洞导致广医二院的情况(患者所在科室显示为"番禺。。。",实际值为空) var departCodeOfpatient = action.result.data.departCodeOfpatient; var departNameOfpatient = action.result.data.departNameOfpatient; if (departCodeOfpatient) { top.Ext.getCmp('departCodeOfpatient').setValue(departCodeOfpatient); top.Ext.getCmp('departNameOfpatient').setRawValue(departNameOfpatient); } else { - // 病人所在科室的名称有值，病人所在科室编码没值的情况 + // 患者所在科室的名称有值，患者所在科室编码没值的情况 var ascriptionDepartment = action.result.data.ascriptionDepartment; if (ascriptionDepartment) { departJsonStore.each(function (record) { var nameOfDepartJsonStore = record.get("name"); if (nameOfDepartJsonStore == ascriptionDepartment) { top.Ext.getCmp('departNameOfpatient').setRawValue(ascriptionDepartment); - //设置病人所在科室的编码 + //设置患者所在科室的编码 top.Ext.getCmp('departCodeOfpatient').setValue(record.get("id")); return false; } Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js =================================================================== diff -u -r37444 -r38053 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js (.../useRecordView.js) (revision 37444) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js (.../useRecordView.js) (revision 38053) @@ -61,7 +61,7 @@ } }); -//BJ309YY-5：病人所属科室 +//BJ309YY-5：患者所属科室 var ascriptionDepartmentItems = Ext.data.Record.create([ { name: 'id', type: 'string' }, { name: 'fullName', type: 'string' } @@ -127,7 +127,7 @@ var ids = null; for (var i = 0, len = records.length; i < len; i++) { if (records[i].data['status'] != '未审核') { - showResult('病人名称为“' + records[i].data['patientName'] + '”的使用记录' + showResult('患者名称为“' + records[i].data['patientName'] + '”的使用记录' + records[i].data['status'] + '不能删除'); return false; } @@ -331,12 +331,12 @@ var departMap = new Map(); for (var i = 0, len = records.length; i < len; i++) { if (records[i].data['status'] != '已审核') { - showResult('病人名称为“' + records[i].data['patientName'] + showResult('患者名称为“' + records[i].data['patientName'] + '”的使用记录不能生成申请单,请确认使用记录已审核且未转化成申请单'); return false; } if ((records[i].data['recyclingStatus'] == "已回收" || records[i].data['recyclingStatus'] == '部分回收') && sstsConfig.monitorGoodsRecyclingStatusForUseRecord) { - showResult('病人名称为[' + records[i].data['patientName'] + showResult('患者名称为[' + records[i].data['patientName'] + ']的记录不能生成申请单,请确认该条记录为未回收状态或空'); return false; } @@ -437,7 +437,7 @@ var departMap = new Map(); for (var i = 0, len = records.length; i < len; i++) { if (records[i].data['status'] == '已申请') { - showResult('病人名称为“' + records[i].data['patientName'] + showResult('患者名称为“' + records[i].data['patientName'] + '”的使用记录已经生成申请单,不能重复申请'); return false; } @@ -491,12 +491,12 @@ var departJson = {}; for (var i = 0, len = records.length; i < len; i++) { if (records[i].data['priorConvertStatus'] == '已转换') { - showResult('病人名称为【' + records[i].data['patientName'] + showResult('患者名称为【' + records[i].data['patientName'] + '】的使用记录已被优先转换申请单,不能重复优先转换申请单'); return false; } if (records[i].data['status'] == '已申请') { - showResult('病人名称为【' + records[i].data['patientName'] + showResult('患者名称为【' + records[i].data['patientName'] + '】的使用记录已经生成申请单,不能优先转换申请单'); return false; } @@ -587,7 +587,7 @@ htmlTable += "" + "住院号" + "" + objData[i].hospitalNum + "" + - "病人" + + "患者" + "" + objData[i].patientName + "" + "巡回护士" + "" + objData[i].circuitNurse + "" + @@ -1090,7 +1090,7 @@ selectionModel.each(function (row) { selections.push(row.data.id); if ("已回收" == row.data.recyclingStatus) { - showResult("病人名称为【" + row.data.patientName + "】的数据已经是已回收状态了!"); + showResult("患者名称为【" + row.data.patientName + "】的数据已经是已回收状态了!"); isReturn = true; return; }