Index: ssts-sterile/src/test/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImplIsHavedoneNeedNoticeSterilisationTest.java =================================================================== diff -u --- ssts-sterile/src/test/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImplIsHavedoneNeedNoticeSterilisationTest.java (revision 0) +++ ssts-sterile/src/test/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImplIsHavedoneNeedNoticeSterilisationTest.java (revision 41338) @@ -0,0 +1,248 @@ +package com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.service; + +import com.forgon.disinfectsystem.entity.basedatamanager.sterilisation.Sterilisation; +import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.SterilizationFrequecyRemind; +import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.Sterilizer; +import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.model.SterilisationNotice; +import com.forgon.tools.hibernate.ObjectDao; +import com.forgon.tools.json.JSONUtil; +import net.sf.json.JSONObject; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.util.ArrayList; +import java.util.List; + +import static com.forgon.tools.json.JacksonUtil.trans2JSONObject; +import static org.junit.Assert.*; +import static org.mockito.Mockito.*; + +/** + * 单元测试：isHavedoneNeedNoticeSterilisation 方法 + */ +public class SterilizationRecordManagerImplIsHavedoneNeedNoticeSterilisationTest { + + @InjectMocks + private SterilizationRecordManagerImpl sterilizationRecordManager; + + @Mock + private ObjectDao objectDao; + + private AutoCloseable closeable; + + @Before + public void setUp() { + closeable = MockitoAnnotations.openMocks(this); + } + + @After + public void tearDown() throws Exception { + closeable.close(); + } + + /** + * 测试：灭菌炉不存在 + */ + @Test + public void testSterilizerNotFound() { + // Arrange + String sterilizerName = "unknown"; + when(objectDao.getByProperty(eq("Sterilizer"), eq("name"), eq(sterilizerName))).thenReturn(null); + + // Act + SterilisationNotice notice = sterilizationRecordManager.isHavedoneNeedNoticeSterilisation(sterilizerName, "anyType", "1"); + JSONObject result = JSONObject.fromObject(notice); + // Assert + assertFalse(result.getBoolean("success")); + assertEquals("灭菌炉不存在", result.getString("message")); + verify(objectDao).getByProperty("Sterilizer", "name", sterilizerName); + } + + /** + * 测试：灭菌炉存在但提醒规则为空 + */ + @Test + public void testSterilizerWithEmptyRemindList() { + // Arrange + Sterilizer sterilizer = mock(Sterilizer.class); + when(sterilizer.getSterilizationFrequecyReminds()).thenReturn(new ArrayList<>()); + + when(objectDao.getByProperty(eq("Sterilizer"), eq("name"), anyString())).thenReturn(sterilizer); + + // Act + SterilisationNotice notice = sterilizationRecordManager.isHavedoneNeedNoticeSterilisation("valid", "anyType", "1"); + JSONObject result = JSONObject.fromObject(notice); + + // Assert + assertTrue(result.getBoolean("success")); + } + + /** + * 测试：匹配成功但 sterilizationType 相同 + */ + @Test + public void testMatchedButSameSterilizationType() { + // Arrange + Sterilizer sterilizer = mock(Sterilizer.class); + SterilizationFrequecyRemind remind = mock(SterilizationFrequecyRemind.class); + Sterilisation sterilisation = mock(Sterilisation.class); + + when(remind.getFrequency()).thenReturn(1); + when(remind.getSterilisation()).thenReturn(sterilisation); + when(sterilisation.getSterilisation()).thenReturn("sameType"); + + List reminds = new ArrayList<>(); + reminds.add(remind); + when(sterilizer.getSterilizationFrequecyReminds()).thenReturn(reminds); + + when(objectDao.getByProperty(eq("Sterilizer"), eq("name"), anyString())).thenReturn(sterilizer); + + // Act + SterilisationNotice notice = sterilizationRecordManager.isHavedoneNeedNoticeSterilisation("valid", "sameType", "1"); + JSONObject result = JSONObject.fromObject(notice); + + // Assert + assertTrue(result.getBoolean("success")); + } + + /** + * 测试：匹配成功且 sterilizationType 不同（强制提醒） + */ + @Test + public void testMatchedDifferentTypeMandatory() { + // Arrange + Sterilizer sterilizer = mock(Sterilizer.class); + Sterilisation sterilisation = mock(Sterilisation.class); + SterilizationFrequecyRemind remind = new SterilizationFrequecyRemind(); + remind.setFrequency(1); + remind.setSterilisation(sterilisation); + remind.setRemindMode(SterilizationFrequecyRemind.REMINDMODE_MANDATORY); + when(sterilisation.getSterilisation()).thenReturn("correctType"); + + List reminds = new ArrayList<>(); + reminds.add(remind); + when(sterilizer.getSterilizationFrequecyReminds()).thenReturn(reminds); + + when(objectDao.getByProperty(eq("Sterilizer"), eq("name"), anyString())).thenReturn(sterilizer); + + // Act + SterilisationNotice notice = sterilizationRecordManager.isHavedoneNeedNoticeSterilisation("valid", "wrongType", "1"); + JSONObject result = JSONObject.fromObject(notice); + + // Assert + assertFalse(result.getBoolean("success")); + assertEquals(SterilizationFrequecyRemind.REMINDMODE_MANDATORY, result.getString("remindMode")); + assertEquals("correctType", result.getString("sterilisation")); + assertEquals(1, result.getInt("frequency")); + assertTrue(result.containsKey("confirmMessage")); + assertTrue(result.getString("confirmMessage").contains("必须是")); + } + + /** + * 测试：匹配成功且 sterilizationType 不同（非强制提醒） + */ + @Test + public void testMatchedDifferentTypeNonMandatory() { + // Arrange + Sterilizer sterilizer = mock(Sterilizer.class); + SterilizationFrequecyRemind remind = mock(SterilizationFrequecyRemind.class); + Sterilisation sterilisation = mock(Sterilisation.class); + + when(remind.getFrequency()).thenReturn(1); + when(remind.getSterilisation()).thenReturn(sterilisation); + when(sterilisation.getSterilisation()).thenReturn("correctType"); + when(remind.getRemindMode()).thenReturn(SterilizationFrequecyRemind.REMINDMODE_NONMANDATORY); + + List reminds = new ArrayList<>(); + reminds.add(remind); + when(sterilizer.getSterilizationFrequecyReminds()).thenReturn(reminds); + + when(objectDao.getByProperty(eq("Sterilizer"), eq("name"), anyString())).thenReturn(sterilizer); + + // Act + SterilisationNotice notice = sterilizationRecordManager.isHavedoneNeedNoticeSterilisation("valid", "wrongType", "1"); + JSONObject result = JSONObject.fromObject(notice); + + // Assert + assertFalse(result.getBoolean("success")); + assertEquals(SterilizationFrequecyRemind.REMINDMODE_NONMANDATORY, result.getString("remindMode")); + assertEquals("correctType", result.getString("sterilisation")); + assertEquals(1, result.getInt("frequency")); + assertTrue(result.containsKey("confirmMessage")); + assertTrue(result.getString("confirmMessage").contains("应该是")); + } + + /** + * 测试：提醒规则中炉次为空。跳过这种错误的配置 + */ + @Test + public void testWithReminderFrequencyNull() { + Sterilizer sterilizer = mock(Sterilizer.class); + SterilizationFrequecyRemind remind = mock(SterilizationFrequecyRemind.class); + Sterilisation sterilisation = mock(Sterilisation.class); + + when(remind.getSterilisation()).thenReturn(sterilisation); + when(sterilisation.getSterilisation()).thenReturn("CorrectType"); + when(remind.getRemindMode()).thenReturn(SterilizationFrequecyRemind.REMINDMODE_NONMANDATORY); + when(remind.getFrequency()).thenReturn(null); + List reminds = new ArrayList<>(); + reminds.add(remind); + when(sterilizer.getSterilizationFrequecyReminds()).thenReturn(reminds); + when(objectDao.getByProperty(eq("Sterilizer"), eq("name"), anyString())).thenReturn(sterilizer); + SterilisationNotice notice = sterilizationRecordManager.isHavedoneNeedNoticeSterilisation("valid", "wrongType", "1"); + JSONObject result = trans2JSONObject(notice); + assertTrue(result.getBoolean("success")); + assertFalse(result.containsKey("confirmMessage")); + } + + /** + * 测试：提醒规则中炉次非正数。跳过这种错误的配置 + */ + @Test + public void testWithReminderFrequencyNegative() { + Sterilizer sterilizer = mock(Sterilizer.class); + SterilizationFrequecyRemind remind = mock(SterilizationFrequecyRemind.class); + Sterilisation sterilisation = mock(Sterilisation.class); + + when(remind.getSterilisation()).thenReturn(sterilisation); + when(sterilisation.getSterilisation()).thenReturn("CorrectType"); + when(remind.getRemindMode()).thenReturn(SterilizationFrequecyRemind.REMINDMODE_NONMANDATORY); + when(remind.getFrequency()).thenReturn(-3); + List reminds = new ArrayList<>(); + reminds.add(remind); + when(sterilizer.getSterilizationFrequecyReminds()).thenReturn(reminds); + when(objectDao.getByProperty(eq("Sterilizer"), eq("name"), anyString())).thenReturn(sterilizer); + SterilisationNotice notice = sterilizationRecordManager.isHavedoneNeedNoticeSterilisation("valid", "wrongType", "1"); + JSONObject result = trans2JSONObject(notice); + assertTrue(result.getBoolean("success")); + assertFalse(result.containsKey("confirmMessage")); + // 验证转换结果可以添加属性 + JSONUtil.addProperty(result, "barcode", "12344"); + assertEquals("12344", result.getString("barcode")); + } + + /** + * 测试：提醒规则中灭菌程序为空。跳过这种错误的配置 + */ + @Test + public void testWithReminderSterilisationEmpty() { + Sterilizer sterilizer = mock(Sterilizer.class); + SterilizationFrequecyRemind remind = mock(SterilizationFrequecyRemind.class); + + doReturn(null).when(remind).getSterilisation(); + when(remind.getRemindMode()).thenReturn(SterilizationFrequecyRemind.REMINDMODE_NONMANDATORY); + when(remind.getFrequency()).thenReturn(-3); + List reminds = new ArrayList<>(); + reminds.add(remind); + when(sterilizer.getSterilizationFrequecyReminds()).thenReturn(reminds); + when(objectDao.getByProperty(eq("Sterilizer"), eq("name"), anyString())).thenReturn(sterilizer); + SterilisationNotice notice = sterilizationRecordManager.isHavedoneNeedNoticeSterilisation("valid", "wrongType", "1"); + JSONObject result = trans2JSONObject(notice); + assertTrue(result.getBoolean("success")); + assertFalse(result.containsKey("confirmMessage")); + } +} Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java =================================================================== diff -u -r41301 -r41338 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 41301) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 41338) @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest; +import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.model.SterilisationNotice; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -627,12 +628,12 @@ /** * 验证灭菌炉某一炉次对应的灭菌程序是否正确(灭菌炉的“按炉次提醒的灭菌程序设置”中设置炉次对应的灭菌程序) - * @param sterilizerName - * @param sterilizationType - * @param frequency - * @return + * @param sterilizerName 灭菌炉名称 + * @param sterilizationType 灭菌程序 + * @param frequency 炉次 + * @return {success:true} or {success:false,message:**} */ - public JSONObject isHavedoneNeedNoticeSterilisation(String sterilizerName, String sterilizationType, String frequency); + SterilisationNotice isHavedoneNeedNoticeSterilisation(String sterilizerName, String sterilizationType, String frequency); /** * 根据灭菌记录id获取灭菌记录图片数量 Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java =================================================================== diff -u -r41009 -r41338 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 41009) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 41338) @@ -12,6 +12,7 @@ import java.util.Map.Entry; import java.util.Set; +import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.model.SterilisationNotice; import com.forgon.exception.SystemException; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -527,11 +528,11 @@ } Sterilisation sterilisation = (Sterilisation) barcodeDevice; if (inside) { - JSONObject obj = sterilizationRecordManager.isHavedoneNeedNoticeSterilisation(sterilizerName, sterilisation.getSterilisation(), frequency); - if(obj.optBoolean("success")){ + SterilisationNotice notice = sterilizationRecordManager.isHavedoneNeedNoticeSterilisation(sterilizerName, sterilisation.getSterilisation(), frequency); + if(notice.getSuccess()){ result = "success:" + sterilisation.getSterilisation() + ":success"; }else{ - result = "success:" + sterilisation.getSterilisation() + ":"+obj.optString("confirmMessage", "")+ ":"+obj.optString("remindMode", "")+ ":"+obj.optString("sterilisation", ""); + result = "success:" + sterilisation.getSterilisation() + ":"+notice.getConfirmMessage()+ ":"+notice.getRemindMode()+ ":"+notice.getSterilisation(); } } else { result = "failure:" + sterilizerName + "，无" Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/model/SterilisationNotice.java =================================================================== diff -u --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/model/SterilisationNotice.java (revision 0) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/model/SterilisationNotice.java (revision 41338) @@ -0,0 +1,88 @@ +package com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.model; + +import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.SterilizationFrequecyRemind; +import com.forgon.response.OperatorResponse; + +import java.util.Objects; + +/** + * 灭菌提醒。根据{@link SterilizationFrequecyRemind}配置的灭菌炉炉次和当前日期及灭菌程序进行判断，给出一个是否要提醒的信息 + */ +public class SterilisationNotice extends OperatorResponse { + /** + * 提醒方式。{@link SterilizationFrequecyRemind#REMINDMODE_MANDATORY}、{@link SterilizationFrequecyRemind#REMINDMODE_NONMANDATORY} + */ + private String remindMode; + /** + * 灭菌程序名称 + */ + private String sterilisation; + /** + * 炉次。{@link SterilizationFrequecyRemind#getFrequency()}的值 + */ + private Integer frequency; + /** + * 提醒信息. + */ + private String confirmMessage; + + public SterilisationNotice(boolean success, String message) { + super(success, message); + } + + public SterilisationNotice(boolean success, String remindMode, String sterilisation, Integer frequency) { + setSuccess(success); + this.remindMode = remindMode; + this.sterilisation = sterilisation; + this.frequency = frequency; + } + + public SterilisationNotice() { + } + + public String getRemindMode() { + return remindMode; + } + + public void setRemindMode(String remindMode) { + this.remindMode = remindMode; + } + + public String getSterilisation() { + return sterilisation; + } + + public void setSterilisation(String sterilisation) { + this.sterilisation = sterilisation; + } + + public Integer getFrequency() { + return frequency; + } + + public void setFrequency(Integer frequency) { + this.frequency = frequency; + } + + public String getConfirmMessage() { + return confirmMessage; + } + + public void setConfirmMessage(String confirmMessage) { + this.confirmMessage = confirmMessage; + } + + @Override + public boolean equals(Object object) { + if (this == object) return true; + if (!(object instanceof SterilisationNotice)) return false; + if (!super.equals(object)) return false; + SterilisationNotice that = (SterilisationNotice) object; + return Objects.equals(remindMode, that.remindMode) && Objects.equals(sterilisation, that.sterilisation) && Objects.equals(frequency, that.frequency) && Objects.equals(confirmMessage, that.confirmMessage); + } + + @Override + public int hashCode() { + return Objects.hash(super.hashCode(), remindMode, sterilisation, frequency, confirmMessage); + } +} Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r41301 -r41338 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 41301) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 41338) @@ -35,6 +35,7 @@ import javax.servlet.http.HttpServletRequest; +import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.model.SterilisationNotice; import com.forgon.tools.compare.ObjectUtils; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -412,8 +413,7 @@ public void setInvoiceOptimizeManager(InvoiceManager invoiceOptimizeManager) { this.invoiceOptimizeManager = invoiceOptimizeManager; } - public void setDepartmentStockManager( - DepartmentStockManager departmentStockManager) { + public void setDepartmentStockManager(DepartmentStockManager departmentStockManager) { this.departmentStockManager = departmentStockManager; } @@ -9158,36 +9158,36 @@ } @Override - public JSONObject isHavedoneNeedNoticeSterilisation(String sterilizerName, String sterilizationType, String frequency) { - Sterilizer sr = (Sterilizer) objectDao.getByProperty(Sterilizer.class - .getSimpleName(), "name", sterilizerName); - JSONObject jsonObj = JSONUtil.buildJsonObject(true); - List sterilizationFrequecyReminds = sr.getSterilizationFrequecyReminds(); + public SterilisationNotice isHavedoneNeedNoticeSterilisation(String sterilizerName, String sterilizationType, String frequency) { + Sterilizer sterilizer = (Sterilizer) objectDao.getByProperty(Sterilizer.class.getSimpleName(), "name", sterilizerName); + if(sterilizer == null){ + return new SterilisationNotice(false, "灭菌炉不存在"); + } + SterilisationNotice notice = new SterilisationNotice(); + List sterilizationFrequecyReminds = sterilizer.getSterilizationFrequecyReminds(); if(CollectionUtils.isNotEmpty(sterilizationFrequecyReminds)){ - for (SterilizationFrequecyRemind sterilizationFrequecyRemind : sterilizationFrequecyReminds) { + for (SterilizationFrequecyRemind remind : sterilizationFrequecyReminds) { // 配置中的炉次或者灭菌程序为空时，不验证 - if(sterilizationFrequecyRemind.getFrequency() == null || sterilizationFrequecyRemind.getFrequency().intValue() < 1 - || sterilizationFrequecyRemind.getSterilisation() == null){ + if(remind.getFrequency() == null || remind.getFrequency().intValue() < 1 + || remind.getSterilisation() == null){ continue; } - if(StringUtils.equals(frequency, sterilizationFrequecyRemind.getFrequency().toString()) - && !StringUtils.equals(sterilizationType, sterilizationFrequecyRemind.getSterilisation().getSterilisation())){ - jsonObj = JSONUtil.buildJsonObject(false); - jsonObj.put("remindMode", sterilizationFrequecyRemind.getRemindMode()); - jsonObj.put("sterilisation", sterilizationFrequecyRemind.getSterilisation().getSterilisation()); - jsonObj.put("frequency", sterilizationFrequecyRemind.getFrequency()); - if(StringUtils.equals(sterilizationFrequecyRemind.getRemindMode(), SterilizationFrequecyRemind.REMINDMODE_MANDATORY)){ - jsonObj.put("confirmMessage", sterilizerName + "第" + frequency + "炉的灭菌程序必须是" + sterilizationFrequecyRemind.getSterilisation().getSterilisation() + "！"); + if(StringUtils.equals(frequency, remind.getFrequency().toString()) + && !StringUtils.equals(sterilizationType, remind.getSterilisation().getSterilisation())){ + notice = new SterilisationNotice(false, remind.getRemindMode(), + remind.getSterilisation().getSterilisation(), remind.getFrequency()); + if(StringUtils.equals(remind.getRemindMode(), SterilizationFrequecyRemind.REMINDMODE_MANDATORY)){ + notice.setConfirmMessage(sterilizerName + "第" + frequency + "炉的灭菌程序必须是" + remind.getSterilisation().getSterilisation() + "！"); }else{ - jsonObj.put("confirmMessage", sterilizerName + "第" + frequency + "炉的灭菌程序应该是" + sterilizationFrequecyRemind.getSterilisation().getSterilisation() + "，不修改灭菌程序继续操作吗？"); + notice.setConfirmMessage(sterilizerName + "第" + frequency + "炉的灭菌程序应该是" + remind.getSterilisation().getSterilisation() + "，不修改灭菌程序继续操作吗？"); } break; } } } - return jsonObj; + return notice; } Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r41239 -r41338 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 41239) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 41338) @@ -28,6 +28,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.model.SterilisationNotice; +import com.forgon.tools.json.JacksonUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import net.sf.json.JsonConfig; @@ -2464,10 +2466,10 @@ String sterilizerName = StrutsParamUtils.getPraramValue("sterilizerName",""); String sterilizationType = StrutsParamUtils.getPraramValue("sterilizationType",""); String frequency = StrutsParamUtils.getPraramValue("frequency",""); - JSONObject jsonObj = null; + SterilisationNotice notice = null; try{ - jsonObj = sterilizationRecordManager.isHavedoneNeedNoticeSterilisation(sterilizerName, sterilizationType, frequency); - StrutsResponseUtils.output(jsonObj); + notice = sterilizationRecordManager.isHavedoneNeedNoticeSterilisation(sterilizerName, sterilizationType, frequency); + StrutsResponseUtils.output(JacksonUtil.trans2JSONObject(notice)); }catch(Exception e){ e.printStackTrace(); } Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r41297 -r41338 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 41297) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 41338) @@ -25,6 +25,8 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; +import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.model.SterilisationNotice; +import com.forgon.tools.json.*; import net.sf.json.JSONArray; import net.sf.json.JSONException; import net.sf.json.JSONNull; @@ -266,10 +268,6 @@ import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.db.InitDbConnection; import com.forgon.tools.hibernate.ObjectDao; -import com.forgon.tools.json.AESTest; -import com.forgon.tools.json.DateJsonValueProcessor; -import com.forgon.tools.json.JSONUtil; -import com.forgon.tools.json.JsonPropertyFilter; import com.forgon.tools.string.StringTools; import com.forgon.tools.util.FileUtils; import com.forgon.tools.util.ForgonDateUtils; @@ -3106,7 +3104,8 @@ // 灭菌程序 JSONObject json = JSONUtil.buildJsonObject(true, sterileMethodToJson(sterilisation)); if(StringUtils.isNotBlank(sterilizerName) && StringUtils.isNotBlank(frequency)){ - json = sterilizationRecordManager.isHavedoneNeedNoticeSterilisation(sterilizerName, barcodeName, frequency); + SterilisationNotice notice = sterilizationRecordManager.isHavedoneNeedNoticeSterilisation(sterilizerName, barcodeName, frequency); + json = JacksonUtil.trans2JSONObject(notice); } json.put("data", sterileMethodToJson(sterilisation)); json.put("barcode", barcode); @@ -8380,8 +8379,8 @@ String sterilingType = params.optString("sterilingType"); String frequency = params.optString("frequency"); if(StringUtils.isNotBlank(sterilizerName) && StringUtils.isNotBlank(sterilingType) && StringUtils.isNotBlank(frequency)){ - JSONObject dataJson = sterilizationRecordManager.isHavedoneNeedNoticeSterilisation(sterilizerName, sterilingType, frequency); - JSONUtil.addDataProperty(result, dataJson); + SterilisationNotice notice = sterilizationRecordManager.isHavedoneNeedNoticeSterilisation(sterilizerName, sterilingType, frequency); + JSONUtil.addDataProperty(result, JacksonUtil.trans2JSONObject(notice)); } return result.toString(); }