Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/reportforms/OrgUnitUserAmountMonthly.java
===================================================================
diff -u -r39243 -r40384
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/reportforms/OrgUnitUserAmountMonthly.java	(.../OrgUnitUserAmountMonthly.java)	(revision 39243)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/reportforms/OrgUnitUserAmountMonthly.java	(.../OrgUnitUserAmountMonthly.java)	(revision 40384)
@@ -25,10 +25,23 @@
 public class OrgUnitUserAmountMonthly {
 	/**科室人数月度统计记录id*/
 	private Long id;
-	
-	/**科室人数*/
+
+	/**
+	 * 科室人数 在职人数
+	 */
 	private Integer amount;
-	
+	/**
+	 * 继续教育人数离职人数
+	 */
+	private Integer continuingEducationAmount;
+	/**
+	 * 离职人数
+	 */
+	private Integer resignationsAmount;
+	/**
+	 * 离岗人数
+	 */
+	private Integer offTheJobAmount;
 	/**月份*/
 	private Date yearMonth;
 	
@@ -91,4 +104,27 @@
 		this.submitTime = submitTime;
 	}
 
+	public Integer getOffTheJobAmount() {
+		return offTheJobAmount;
+	}
+
+	public void setOffTheJobAmount(Integer offTheJobAmount) {
+		this.offTheJobAmount = offTheJobAmount;
+	}
+
+	public Integer getResignationsAmount() {
+		return resignationsAmount;
+	}
+
+	public void setResignationsAmount(Integer resignationsAmount) {
+		this.resignationsAmount = resignationsAmount;
+	}
+
+	public Integer getContinuingEducationAmount() {
+		return continuingEducationAmount;
+	}
+
+	public void setContinuingEducationAmount(Integer continuingEducationAmount) {
+		this.continuingEducationAmount = continuingEducationAmount;
+	}
 }
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/orgunituseramountmonthly/service/OrgUnitUserAmountMonthlyManagerImpl.java
===================================================================
diff -u -r36831 -r40384
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/orgunituseramountmonthly/service/OrgUnitUserAmountMonthlyManagerImpl.java	(.../OrgUnitUserAmountMonthlyManagerImpl.java)	(revision 36831)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/orgunituseramountmonthly/service/OrgUnitUserAmountMonthlyManagerImpl.java	(.../OrgUnitUserAmountMonthlyManagerImpl.java)	(revision 40384)
@@ -172,6 +172,9 @@
 				}
 				String yearMonthStr = ParerUtils.getCellFormatValue(row, 0);
 				String amount = ParerUtils.getCellFormatValue(row, 1);
+				String continuingEducationAmount = ParerUtils.getCellFormatValue(row, 2);
+				String resignationsAmount = ParerUtils.getCellFormatValue(row, 3);
+				String offTheJobAmount = ParerUtils.getCellFormatValue(row, 4);
 				if(StringUtils.isBlank(yearMonthStr)){
 					throw new RuntimeException("导入失败！第" + currentRowNum + "行，月份不能为空！");
 				}
@@ -186,6 +189,9 @@
 				orgUnitUserAmountMonthly.setOrgUnitCode(currentOrgUnitCode);
 				orgUnitUserAmountMonthly.setOrgUnitName(currentOrgUnitName);
 				orgUnitUserAmountMonthly.setAmount(Integer.valueOf(amount));
+				orgUnitUserAmountMonthly.setContinuingEducationAmount(StringUtils.isBlank(continuingEducationAmount)?0:Integer.parseInt(continuingEducationAmount));
+				orgUnitUserAmountMonthly.setResignationsAmount(StringUtils.isBlank(resignationsAmount)?0:Integer.parseInt(resignationsAmount));
+				orgUnitUserAmountMonthly.setOffTheJobAmount(StringUtils.isBlank(offTheJobAmount)?0:Integer.parseInt(offTheJobAmount));
 				orgUnitUserAmountMonthly.setYearMonth(yearMonth);
 				orgUnitUserAmountMonthly.setSubmitTime(submitTime);
 				importOrgUnitUserAmountMonthlyList.add(orgUnitUserAmountMonthly);
@@ -227,7 +233,7 @@
 			idColumnValue = "hibernate_sequence.nextval,";
 		}
 		String batchInsertSql = 
-				String.format("insert into %s (%s amount,yearMonth,orgUnitCode,orgUnitName,submitTime) values(%s ?,?,?,?,?)", OrgUnitUserAmountMonthly.class.getSimpleName(), idColumnName, idColumnValue);
+				String.format("insert into %s (%s amount,yearMonth,orgUnitCode,orgUnitName,submitTime,continuingEducationAmount,resignationsAmount,offTheJobAmount) values(%s ?,?,?,?,?,?,?,?)", OrgUnitUserAmountMonthly.class.getSimpleName(), idColumnName, idColumnValue);
 		jdbcTemplate.batchUpdate(batchInsertSql, new BatchPreparedStatementSetter() {
 
 			@Override
@@ -239,6 +245,9 @@
 				ps.setString(3, orgUnitUserAmountMonthly.getOrgUnitCode());
 				ps.setString(4, orgUnitUserAmountMonthly.getOrgUnitName());
 				ps.setTimestamp(5, new Timestamp(orgUnitUserAmountMonthly.getSubmitTime().getTime()));
+				ps.setInt(6, orgUnitUserAmountMonthly.getContinuingEducationAmount());
+				ps.setInt(7, orgUnitUserAmountMonthly.getResignationsAmount());
+				ps.setInt(8, orgUnitUserAmountMonthly.getOffTheJobAmount());
 			}
 
 			@Override