Index: ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/menu/menuconfigure.js
===================================================================
diff -u -r35830 -r38562
--- ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/menu/menuconfigure.js	(.../menuconfigure.js)	(revision 35830)
+++ ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/menu/menuconfigure.js	(.../menuconfigure.js)	(revision 38562)
@@ -141,8 +141,7 @@
 	children:[
         {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查表定义",href:WWWROOT+'/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_SatisfactionSurveyTable_Menu,text:"满意度调查表",href:WWWROOT+'/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/departSatisfyView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查明细报表",href:WWWROOT+'/disinfectsystem/reportforms/departSatisfyDetailView.jsp',hrefTarget:linkTarget,leaf:true}
+        {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查报表",href:WWWROOT+'/disinfectsystem/reportforms/departSatisfyView.jsp',hrefTarget:linkTarget,leaf:true}
     ]
 };
 DisinfectsystemTreeData[11] = {
@@ -499,6 +498,14 @@
 	          {hidden :SSTS_MESSAGE_Menu,text:"消息发布管理",href:WWWROOT+'/disinfectsystem/message/message.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}
 	          ]
 },{
+	text:"科室问题反馈",
+	singleClickExpand:singleClickExpandTree,
+	hidden:SSTS_ProblemReport_Menu,
+	children:[
+		{hidden :SSTS_ProblemReport_Menu,text:"科室问题反馈",href:WWWROOT+'/disinfectsystem/problemReport/problemReport.jsp',hrefTarget:linkTarget,leaf:true},
+		{hidden :SSTS_ProblemReport_Menu,text:"科室问题反馈类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=question_feedback',hrefTarget:linkTarget,leaf:true}
+	]
+},{
 	text:"系统告警",
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_SystemWarning_Menu,
@@ -520,7 +527,8 @@
         {hidden :SSTS_ReturnGoodsRecord_Menu,text:"退货记录信息",href:WWWROOT+'/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_ReturnGoodsRecord_Menu,text:"材料退货记录",href:WWWROOT+'/disinfectsystem/returnMaterialRecord/returnMaterialRecordView.jsp',hrefTarget:linkTarget,leaf:true}
     ]
-},{
+},
+{
 	text:"召回记录管理",
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_RecallRecord_Menu,
@@ -575,9 +583,9 @@
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_WorkLoad_Menu,
 	children:[
-	    {hidden :!(sstsConfig.enableNewYearWorkloadReport) || SSTS_YearWorkload,text:"消毒供应中心年度工作量统计报表(新)",href:WWWROOT+'/disinfectsystem/report/cssdWorkloadCountByDate/cssdWorkloadMainReport.jsp',hrefTarget:linkTarget,leaf:true},
-	    {hidden :SSTS_YearWorkload,text:"消毒供应中心年度工作量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/yearWorkloadReportView2.jsp',hrefTarget:linkTarget,leaf:true},
-//	    {hidden :SSTS_StatisticalWorkload,text:(sstsConfig.strengthenStatisticalWorkload ? "消毒供应中心员工绩效评分表" : (sstsConfig.statisticalWorkloadName ? sstsConfig.statisticalWorkloadName : "消毒供应中心员工工作量统计报表")),href:WWWROOT+'/disinfectsystem/reportforms/statisticalWorkloadView.jsp',hrefTarget:linkTarget,leaf:true},
+	    {hidden :!(sstsConfig.enableNewYearWorkloadReport) || SSTS_YearWorkload,text:"年度消毒中心指标工作量统计(新)",href:WWWROOT+'/disinfectsystem/report/cssdWorkloadCountByDate/cssdWorkloadMainReport.jsp',hrefTarget:linkTarget,leaf:true},
+	    {hidden :SSTS_YearWorkload,text:"年度消毒中心指标工作量统计",href:WWWROOT+'/disinfectsystem/reportforms/yearWorkloadReportView2.jsp',hrefTarget:linkTarget,leaf:true},
+//	    {hidden :SSTS_StatisticalWorkload,text:(sstsConfig.strengthenStatisticalWorkload ? "消毒供应中心工作人员绩效评分表" : (sstsConfig.statisticalWorkloadName ? sstsConfig.statisticalWorkloadName : "消毒供应中心工作量统计报表")),href:WWWROOT+'/disinfectsystem/reportforms/statisticalWorkloadView.jsp',hrefTarget:linkTarget,leaf:true},
 	  	{hidden :SSTS_USERECORD_TOTAL,text:"使用记录录入统计报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordTotalView.jsp',hrefTarget:linkTarget,leaf:true},
 	  	{hidden :SSTS_USERECORD_Item,text:"使用记录录入明细报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordItemView.jsp',hrefTarget:linkTarget,leaf:true},
 	  	{hidden :SSTS_USERECORD_OperatorTotal,text:"使用记录人员汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordOperatorTotalView.jsp',hrefTarget:linkTarget,leaf:true},
@@ -619,7 +627,7 @@
         {hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材报损汇总统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialDamageTotalView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材报损明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialDamageItemView.jsp',hrefTarget:linkTarget,leaf:true},
 //        {hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材丢失报损分类统计月报",href:WWWROOT+'/disinfectsystem/reportforms/materialDamageMissMonthView.jsp',hrefTarget:linkTarget,leaf:true},
-//        {hidden :SSTS_SterilizationRecordInfoReport,text:"灭菌情况报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizationRecordInfoView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_SterilizationRecordInfoReport,text:"灭菌情况报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizationRecordInfoView.jsp',hrefTarget:linkTarget,leaf:true},
 //        {hidden :SSTS_WashAndDisinfectRecordInfoReport,text:"清洗情况报表",href:WWWROOT+'/disinfectsystem/reportforms/washAndDisinfectRecordInfoView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :!sstsConfig.enableTousseOverloadReport,text:"器械包实际负载组合统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseOverLoad.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :!sstsConfig.enableTousseMorrowSend,text:"器械包次日下送率统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseMorrowSend.jsp',hrefTarget:linkTarget,leaf:true},
@@ -636,11 +644,11 @@
 	    {hidden :SSTS_DepartmentMonthly,text:"核算月报",href:WWWROOT+'/disinfectsystem/reportforms/departmentMonthlyView.jsp',hrefTarget:linkTarget,leaf:true},
 	    {hidden :SSTS_DepartmentMonthlyDetail,text:"明细核算月报",href:WWWROOT+'/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.jsp',hrefTarget:linkTarget,leaf:true},
     	{hidden :SSTS_EOGoodsDetailReport,text:"发货物品统计月报(按灭菌程序)",href:WWWROOT+'/disinfectsystem/reportforms/EOGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true},
-    	{hidden :SSTS_GodownEntryStatistic,text:"消耗物品月盘点统计报表",href:WWWROOT+'/disinfectsystem/reportforms/disposableGoodsInventoryView.jsp',hrefTarget:linkTarget,leaf:true},
+//    	{hidden :SSTS_GodownEntryStatistic,text:"消耗物品月盘点统计报表",href:WWWROOT+'/disinfectsystem/reportforms/disposableGoodsInventoryView.jsp',hrefTarget:linkTarget,leaf:true},
 //        {hidden :SSTS_GodownEntryStatistic,text:"一次性物品三类查询报表",href:WWWROOT+'/disinfectsystem/reportforms/goodsAmountSummaryByGradeView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_GodownEntryStatistic,text:"入（退）库物品统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryStatisticView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_GodownEntryStatistic,text:"入库物品统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryStatisticView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_GodownEntryStatistic,text:"入/退库物品统计报表(按供应商)",href:WWWROOT+'/disinfectsystem/reportforms/godownEntrySummaryView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_GodownEntryStatistic,text:"入（退）库物品明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryDetailStatisticView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_GodownEntryStatistic,text:"入库物品明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryDetailStatisticView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_GodownEntryStatistic,text:"一次性物品发货量对比报表",href:WWWROOT+'/disinfectsystem/reportforms/invoiceAmountContrastChartView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_MaterialStockReport,text:"材料库存统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialStockReportView.jsp',hrefTarget:linkTarget,leaf:true},
         //{hidden :SSTS_ReturnGoodsDetailReport,text:"签收统计报表",href:WWWROOT+'/disinfectsystem/reportforms/signGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true},
@@ -726,8 +734,8 @@
             {hidden :SSTS_application_end_cause_manager,text:"器械包废弃原因设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=tousse_discard_cause',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_foreignProxyGroup_manager,text:"外部代理灭菌分组设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=foreignProxyGroup',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_foreignTousseProcessType_manager,text:"外来器械处理方式",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=foreignTousseProcessType',hrefTarget:linkTarget,leaf:true},
-            //{hidden :SSTS_Material,text:"材料类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=materialType',hrefTarget:linkTarget,leaf:true},
-            //{hidden :SSTS_Material,text:"材料清洗分类设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=materialWashClasify',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_Material,text:"材料类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=materialType',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_Material,text:"材料清洗分类设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=materialWashClasify',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_TaskGroup,text:"任务组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/taskGroup/taskGroupView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Damage,text:"丢失报损类型设置",href:WWWROOT+'/disinfectsystem/basedatamanager/damageErrorMaterialType/damageErrorMaterialTypeView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Error_Damage_Remark,text:"丢失报损备注设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=error_damage_remark',hrefTarget:linkTarget,leaf:true},
@@ -747,7 +755,7 @@
             {hidden :!((sstsConfig.hasOwnProperty('haveRinserPosition')) && sstsConfig.haveRinserPosition),text:"位置管理",href:WWWROOT+'/disinfectsystem/basedatamanager/position/positionView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_CleanMethod,text:"清洗程序管理",href:WWWROOT+'/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Rinser,text:"清洗机管理",href:WWWROOT+'/disinfectsystem/basedatamanager/rinser/rinserView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_SterilerGroup_manager,text:"灭菌炉分组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/sterilerGroup/sterilerGroupView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_SterilerGroup_manager,text:"灭菌炉分组设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=sterilerGroup',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Sterilizer,text:"灭菌炉管理",href:WWWROOT+'/disinfectsystem/basedatamanager/sterilizer/sterilizerView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SterilizationPurpose_manager,text:"灭菌目的设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=sterilizationPurpose',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SterilizationMode_manager,text:"灭菌方式设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=sterilizationMode',hrefTarget:linkTarget,leaf:true},
Index: ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
===================================================================
diff -u -r30206 -r38562
--- ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml	(.../SyncOrgUnitAndUserMapper.xml)	(revision 30206)
+++ ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml	(.../SyncOrgUnitAndUserMapper.xml)	(revision 38562)
@@ -7,14 +7,17 @@
   <!-- 获取所有部门 -->
   <select id="getAllOrgUnit" resultType="OrgUnitVo">
   <![CDATA[
-	SELECT  dept_name name,dept_under parentcoding,dept_code coding FROM CSSD_Department where dept_code != '0'
+	  SELECT DEPTCODE,DEPTNAME,PARENTCODING
+	FROM CSSD_DEPARTMENT
 	]]>
   </select>
   
   <!-- 获取所有用户 -->
   <select id="getAllUser" resultType="UserVo">
   <![CDATA[
-	SELECT dept_code orgunitcoding,employe_no coding,name FROM CSSD_User where employe_no != '0'
+	  SELECT USERCODE,USERNAME,ORGUNITCODING
+	FROM CSSD_User
+	ORDER BY ORGUNITCODING
 	]]>
   </select>
 </mapper>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r30206 -r38562
--- ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 30206)
+++ ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 38562)
@@ -7,48 +7,44 @@
   <!-- 按住院号查找病人信息:提供给使用记录页面的按住院号查询 -->
   <select id="findPatientInfoByHospitalNum" resultType="PatientInfoVO">
   <![CDATA[
-	SELECT h.hospitalNumber,
-	        h.searialNumber,
-        	h.patientName,
-	        h.patientAge,
-	        h.patientSex,
-	        h.patientIDCard,
-	        h.doctorName,
-	        h.oper_name operation,
-			TO_CHAR(h.oper_at,'YYYY-MM-DD HH24:MI:SS') operationTime,
-	        h.patientArea,
-			h.roomNumber,
-			h.bedNumber,
-			h.remark,
-			h.washHandNurse,
-			h.circuitNurse,
-			h.opRoomId
-	FROM CSSD_HospitalNumber h
-	WHERE h.hospitalNumber = #{hospitalNum} order by h.oper_at desc
+     SELECT HOSPITALNUMBER,
+			SEARIANUMBER,
+        	PATIENTNAME,
+	       	to_char(PATIENTAGE) PATIENTAGE,
+	        PATIENTSEX,
+	        PATIENTIDCARD,
+	        DOCTORNAME,
+	        OPERATION,
+	        to_char(OPERATIONTIME,'yyyy-mm-dd') OPERATIONTIME,
+	   		INPATIENTAREA as patientArea,     
+	        ROOMNUMBER,
+            EDNUMBER as bedNumber,
+            REMARK	     
+ 	FROM CSSD_HOSPITALNUMBER
+	WHERE HOSPITALNUMBER =#{hospitalNum}
+	order by OPERATIONTIME desc
 	]]>
   </select>
   
   <!-- 按住院号查找病人信息:提供给外来器械申请单页面的按住院号查询 -->
   <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
   <![CDATA[
-	SELECT h.hospitalNumber,
-	        h.searialNumber,
-        	h.patientName,
-	        h.patientAge,
-	        h.patientSex,
-	        h.patientIDCard,
-	        h.doctorName,
-	        h.oper_name operation,
-			TO_CHAR(h.oper_at,'YYYY-MM-DD HH24:MI:SS') operationTime,
-	        h.patientArea,
-			h.roomNumber,
-			h.bedNumber,
-			h.remark,
-			h.washHandNurse,
-			h.circuitNurse,
-			h.opRoomId
-	FROM CSSD_HospitalNumber h
-	WHERE h.hospitalNumber = #{hospitalNum} order by h.oper_at desc
+	 SELECT HOSPITALNUMBER,
+			SEARIANUMBER,
+        	PATIENTNAME,
+	       	to_char(PATIENTAGE) PATIENTAGE,
+	        PATIENTSEX,
+	        PATIENTIDCARD,
+	        DOCTORNAME,
+	        OPERATION,
+	        to_char(OPERATIONTIME,'yyyy-mm-dd') OPERATIONTIME,
+	   		INPATIENTAREA,     
+	        ROOMNUMBER,
+            EDNUMBER,
+            REMARK	     
+ 	FROM CSSD_HOSPITALNUMBER
+	WHERE HOSPITALNUMBER =#{hospitalNum}
+	order by OPERATIONTIME desc
 	]]>
   </select>
   
Index: ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u -r30206 -r38562
--- ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 30206)
+++ ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 38562)
@@ -7,20 +7,22 @@
   <!-- 按门诊号查找病人信息 -->
   <select id="findPatientInfoByTreatmentNum" resultType="PatientInfoVO">
   <![CDATA[
-	SELECT  c.clinicNumber,
-	        c.serialNumber,
-        	c.patientName,
-	        c.patientAge,
-	        c.patientSex,
-	        c.patientIDCard,
-	        c.doctorName,
-	        c.operation,
-            TO_CHAR(c.operationTime,'YYYY-MM-DD HH24:MI:SS') operationTime,
-			c.patientArea,
-			c.roomNumber,
-			c.bedNumber
-	FROM CSSD_ClinicNumber c
-	WHERE c.clinicNumber = #{treatmentNum} order by c.operationTime desc
+	  SELECT  CLINICNUMBER,
+        	SERIALNUMBER,
+        	PATIENTNAME,
+	        to_char(PATIENTAGE) patientAge,
+	        PATIENTSEX,
+	        DOCTORNAME,
+	        OPERATION,
+			PATIENTIDCARD,
+	        to_char(OPERATIONTIME,'yyyy-mm-dd') OPERATIONTIME,
+	        INPATIENTAREA,
+	        ROOMNUMBER,
+	        BEDNUMBER,
+	        REMARK
+	FROM zlhis.CSSD_ClinicNumber
+	WHERE clinicNumber = #{treatmentNum}
+	order by OPERATIONTIME desc
 	]]>
   </select>
 
Index: ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/interfaces/dataSyncConfig.json
===================================================================
diff -u -r30206 -r38562
--- ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/interfaces/dataSyncConfig.json	(.../dataSyncConfig.json)	(revision 30206)
+++ ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/interfaces/dataSyncConfig.json	(.../dataSyncConfig.json)	(revision 38562)
@@ -9,7 +9,7 @@
 		"更新交集数据" : true,
 		"移除差集数据" : false,
 		"默认角色ID":[
-			"ROLE_1_0"
+			"ROLE_101013_0"
 		]
 	}
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/print/printConfig.js
===================================================================
diff -u -r30206 -r38562
--- ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/print/printConfig.js	(.../printConfig.js)	(revision 30206)
+++ ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/print/printConfig.js	(.../printConfig.js)	(revision 38562)
@@ -261,9 +261,9 @@
     	        	{label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["55","35%","90%",5]},
     	        	{label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["80","35%","90%",5]},
     	        	{label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["80","2%","90%",5]},
-            	    {label : "主管:", dataIndex : '', fontSize : 11, position : ["10cm","5%","90%",5]},
-            	    {label : "领料人:", dataIndex : '', fontSize : 11, position : ["10cm","40%","90%",5]},
-            	    {label : "发料人:", dataIndex : 'sender', fontSize : 11, position : ["10cm","75%","90%",5]},
+            	    {label : "核对人:", dataIndex : '', fontSize : 11, position : ["10cm","5%","90%",5]},
+            	    {label : "签收人:", dataIndex : '', fontSize : 11, position : ["10cm","40%","90%",5]},
+            	    {label : "发放人:", dataIndex : 'sender', fontSize : 11, position : ["10cm","75%","90%",5]},
         	    	{barcodes : [
         				{codeType : "128Auto", dataIndex : 'departBarcode', position : ["3mm","74%","40mm","8mm"],
         					styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true},
@@ -277,7 +277,7 @@
     	        totalPageAmount : {label : "共&页", fontSize : 11, position : ["11cm","81%","90%",5]},
     	        goodsTable :{
     	        	rowHeight : 25,
-    	        	position : ["100","1%","97%","6.5cm"],
+    	        	position : ["100","1%","97%","27cm"],
     	        	headRepeat : true,
     	        	columns : [
     	        	    {header : "序号", dataIndex : 'serialNumber', width : '10%', align : 'center', fontSize : 11},
Index: ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/spring/HIS.xml
===================================================================
diff -u -r31870 -r38562
--- ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/spring/HIS.xml	(.../HIS.xml)	(revision 31870)
+++ ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/spring/HIS.xml	(.../HIS.xml)	(revision 38562)
@@ -88,7 +88,7 @@
     <!-- his数据源 -->
     <bean id="hisDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">
     	<property name="driverClass" value="oracle.jdbc.OracleDriver" />  
-      <property name="jdbcUrl" value="jdbc:oracle:thin:@//192.168.10.1:1521/bjyhis" />
+      <property name="jdbcUrl" value="jdbc:oracle:thin:@//10.23.1.1:1521/bjyhis" />
         <property name="user" value="yhdz" />  
         <property name="password" value="i39"  />
     </bean>