Fisheye: Tag 22563 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/dataUpdater/sqls/4.0.5_4.1.0_sqlserver.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r22477 -r22563
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 22477)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 22563)
@@ -966,6 +966,8 @@
 			throws RecyclingRecordException {
 		Collection<RecyclingApplication> applications = new ArrayList<RecyclingApplication>();
 		Map<String, Integer> tousseNameAndAmount = computeTousseStatistics(tousseInstances);
+		//一级供应室
+		SupplyRoomConfig supplyRoomConfigFirtRoomType = supplyRoomConfigManager.getFirstSupplyRoomConfig();
 		for (Entry<String, Integer> entry : tousseNameAndAmount.entrySet()) {
 			// 每个自定义器械生成一张申请单
 			RecyclingApplication recyclingApplication = new RecyclingApplication();
@@ -984,6 +986,11 @@
 			if (remark != null) {
 				recyclingApplication.setRemark(remark);
 			}
+			//设置自定义器械包申请单的处理科室为一级供应室
+			if(supplyRoomConfigFirtRoomType != null){
+				recyclingApplication.setHandleDepartCoding(supplyRoomConfigFirtRoomType.getOrgUnitCoding());
+				recyclingApplication.setHandleDepart(supplyRoomConfigFirtRoomType.getOrgUnitName());
+			}
 //			recyclingApplication.setCanBeMerge(canBeMerge);
 			Map<String, Integer> appCustomTousseMap = new HashMap<String, Integer>();
 			appCustomTousseMap.put(entry.getKey(), entry.getValue());
Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/zsly/HerpPathManagerImpl.java
===================================================================
diff -u -r22484 -r22563
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/zsly/HerpPathManagerImpl.java	(.../HerpPathManagerImpl.java)	(revision 22484)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/zsly/HerpPathManagerImpl.java	(.../HerpPathManagerImpl.java)	(revision 22563)
@@ -290,6 +290,31 @@
 				PatientInfoVO patientInfo = null;
 				try{
 					patientInfo = dataSynchronizationManager.findPatientInfoByHospitalNumOrTreatmentNum(objectArray[5], "hospitalNum");
+					//测试代码(绕开同步病人的代码)
+					/*patientInfo = new PatientInfoVO();
+					//病人姓名
+					patientInfo.setPatientName("test1");
+					
+					//病人年龄
+					patientInfo.setPatientAge("test2");
+					
+					//病人性别
+					patientInfo.setPatientSex("test3");
+					
+					//病人身份证号
+					patientInfo.setPatientIDCard("test4");
+					
+					//医生姓名
+					patientInfo.setDoctorName("test5");
+					
+					//手术名称
+					patientInfo.setOperation("test6");
+					
+					// 病室
+					patientInfo.setRoomNumber("test7");
+					
+					// 床位
+					patientInfo.setBedNumber("test8");*/
 				}catch(Exception ex){
 					ex.printStackTrace();
 				}
@@ -330,7 +355,6 @@
 					useRecord.setApplicationTime(now);//由于回调时生成使用记录立即转换为申请单,所以申请时间也是当前时间
 					useRecord.setPatientName(objectArray[3]);
 					useRecord.setHospitalNum(objectArray[5]);
-					useRecord.setStatus(UseRecord.STATUS_APPLIED);
 					
 					if(patientInfo != null){
 						//诊疗号
@@ -405,9 +429,10 @@
 				useRecordManager.createRecyclingApplicationByUseRecords(tranUserecordIdList, applicant, depart, departCoding , now);
 			}*/
 			
-			//原有老的方式调用
+			//升级4.1后,由由原老的方式调用改为按新的方式调用
 			if(success){
-				useRecordManager.createRecyclingApplicationByUseRecords(StringUtils.join(idList.toArray(), ";"), applicant, depart, departCoding);
+				//useRecordManager.createRecyclingApplicationByUseRecords(StringUtils.join(idList.toArray(), ";"), applicant, depart, departCoding);
+				useRecordManager.createRecyclingApplicationByUseRecords(idList, applicant, depart, departCoding , now);
 				
 				//如果调用成功则将对应的医嘱信息表的记录的状态置为1
 				updateRecordStatus(true , succReceiveIdList);
Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.0.5_4.1.0_oracle.sql
===================================================================
diff -u -r12335 -r22563
--- ssts-web/src/main/webapp/dataUpdater/sqls/4.0.5_4.1.0_oracle.sql	(.../4.0.5_4.1.0_oracle.sql)	(revision 12335)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/4.0.5_4.1.0_oracle.sql	(.../4.0.45_4.1.0_oracle.sql)	(revision 22563)
@@ -1,12 +1,15 @@
-alter table DepartmentAppTemplate add (foo clob);
-update DepartmentAppTemplate set foo = orgUnitCode;
-alter table DepartmentAppTemplate drop column orgUnitCode;
-alter table DepartmentAppTemplate rename column foo to orgUnitCode;
-alter table PrintConfig add (foo clob);
-update PrintConfig set foo = departCodes;
-alter table PrintConfig drop column departCodes;
-alter table PrintConfig rename column foo to departCodes;
-alter table PrintConfig add (foo2 clob);
-update PrintConfig set foo2 = departNames;
-alter table PrintConfig drop column departNames;
-alter table PrintConfig rename column foo2 to departNames;
+execute immediate 'alter table DepartmentAppTemplate add (foo clob)';
+execute immediate 'update DepartmentAppTemplate set foo = orgUnitCode';
+execute immediate 'commit';
+execute immediate 'alter table DepartmentAppTemplate drop column orgUnitCode';
+execute immediate 'alter table DepartmentAppTemplate rename column foo to orgUnitCode';
+execute immediate 'alter table PrintConfig add (foo clob)';
+execute immediate 'update PrintConfig set foo = departCodes';
+execute immediate 'commit';
+execute immediate 'alter table PrintConfig drop column departCodes';
+execute immediate 'alter table PrintConfig rename column foo to departCodes';
+execute immediate 'alter table PrintConfig add (foo2 clob)';
+execute immediate 'update PrintConfig set foo2 = departNames';
+execute immediate 'commit';
+execute immediate 'alter table PrintConfig drop column departNames';
+execute immediate 'alter table PrintConfig rename column foo2 to departNames';
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/userecord/service/UseRecordWebServiceImpl.java
===================================================================
diff -u -r21740 -r22563
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/userecord/service/UseRecordWebServiceImpl.java	(.../UseRecordWebServiceImpl.java)	(revision 21740)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/userecord/service/UseRecordWebServiceImpl.java	(.../UseRecordWebServiceImpl.java)	(revision 22563)
@@ -8,6 +8,7 @@
 import net.sf.json.JSONObject;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import com.forgon.disinfectsystem.useRecord.hrepPath.HerpPathManager;
 
@@ -19,6 +20,7 @@
 @WebService(endpointInterface = "com.forgon.disinfectsystem.webservice.userecord.service.UseRecordWebService", serviceName = "/useRecordWebService")
 public class UseRecordWebServiceImpl implements UseRecordWebService {
 	
+	@Autowired(required=false)
 	private HerpPathManager herpPathManager;
 	
 	public void setHerpPathManager(HerpPathManager herpPathManager) {
Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.1.0_4.1.1.sql
===================================================================
diff -u -r13187 -r22563
--- ssts-web/src/main/webapp/dataUpdater/sqls/4.1.0_4.1.1.sql	(.../4.1.0_4.1.1.sql)	(revision 13187)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/4.1.0_4.1.1.sql	(.../4.1.0_4.1.1.sql)	(revision 22563)
@@ -1 +1,7 @@
-update GoodPurchasePlan set orgUnit_id = (select md.oid from (select min(td.orgUnit_id) as oid,td.goodPurchasePlan_id as pid from(select it.id, it.orgUnit_id,it.goodPurchasePlan_id from GoodPurchaseItem it inner join  goodpurchasePlan p on p.id = it.goodPurchasePlan_id) td group by td.goodPurchasePlan_id) md where md.pid = id);
\ No newline at end of file
+update GoodPurchasePlan set orgUnit_id = (select md.oid from (select min(td.orgUnit_id) as oid,td.goodPurchasePlan_id as pid from(select it.id, it.orgUnit_id,it.goodPurchasePlan_id from GoodPurchaseItem it inner join  goodpurchasePlan p on p.id = it.goodPurchasePlan_id) td group by td.goodPurchasePlan_id) md where md.pid = id);
+update godownentry set subtype='同步入库' where type='入库单' and remark like '%同步%';
+update godownentry set subtype='手工入库' where type='入库单' and (remark is null or remark not like '%同步%');
+update godownentry set subtype='手工出库' where type='退库单' and (remark is null or remark not like '%同步%');
+update invoiceplan set submittime=applicationtime where submittime is null;
+update userecord set statussequence = (case status when '未审核' then 0 when '已审核' then 1 when '已申请' then 2 else statussequence end) 
+where statussequence is null or statussequence <> (case status when '未审核' then 0 when '已审核' then 1 when '已申请' then 2 else statussequence end) and status in ('未审核','已审核','已申请');
\ No newline at end of file
Fisheye: Tag 22563 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/dataUpdater/sqls/4.0.5_4.1.0_oracle.sql'.
Fisheye: No comparison available.  Pass `N' to diff?