|  | @@ -75,8 +75,8 @@ public class ZyActpatient implements Comparable<ZyActpatient> {
 | 
	
		
			
				|  |  |      private BigDecimal charge28;
 | 
	
		
			
				|  |  |      private BigDecimal charge29;
 | 
	
		
			
				|  |  |      private BigDecimal charge30;
 | 
	
		
			
				|  |  | -    private String ward;//病房
 | 
	
		
			
				|  |  | -    private String dept;//科室
 | 
	
		
			
				|  |  | +    private String ward;//当期病房
 | 
	
		
			
				|  |  | +    private String dept;//当前科室
 | 
	
		
			
				|  |  |      private String bedNo;//床号
 | 
	
		
			
				|  |  |      private String sex;//性别
 | 
	
		
			
				|  |  |      private String bloodType;//血型
 | 
	
	
		
			
				|  | @@ -118,7 +118,7 @@ public class ZyActpatient implements Comparable<ZyActpatient> {
 | 
	
		
			
				|  |  |      private String patientStatus;//
 | 
	
		
			
				|  |  |      private String moveFlag;//
 | 
	
		
			
				|  |  |      private String jzjlh;//
 | 
	
		
			
				|  |  | -    private String zkDept;//转科科室
 | 
	
		
			
				|  |  | +    private String zkDept;//转科科室(当前科室)
 | 
	
		
			
				|  |  |      private String hbsag;//
 | 
	
		
			
				|  |  |      private String archiveCode1;//
 | 
	
		
			
				|  |  |      private String jobDoctor;//责任医生
 | 
	
	
		
			
				|  | @@ -168,7 +168,7 @@ public class ZyActpatient implements Comparable<ZyActpatient> {
 | 
	
		
			
				|  |  |      private String disYbStr1;//
 | 
	
		
			
				|  |  |      private String disYb2;//
 | 
	
		
			
				|  |  |      private String disYbStr2;//
 | 
	
		
			
				|  |  | -    private String smallDept;//小科室
 | 
	
		
			
				|  |  | +    private String smallDept;//入院小科室
 | 
	
		
			
				|  |  |      private String xnhFamilysysno;//新农合相关
 | 
	
		
			
				|  |  |      private String xnhMembersysno;//新农合相关
 | 
	
		
			
				|  |  |      private String xnhBookno;//新农合相关
 |