Index: ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManagerImpl.java
===================================================================
diff -u
--- ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManagerImpl.java (revision 0)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManagerImpl.java (revision 16571)
@@ -0,0 +1,135 @@
+package com.forgon.disinfectsystem.biologymonitorwarning.service;
+
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
+import org.directwebremoting.ScriptBuffer;
+import org.directwebremoting.WebContext;
+import org.directwebremoting.WebContextFactory;
+import org.directwebremoting.proxy.dwr.Util;
+
+import com.forgon.Constants;
+import com.forgon.databaseadapter.service.DateQueryAdapter;
+import com.forgon.disinfectsystem.entity.biologymonitorwarning.BiologyMonitorWarning;
+import com.forgon.tools.ScriptSessionUtil;
+import com.forgon.tools.db.DatabaseUtil;
+import com.forgon.tools.hibernate.ObjectDao;
+import com.forgon.tools.string.StringTools;
+
+public class BiologyMonitorWarningManagerImpl implements
+ BiologyMonitorWarningManager {
+
+ private ObjectDao objectDao;
+
+ private DateQueryAdapter dateQueryAdapter;
+
+ public void setObjectDao(ObjectDao objectDao) {
+ this.objectDao = objectDao;
+ }
+
+ public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) {
+ this.dateQueryAdapter = dateQueryAdapter;
+ }
+
+ /**
+ * 根据用户名和科室编码获取需要生物监测的提示信息
+ * @param userName
+ * @param currentDepartCode
+ * @return
+ */
+ @Override
+ public JSONArray getBiologyMonitorWarningByUserNameAndCurrentDepartCode(
+ String userName, String currentDepartCode) {
+
+
+ String nowTime = Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS.format(new Date());
+ String nowTimeTemp = dateQueryAdapter.dateAdapter(nowTime);
+
+ String sql =
+ "select t1.id,s.name,t1.frequency,t1.biologicalMonitoringEndDate,t1.endDate "
+ + "from ("
+ + "select sr.id,sr.sterilizer_id,sr.frequency,sr.biologicalMonitoringEndDate,sr.endDate "
+ + "from SterilizationRecord sr "
+ + "where sr.orgUnitCoding='" + currentDepartCode + "' "
+ + "and sr.biologicalMonitoringEndDate is not null and sr.biologicalMonitoringEndDate<=" + nowTimeTemp + " " //--还要过滤时间
+ + "and sr.biologyResult is not null and sr.biologyResult='无' "
+ + "union all "
+ + "select sr.id,sr.sterilizer_id,sr.frequency,sr.biologicalMonitoringEndDate,sr.endDate "
+ + "from SterilizationRecord sr "
+ + "where sr.orgUnitCoding='" + currentDepartCode + "' "
+ + "and sr.biologicalMonitoringEndDate is not null and sr.biologicalMonitoringEndDate<=" + nowTimeTemp + " " //--还要过滤时间
+ + "and sr.biologyResult is not null and sr.biologyResult<>'无' "
+ + "and sr.monitorChecker is null"
+ + ") t1 "
+ + "inner join Sterilizer s on s.id=t1.sterilizer_id "
+ + "where not exists("
+ + "select 1 "
+ + "from (select bmw.sterilizationRecordId from BiologyMonitorWarning bmw where bmw.userName='" + userName + "' and bmw.departCode='" + currentDepartCode + "') t2 "
+ + "where t2.sterilizationRecordId=t1.id"
+ + ") order by t1.biologicalMonitoringEndDate"
+ ;
+
+ ResultSet result = objectDao.executeSql(sql);
+
+ JSONArray jSONArray = new JSONArray();
+ try {
+ while(result.next()){
+ Long sterilizationRecordId = result.getLong("id");
+ String name = StringTools.defaultString(result.getString("name"));
+ String frequency = StringTools.defaultString(result.getString("frequency"));
+ String biologicalMonitoringEndDate = StringTools.defaultString(result.getString("biologicalMonitoringEndDate"));
+ String endDate = StringTools.defaultString(result.getString("endDate"));
+
+ if (biologicalMonitoringEndDate.length() > 16) { //把时间格式设置成如:"2000-00-00 00:00"
+ biologicalMonitoringEndDate = biologicalMonitoringEndDate.substring(0, 16);
+ }
+ if (endDate.length() > 16) { //把时间格式设置成如:"2000-00-00 00:00"
+ endDate = endDate.substring(0, 16);
+ }
+
+ BiologyMonitorWarning biologyMonitorWarning = new BiologyMonitorWarning();
+ biologyMonitorWarning.setSterilizationRecordId(sterilizationRecordId);
+ biologyMonitorWarning.setUserName(userName);
+ biologyMonitorWarning.setDepartCode(currentDepartCode);
+ objectDao.save(biologyMonitorWarning);
+
+ JSONObject jSONObject = new JSONObject();
+ jSONObject.put("name", name);
+ jSONObject.put("frequency", frequency);
+ jSONObject.put("biologicalMonitoringEndDate", biologicalMonitoringEndDate);
+ jSONObject.put("endDate", endDate);
+ jSONArray.add(jSONObject);
+
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }finally {
+ DatabaseUtil.closeResultSetAndStatement(result);
+ }
+
+ return jSONArray;
+ }
+
+ /**
+ * 根据用户名和科室编码删除BiologyMonitorWarning
+ * @param userName
+ * @param currentDepartCode
+ */
+ @Override
+ public void deleteBiologyMonitorWarningByUserNameAndCurrentDepartCode(
+ String userName, String currentDepartCode) {
+
+ String sql = "delete from BiologyMonitorWarning where userName='"+userName+"' and departCode='"+currentDepartCode+"'";
+ objectDao.excuteSQL(sql);
+
+ }
+
+
+}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManager.java
===================================================================
diff -u -r15707 -r16571
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManager.java (.../SterilizerManager.java) (revision 15707)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManager.java (.../SterilizerManager.java) (revision 16571)
@@ -33,7 +33,7 @@
public boolean isDefineDeviceInterface(String sterilizerName);
/**
- * 更新invoice表的isRoutine属性(在登记生物监测时如果这个包已经是发货了,则有可能用户之前忘记登记生物监测了,补登记的)
+ * 更新TousseInstance表的isRoutine属性(在登记生物监测时如果这个包已经是发货了,则有可能用户之前忘记登记生物监测了,补登记的)
* @param sterilizationRecordId:灭菌记录ID
* @param biologicalMonitoringEndDate:生物监测结束时间
* @param biologyResult:生物监测的结果
Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r16520 -r16571
--- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 16520)
+++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 16571)
@@ -121,7 +121,75 @@
tipsEle.push(tipId);
}
+var biologicalMonitoringWarningWindow = null;
+var biologicalMonitoringWarningGrid = null;
+function gosterilizationRecordView() {
+
+ addTab('sterilizationRecordView','历史灭菌记录',WWWROOT+'/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp?editMode=true');
+ biologicalMonitoringWarningWindow.hide();
+// if (warningWindow && warningWindow.isVisible()) { //考虑一下系统告警的窗口如果没关也帮他关闭了
+// warningWindow.close();
+// }
+
+}
+function runBiologicalMonitoringWarning(userName, currentDepartCode) {
+
+ setInterval(function() {
+ Ext4.Ajax.request({
+ url : WWWROOT + '/disinfectSystem/biologyMonitorWarningAction!getBiologyMonitorWarning.do',
+ params : {userName : userName, currentDepartCode : currentDepartCode},
+ success : function(response, options) {
+ var result = Ext4.decode(response.responseText, true); // 此处返回的有可能不是json字符串,因为注销之后,会被acegi拦截,返回html
+ if(result && result.length > 0){
+ if (!biologicalMonitoringWarningWindow) {
+ biologicalMonitoringWarningGrid = new Ext.grid.GridPanel({
+ store: new Ext.data.Store({
+ data : result,
+ reader : new Ext.data.JsonReader({
+ fields : ["name", "frequency", "biologicalMonitoringEndDate", "endDate"]
+ })
+ }),
+ columns: [
+ {header: "灭菌炉名称", width: 190, dataIndex: 'name',renderer : function(v, p, record) {
+ return ""+v+"";
+ }},
+ {header: "炉次", width: 50,dataIndex: 'frequency'},
+ {header: "灭菌结束时间", width: 150,dataIndex: 'endDate'},
+ {header: "生物监测结束时间", width: 150,dataIndex: 'biologicalMonitoringEndDate'}
+ ],
+ stripeRows: true,
+ viewConfig: {
+ forceFit:true
+ },
+ height:200
+ });
+
+ biologicalMonitoringWarningWindow = new Ext.Window({
+ autoHeight:true,
+ title : '以下灭菌记录的生物监测已结束',
+ width:500,
+ draggable:true,
+ modal:true,
+ closeAction:'hide',
+ items:[biologicalMonitoringWarningGrid]
+ });
+ biologicalMonitoringWarningWindow.show();
+ } else {
+ if (biologicalMonitoringWarningWindow.isVisible()) { //前一个窗口用户还没关闭,就追加数据
+ biologicalMonitoringWarningGrid.store.loadData(result, true);
+ } else { //前一个窗口用户关闭了,(其实是隐藏了,下次要用时不用重新new直接show更加快速),这时就不要追加了
+ biologicalMonitoringWarningGrid.store.loadData(result);
+ biologicalMonitoringWarningWindow.show();
+ }
+ }
+ }
+ }
+ });
+ }, 60000);
+
+}
+
//window.onload start
Ext4.onReady(function(){
//屏蔽回退键,防止点击backspace键时,浏览器后退
@@ -207,6 +275,11 @@
//系统告警
initShowSystemWarningWin();
showUpToNeckSatisfactionSurveyWinTips();
+
+ if (sstsConfig.biologicalMonitoringWarning && currentOrgUnitIsFirstSupplyRoom) { //开启生物监测结束后的提示功能,目前只开发给当前科室为一级供应室的用户
+ runBiologicalMonitoringWarning(name, currentDepartCode);
+ }
+
var packingImg = getById('packingImg');
var reviewPackingImg = getById('reviewPackingImg');
var sterilizationRecordImg = getById('sterilizationRecordImg');
Index: ssts-web/src/main/webapp/openSystemMainPage.jsp
===================================================================
diff -u -r15864 -r16571
--- ssts-web/src/main/webapp/openSystemMainPage.jsp (.../openSystemMainPage.jsp) (revision 15864)
+++ ssts-web/src/main/webapp/openSystemMainPage.jsp (.../openSystemMainPage.jsp) (revision 16571)
@@ -3,6 +3,7 @@
<%@ page import="com.forgon.security.service.*,com.forgon.directory.vo.LoginUserData,com.forgon.tools.SpringBeanManger,com.forgon.security.service.OperationManager"%>
<%@page import="com.forgon.systemsetting.service.HttpOptionManager,com.forgon.disinfectsystem.common.*"%>
<%@page import="com.forgon.disinfectsystem.basedatamanager.ipandorgunitmapping.service.IpAndOrgUnitMappingManager"%>
+<%@page import="com.forgon.disinfectsystem.biologymonitorwarning.service.BiologyMonitorWarningManager"%>
<%@page import="com.forgon.log.model.Log" %>
<%@page import="java.util.List"%>
<%
@@ -42,6 +43,12 @@
tem += "]";
session.setAttribute("sterilerGroupList", tem);
+if (loginUserData.getFirstSupplyRoomUser() != null
+&& loginUserData.getFirstSupplyRoomUser()) { //当前登录的科室是否为一级供应室,登录完成删除之前提示过的生物监测记录
+ ((BiologyMonitorWarningManager)SpringBeanManger.getBean("biologyMonitorWarningManager"))
+ .deleteBiologyMonitorWarningByUserNameAndCurrentDepartCode(loginUserData.getUserName(), loginUserData.getCurrentOrgUnitCode());
+}
+
String logonType = (String)session.getAttribute("logonType");
if(logonType != null && !session.getAttribute("userOperationIds").toString().contains(",SSTS_RecycRecord_Create,")){
response.sendRedirect(ctx + "/logon.jsp?login_error=3");
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r16443 -r16571
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 16443)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 16571)
@@ -2518,7 +2518,7 @@
top.Ext.getCmp('typeTotalAmount').setText("篮筐:"+r_amount+" ,器械包:"+t_amount+" ,敷料包:"+d_amount+" ,外来器械包:"+f_amount+", 代理灭菌包:"+p_amount);
}
- if(action.result.data.status != statusEnd){ //还没灭菌完成
+ if(action.result.data.status != statusEnd){ //这里有四种情况:灭菌中、灭菌中断、灭菌失败,新加的记录
top.Ext.getCmp('physicsResult').setValue("无");
top.Ext.getCmp('chemistryResult').setValue("无");
top.Ext.getCmp('biologyResult').setValue("无");
@@ -2546,7 +2546,7 @@
top.Ext.getCmp('inputBarcode').setDisabled(true);
disableItems();
}
- }else{ //灭菌完成 灭菌失败 灭菌中断
+ }else{ //灭菌完成
var sterilizationRecord = action.result.data; //此灭菌记录对象
_biologicalMonitoringTime = sterilizationRecord.sterilizer.biologicalMonitoringTime*60*1000; //此灭菌炉的生物监测持续时间
var biologicalMonitoringStartDate = sterilizationRecord.biologicalMonitoringStartDate; //生物监测的开始时间
Index: ssts-web/src/main/webapp/homepage/portalPage.jsp
===================================================================
diff -u -r16520 -r16571
--- ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 16520)
+++ ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 16571)
@@ -161,7 +161,8 @@
var loginUserData = JSON.parse('${loginUserDataJsonStr}');
var isShowTipNumber = '${isShowTipNumber}';
var departName = '${loginUserData.currentOrgUnitName}';
-var userName = '${loginUserData.userFullName}';
+var userName = '${loginUserData.userFullName}'; //用户全名
+var name = '${loginUserData.userName}'; //用户登录名
var fromLogin = '${fromLogin}';
var currentDate = '';
var recall = '<%=SystemWarningItemVO.WARNING_TYPE_RECALLRECORD%>';
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
===================================================================
diff -u -r16432 -r16571
--- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js (.../config.js) (revision 16432)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js (.../config.js) (revision 16571)
@@ -88,8 +88,10 @@
saveUseRecordPrompt : false,
//使用记录点击审核并生成申请时是否需要提示"手术是否已完成,不需要追加器械包?"字样,为true时才给予提示,没配或者为false则不提示
auditAndConvertUseRecordConfirmMessage : true,
- //生物检测是否要提示,为true表示要提示,为false或者没有配置,都不提示
+ //发货时针对对植入物的器械包,是否要提示生物检测的情况,为true表示要提示,为false或者没有配置,都不提示
biologicalMonitoringEnable : true,
+ //生物监测结束时是否需要提示,为true表示要提示,为false或者没有配置,都不提示
+ biologicalMonitoringWarning : true,
//自定义装配界面是否选择科室
selectDepartInCustomPacking : true,
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/action/BiologyMonitorWarningAction.java
===================================================================
diff -u
--- ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/action/BiologyMonitorWarningAction.java (revision 0)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/action/BiologyMonitorWarningAction.java (revision 16571)
@@ -0,0 +1,47 @@
+package com.forgon.disinfectsystem.biologymonitorwarning.action;
+
+
+import net.sf.json.JSONArray;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.struts2.convention.annotation.Action;
+import org.apache.struts2.convention.annotation.Namespace;
+import org.apache.struts2.convention.annotation.ParentPackage;
+
+import com.forgon.disinfectsystem.biologymonitorwarning.service.BiologyMonitorWarningManager;
+import com.forgon.tools.StrutsParamUtils;
+import com.forgon.tools.StrutsResponseUtils;
+
+
+@ParentPackage(value = "default")
+@Namespace(value = "/disinfectSystem")
+@Action(value = "biologyMonitorWarningAction")
+public class BiologyMonitorWarningAction {
+
+
+
+ private BiologyMonitorWarningManager biologyMonitorWarningManager;
+
+ public void setBiologyMonitorWarningManager(
+ BiologyMonitorWarningManager biologyMonitorWarningManager) {
+ this.biologyMonitorWarningManager = biologyMonitorWarningManager;
+ }
+
+ /**
+ * 获取符合提示条件的生物监测记录
+ *
+ */
+ public void getBiologyMonitorWarning() {
+
+ String userName = StrutsParamUtils.getPraramValue("userName", "");
+ String currentDepartCode = StrutsParamUtils.getPraramValue("currentDepartCode", "");
+
+ JSONArray jSONArray = biologyMonitorWarningManager
+ .getBiologyMonitorWarningByUserNameAndCurrentDepartCode(userName, currentDepartCode);
+
+ StrutsResponseUtils.output(jSONArray);
+
+ }
+
+
+}
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r16479 -r16571
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 16479)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 16571)
@@ -178,13 +178,23 @@
@Override
public void saveOrUpdate(SterilizationRecord sterilizationRecord) {
Long sterilizationRecordId = sterilizationRecord.getId();
- Date biologicalMonitoringEndDate = sterilizationRecord.getBiologicalMonitoringEndDate();
- String biologyResult = sterilizationRecord.getBiologyResult();
- if (sterilizationRecordId != null) {
+ String status = sterilizationRecord.getStatus();
+ if (sterilizationRecordId != null && SterilizationRecord.STERILIZATION_STATUS_END.equals(status)) { //灭菌完成
+ Date biologicalMonitoringEndDate = sterilizationRecord.getBiologicalMonitoringEndDate();
+ String biologyResult = sterilizationRecord.getBiologyResult();
+ String monitorChecker = sterilizationRecord.getMonitorChecker();
+
+ if (!SterilizationRecord.MONITOR_RESULT_NO.equals(biologyResult)
+ && StringUtils.isNotBlank(monitorChecker)) { //保存生物监测时结果不"无",而且填了"监测核对员"(表示已经确认了)就不用提示了
+ String sql = "delete from BiologyMonitorWarning where sterilizationRecordId=" + sterilizationRecordId;
+ objectDao.excuteSQL(sql);
+ }
+
sterilizerManager.updateIsRoutineAttribute(sterilizationRecordId, biologicalMonitoringEndDate, biologyResult);
}
objectDao.saveOrUpdate(sterilizationRecord);
+
}
private void updateFirstSupplyRoomStock(SupplyRoomConfig firstSupplyRoom,
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManager.java
===================================================================
diff -u
--- ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManager.java (revision 0)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManager.java (revision 16571)
@@ -0,0 +1,26 @@
+package com.forgon.disinfectsystem.biologymonitorwarning.service;
+
+import net.sf.json.JSONArray;
+
+import com.forgon.disinfectsystem.entity.biologymonitorwarning.BiologyMonitorWarning;
+
+public interface BiologyMonitorWarningManager {
+
+ /**
+ * 根据用户名和科室编码获取需要生物监测的提示信息
+ * @param userName
+ * @param currentDepartCode
+ * @return
+ */
+ public JSONArray getBiologyMonitorWarningByUserNameAndCurrentDepartCode(
+ String userName, String currentDepartCode);
+
+ /**
+ * 根据用户名和科室编码删除BiologyMonitorWarning
+ * @param userName
+ * @param currentDepartCode
+ */
+ public void deleteBiologyMonitorWarningByUserNameAndCurrentDepartCode(
+ String userName, String currentDepartCode);
+
+}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java
===================================================================
diff -u -r16353 -r16571
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java (.../SterilizerManagerImpl.java) (revision 16353)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java (.../SterilizerManagerImpl.java) (revision 16571)
@@ -116,6 +116,12 @@
return false;
}
+ /**
+ * 更新TousseInstance表的isRoutine属性(在登记生物监测时如果这个包已经是发货了,则有可能用户之前忘记登记生物监测了,补登记的)
+ * @param sterilizationRecordId:灭菌记录ID
+ * @param biologicalMonitoringEndDate:生物监测结束时间
+ * @param biologyResult:生物监测的结果
+ */
@Override
public void updateIsRoutineAttribute(Long sterilizationRecordId,
Date biologicalMonitoringEndDate, String biologyResult) {
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/biologymonitorwarning/BiologyMonitorWarning.java
===================================================================
diff -u
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/biologymonitorwarning/BiologyMonitorWarning.java (revision 0)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/biologymonitorwarning/BiologyMonitorWarning.java (revision 16571)
@@ -0,0 +1,73 @@
+package com.forgon.disinfectsystem.entity.biologymonitorwarning;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
+/**
+ * 生物监测提示
+ * @author Chenjiaru 2016-12-29
+ *
+ */
+@Entity
+@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
+public class BiologyMonitorWarning {
+
+ private Long id;
+
+ /**
+ * 用户名
+ */
+ private String userName;
+
+ /**
+ * 用户科室
+ */
+ private String departCode;
+
+ /**
+ * 灭菌记录id
+ */
+ private Long sterilizationRecordId;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public String getDepartCode() {
+ return departCode;
+ }
+
+ public void setDepartCode(String departCode) {
+ this.departCode = departCode;
+ }
+
+ public Long getSterilizationRecordId() {
+ return sterilizationRecordId;
+ }
+
+ public void setSterilizationRecordId(Long sterilizationRecordId) {
+ this.sterilizationRecordId = sterilizationRecordId;
+ }
+
+
+
+}
Index: ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
===================================================================
diff -u -r16492 -r16571
--- ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml (.../applicationContext-disinfectsystem-service.xml) (revision 16492)
+++ ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml (.../applicationContext-disinfectsystem-service.xml) (revision 16571)
@@ -2173,4 +2173,22 @@
+
+
+
+
+
+
+
+
+ PROPAGATION_REQUIRED
+
+
+
+
+
+
+
\ No newline at end of file