Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesView.js =================================================================== diff -u -r15614 -r15615 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesView.js (.../cssdHandleToussesView.js) (revision 15614) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesView.js (.../cssdHandleToussesView.js) (revision 15615) @@ -92,8 +92,8 @@ {header : "科室名称",width : 180,dataIndex : 'orgUnitName'}, {header : "任务组",width : 180,dataIndex : 'taskGroup'}, {header : "器械包名称",width : 180,dataIndex : 'tousseName',id:'tousseName'}, - {header : "器械包拼音码",dataIndex : 'spelling'}, - {header : "器械包五笔码",dataIndex : 'wbCode'} + {header : "器械包拼音码",dataIndex : 'spelling', hidden:true}, + {header : "器械包五笔码",dataIndex : 'wbCode', hidden:true} ]; var readerDetail = [ Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsView.js =================================================================== diff -u -r14279 -r15615 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsView.js (.../cssdServiceDeptsView.js) (revision 14279) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsView.js (.../cssdServiceDeptsView.js) (revision 15615) @@ -84,7 +84,9 @@ {header : "器械类型",width : 120,dataIndex : 'tousseType'}, // {header : "clinicOrgUnitId",dataIndex : 'clinicOrgUnitId', hidden:true}, {header : "临床科室编码",width : 100,dataIndex : 'clinicOrgUnitCode'}, - {header : "临床科室名称",width : 120,dataIndex : 'clinicOrgUnitName',id:'clinicOrgUnitName'} + {header : "临床科室名称",width : 120,dataIndex : 'clinicOrgUnitName',id:'clinicOrgUnitName'}, + {header : "临床科室拼音码",dataIndex : 'spelling', hidden:true}, + {header : "临床科室五笔码",dataIndex : 'wbCode', hidden:true} ]; var readerDetail = [ @@ -95,7 +97,9 @@ {name : 'clinicOrgUnitId'}, {name : 'clinicOrgUnitCode'}, {name : 'clinicOrgUnitName'}, - {name : 'tousseType'} + {name : 'tousseType'}, + {name : 'spelling'}, + {name : 'wbCode'} ]; var filters = new Ext.grid.GridFilters({ @@ -104,7 +108,9 @@ {type : 'string',dataIndex : 'cssdOrgUnitName'}, {type : 'numeric',dataIndex : 'clinicOrgUnitCode'}, {type : 'numeric',dataIndex : 'clinicOrgUnitName'}, - {type : 'string',dataIndex : 'tousseType'} + {type : 'string',dataIndex : 'tousseType'}, + {type : 'string',dataIndex : 'spelling'}, + {type : 'string',dataIndex : 'wbCode'} ] }); @@ -144,7 +150,7 @@ tbar : tbar, pageSize : 20, defaultSortField : 'id', - defaultSortDirection : 'ASC', + defaultSortDirection : 'DESC', isCheckboxSelectionModel : true, rememberSelected : false, isShowSearchField : true, Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts/action/CssdServiceDeptsAction.java =================================================================== diff -u -r13834 -r15615 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts/action/CssdServiceDeptsAction.java (.../CssdServiceDeptsAction.java) (revision 13834) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts/action/CssdServiceDeptsAction.java (.../CssdServiceDeptsAction.java) (revision 15615) @@ -121,6 +121,8 @@ orgUnitMap.put("id", orgUnit.getId()); orgUnitMap.put("orgUnitCoding", orgUnit.getOrgUnitCoding()); orgUnitMap.put("name", orgUnit.getName()); + orgUnitMap.put("spelling", orgUnit.getSpelling()); //把临床科室的拼音码也传到前台（cjr） + orgUnitMap.put("wbCode", orgUnit.getWbCode()); orgUnitMapList.add(orgUnitMap); } } @@ -191,6 +193,8 @@ clinicOrg.setId(cssdServiceDepts.getClinicOrgUnitId()); clinicOrg.setOrgUnitCoding(cssdServiceDepts.getClinicOrgUnitCode()); clinicOrg.setName(cssdServiceDepts.getClinicOrgUnitName()); + clinicOrg.setSpelling(cssdServiceDepts.getSpelling()); //（cjr） + clinicOrg.setWbCode(cssdServiceDepts.getWbCode()); List clinicOrgList = new ArrayList(); clinicOrgList.add(clinicOrg); Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsForm.js =================================================================== diff -u -r12848 -r15615 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsForm.js (.../cssdServiceDeptsForm.js) (revision 12848) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsForm.js (.../cssdServiceDeptsForm.js) (revision 15615) @@ -38,6 +38,14 @@ name : 'clinicOrgUnitName', id : 'clinicOrgUnitName' },{ + xtype : 'hidden', + name : 'spelling', + id : 'spelling' + },{ + xtype : 'hidden', + name : 'wbCode', + id : 'wbCode' + },{ layout : 'column', labelWidth : 80, items : [{ @@ -48,24 +56,10 @@ layout : 'column', autoHeight : true, items : [{ - columnWidth : .3, + columnWidth : .5, layout : 'form', items:[{ xtype : 'textfield', - fieldLabel : "供应室编码", - value:currentOrgUnitCode, - readOnly:true, - allowBlank : false, - blankText : '请输入名称!', - name : "cssdOrgUnitCode", - id : "cssdOrgUnitCode", - anchor : '100%' - }] - },{ - columnWidth : .4, - layout : 'form', - items:[{ - xtype : 'textfield', fieldLabel : "供应室名称", allowBlank : false, blankText : '请输入名称!', @@ -82,35 +76,27 @@ } }] }, { - columnWidth : .3, - layout : 'form', - items:[{ - xtype : 'combo', - fieldLabel : '服务物品类型', - listWidth:200, - id : 'tousseType', - name : 'tousseType', - editable:false, - valueField : 'value', - displayField : 'value', - mode : 'local', - store : new Ext.data.SimpleStore({ - fields:['value'], - data:[['器械包'],['一次性物品']] - }), - forceSelection : true, - allowBlank : false, - triggerAction : 'all', - anchor : '100%' - }] - },{ - columnWidth : 1, + columnWidth : .5, + layout : 'form', + items:[{ + xtype : 'textfield', + fieldLabel : "供应室编码", + value:currentOrgUnitCode, + readOnly:true, + allowBlank : false, + blankText : '请输入名称!', + name : "cssdOrgUnitCode", + id : "cssdOrgUnitCode", + anchor : '100%' + }] + }, { + columnWidth : .5, layout : 'form', items:[{ xtype : 'combo', fieldLabel : '临床科室', //width:180, - listWidth:200, +// listWidth:200, id : 'clinicOrgUnit', name : 'clinicOrgUnit', queryParam : 'spell', @@ -128,7 +114,9 @@ }, [ {name : 'id',mapping : 'id'}, {name : 'orgUnitCoding',mapping : 'orgUnitCoding'}, - {name : 'name',mapping : 'name'} + {name : 'name',mapping : 'name'}, + {name : 'spelling',mapping : 'spelling'}, + {name : 'wbCode',mapping : 'wbCode'} ]) }), forceSelection : true, @@ -143,10 +131,34 @@ top.Ext.getCmp("clinicOrgUnitId").setValue(record.data.id); top.Ext.getCmp("clinicOrgUnitCode").setValue(record.data.orgUnitCoding); top.Ext.getCmp("clinicOrgUnitName").setValue(record.data.name); + top.Ext.getCmp("spelling").setValue(record.data.spelling); + top.Ext.getCmp("wbCode").setValue(record.data.wbCode); } } }] - }] + }, { + columnWidth : .5, + layout : 'form', + items:[{ + xtype : 'combo', + fieldLabel : '服务物品类型', +// listWidth:200, + id : 'tousseType', + name : 'tousseType', + editable:false, + valueField : 'value', + displayField : 'value', + mode : 'local', + store : new Ext.data.SimpleStore({ + fields:['value'], + data:[['器械包'],['一次性物品']] + }), + forceSelection : true, + allowBlank : false, + triggerAction : 'all', + anchor : '100%' + }] + }] }] }], buttons : [{ @@ -168,11 +180,11 @@ cssdServiceDeptsWin = new top.Ext.Window({ id : 'cssdServiceDeptsWin', layout : 'fit', - title : '仓库管理', + title : '服务临床科室管理', width : 600, border : false, modal : true, - height : 260, + height : 180, plain : true, items : [formObj] }); Index: forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java =================================================================== diff -u -r15585 -r15615 --- forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java (.../OrgUnitManagerImpl.java) (revision 15585) +++ forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java (.../OrgUnitManagerImpl.java) (revision 15615) @@ -834,6 +834,8 @@ cssdServiceDepts.setClinicOrgUnitCode(orgUnit.getOrgUnitCoding()); cssdServiceDepts.setClinicOrgUnitName(orgUnit.getName()); cssdServiceDepts.setTousseType(tousseType); + cssdServiceDepts.setSpelling(orgUnit.getSpelling()); //（cjr） + cssdServiceDepts.setWbCode(orgUnit.getWbCode()); //判断是否已配置,防止重复插入(根据科室信息相同且器械包信息也相同则表示为已配置) if(getCssdServiceDeptsConfig(cssdServiceDepts) == null){ objectDao.saveOrUpdate(cssdServiceDepts); Index: forgon-core/src/main/java/com/forgon/directory/model/CssdServiceDepts.java =================================================================== diff -u -r12674 -r15615 --- forgon-core/src/main/java/com/forgon/directory/model/CssdServiceDepts.java (.../CssdServiceDepts.java) (revision 12674) +++ forgon-core/src/main/java/com/forgon/directory/model/CssdServiceDepts.java (.../CssdServiceDepts.java) (revision 15615) @@ -70,6 +70,16 @@ */ public static String TOUSSETYPE_DIPOSABLEGOODS = "一次性物品"; + /** + * 临床科室的拼音码 + */ + private String spelling; + + /** + * 临床科室的五笔码 + */ + private String wbCode; + @Id @GeneratedValue(strategy = GenerationType.AUTO) public Long getId() { @@ -135,5 +145,21 @@ public void setTousseType(String tousseType) { this.tousseType = tousseType; } + + public String getSpelling() { + return spelling; + } + + public void setSpelling(String spelling) { + this.spelling = spelling; + } + + public String getWbCode() { + return wbCode; + } + + public void setWbCode(String wbCode) { + this.wbCode = wbCode; + } } \ No newline at end of file