Index: ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml =================================================================== diff -u -r28832 -r28891 --- ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml (.../SyncOrgUnitAndUserMapper.xml) (revision 28832) +++ ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml (.../SyncOrgUnitAndUserMapper.xml) (revision 28891) @@ -7,15 +7,22 @@ Index: ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml =================================================================== diff -u -r28832 -r28891 --- ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml (.../FindPatientInfoByTreatmentNumMapper.xml) (revision 28832) +++ ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml (.../FindPatientInfoByTreatmentNumMapper.xml) (revision 28891) @@ -7,16 +7,15 @@ Index: ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/config.js =================================================================== diff -u -r28832 -r28891 --- ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/config.js (.../config.js) (revision 28832) +++ ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/config.js (.../config.js) (revision 28891) @@ -1,14 +1,15 @@ var sstsConfig = { hiddenOrgunitSyncButton:true, hiddenUserSyncButton:true, + hideStaffArchive:true, // 回收时科室显示结算科室 showSettleAccountsDepartInRecycling : false, // 审核器械包必须入篮筐(一级供应室) - mustScanBasketForTousseReview : true, + mustScanBasketForTousseReview : false, // 审核器械包必须入篮筐(二级供应室) mustScanBasketForTousseReviewOf2ndSupplyRoom : false, // 申请表单的类型:1 : 通用申请单(组合申请单),2:分开的申请单 - applicationFormType : 1, + applicationFormType : 2, //在界面上是否隐藏一次性物品的包装规格信息 hidePackageSpec : false, // 申请界面是否显示器械包或消毒物品的的单位 @@ -44,14 +45,16 @@ //使用记录模块的使用记录登记表单,洗手护士输入框是否为空 useRecordWashHandNurseAllowBlank : true, //审核界面,审核人是否不能为空。 + selectDepartInCustomPacking : true, reviewPageReviewerNotEmpty : false, //自定义装配后是否保留装配数量 packAmountProcessTypeInDirectPackingView: true, //自定义装配后是否保留灭菌日期 disinfectionDateProcessTypeInDirectPackingView : true, + //外来器械申请单允许多套 allowApplyMultipleForeignTousse : true, - //是否只转换已审核状态的使用记录单 + onlyConvertAuditedUseRecord:true, //定时转换病人使用记录申请单 enableUseRecordConvertConfig:true, @@ -65,19 +68,18 @@ //手术间为空临床科室也合并单 allowUseReordToApplicationMergeWhenOperationRoomIsBlank:true, //使用记录转申请单时低温物品拆分后的合并方式 - mergeRegularOfLowTemperatureToussesAfterExtracted:{"mergeRegular":"depart","lowTempSterilizationModes":["低温"]}, + //mergeRegularOfLowTemperatureToussesAfterExtracted:{"mergeRegular":"depart","lowTempSterilizationModes":["低温等离子","环氧乙烷"]}, //手术间必填 useRecordOperationRoomAllowBlank: false, - //隐藏申请科室 - hideApplyDepartColumn : false, - //隐藏结算科室 - hideSettleDepartColumn : true, + + hideApplyDepartColumn : false, // 隐藏申请科室 + hideSettleDepartColumn : true,// 隐藏结算科室 //回收界面回收人是否强制不能为空 recyclePageRecyclingUserNotNull : false, //回收一键入筐 - recycleAllTousseIntoBasket : false, + recycleAllTousseIntoBasket : true, //回收自定义入筐 - recycleAllMateriallntoBasket : false, + recycleAllMateriallntoBasket : true, //是否显示按照时间查询 showTimeSearch : true, //科室申领时间过滤,开始日期是否为当天 @@ -91,11 +93,11 @@ //是否显示打印过滤选择框 showPrintFilter: true, //清洗筐是否装配完成才能回收 - recycleClassifyBasketAfterPacked : false, + recycleClassifyBasketAfterPacked : true, // 是否显示装配界面的打印按钮 packingView_currentTaskGroup_showPrintBtn: true, //是否启用聚合包功能 - enableComboTousse: true, + enableComboTousse: false, //如果配置为不需要在单位前加上最小申请数量时,则用原单位,否则加上最小申请数量与斜杠 notNeedMinApplyAmountBeforeUnit : true, //科室申领列表自动刷新间隔时间(单位:秒) @@ -125,6 +127,7 @@ //是否在点击批量打印后显示未打印的名单 isShowNoPrintList : true, //是否显示核对人 + showWrapperField:true, showInvoiceAssistantSender : false, //是否显示发货计划下送责任人 showInvoicePersonInCharge : false, @@ -150,8 +153,12 @@ splitForeignTousseNameStyle:1, //是否启用自定义回收的篮筐序号。目前就外来器械拆包有用 enableClassifyBasketSequence:true, + //禁用外来器械 + //disableForeignTousse:true, + //禁用一次性物品 + //disableDisposableGoods:true, //禁用自定义表单 - closeFormDefinition:false, + closeFormDefinition:true, //启用培训管理 hideTrainingManage:false, //清洗机硬件接口 @@ -163,9 +170,9 @@ //器械包标识牌管理 disableIdCard:false, //拍摄管理(图片/视频) - showCameraPhoto:true, + showCameraPhoto:false, //标识牌和篮筐绑定 - enableIdCardBasketBinding:true, + enableIdCardBasketBinding:false, //允许部分回收 enablePartRecycle:true, //隐藏外部代理灭菌的申请人 @@ -177,17 +184,13 @@ //丢失之后不补充进行装配 allowPackingWhenUnSupplementMaterial:true, //外来器械桌面图标 - enableForeignTousseApplicationDesktopIcon:true, + enableForeignTousseApplicationDesktopIcon:false, //手术间管理 enableOperationRoomManagerViwe:true, //允许回收还物单 allowInsteadReturn:true, //历史回收记录列表显示手术间列 showORRoomColumnInHistoryRecyclingRecordList:true, //外来器械发货单是否按申请单合并打印 - mergePrintForeignTousseInvoiceByApplication:true, - //是否允许清洗责任人为空 - washAndDisinfectRecordPersonInChargeAllowBlank:false, - //是否启用清洗交接记录视图列表 - enableWashTransitionRecordView:true + mergePrintForeignTousseInvoiceByApplication:true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml =================================================================== diff -u -r28832 -r28891 --- ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml (.../FindPatientInfoByHospitalNumMapper.xml) (revision 28832) +++ ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml (.../FindPatientInfoByHospitalNumMapper.xml) (revision 28891) @@ -7,34 +7,32 @@ Index: ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/spring/HIS.xml =================================================================== diff -u -r28832 -r28891 --- ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/spring/HIS.xml (.../HIS.xml) (revision 28832) +++ ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/spring/HIS.xml (.../HIS.xml) (revision 28891) @@ -88,9 +88,9 @@ - - - + + +