Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java =================================================================== diff -u -r40302 -r41008 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 40302) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 41008) @@ -26,6 +26,7 @@ import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.SterilizerRecord; import com.forgon.disinfectsystem.entity.systemwarning.SystemWarningVo; import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.vo.SterilizationRecordPrintTousseItem; +import com.forgon.disinfectsystem.sterilizationmanager.sterilizerrecord.service.SterilizerRecordManager; import com.forgon.disinfectsystem.vo.SimpleInfoVo; import com.forgon.tools.hibernate.BasePoManager; @@ -782,5 +783,21 @@ * @return */ public JSONArray getBiologyInfoForPrint(String sterilizationRecordIds); - + /** + * 保存灭菌参数确认人 + * @param sterilizationRecordId 灭菌记录id + * @param sterilizeParaConfirmationMan 人 + * @param sterilizeParaConfirmationCode 编码 + */ + public void saveSterilizeParaConfirmationMan(Long sterilizationRecordId, + String sterilizeParaConfirmationMan, + String sterilizeParaConfirmationCode); + /** + * 灭菌参数页面获取一些灭菌记录信息 + * @param sterilizationRecord 灭菌记录 + * @param sterilizerRecordId 灭菌参数记录id + * @param sterilizerRecordManager + * @return + */ + public JSONObject getSterilizationRecord(SterilizationRecord sterilizationRecord, Long sterilizerRecordId, SterilizerRecordManager sterilizerRecordManager); } Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java =================================================================== diff -u -r40952 -r41008 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java (.../WashAndDisinfectRecordManager.java) (revision 40952) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java (.../WashAndDisinfectRecordManager.java) (revision 41008) @@ -529,19 +529,31 @@ * @return */ public JSONArray createPhaseTempChart(String washAndDisinfectRecordId, Long washDataId); - /** + * 保存清洗参数确认人 + * @param washAndDisinfectRecordId + * @param cleaningParaConfirmationMan + * @param cleaningParaConfirmationCode + */ + public void saveCleaningParaConfirmationMan(Long washAndDisinfectRecordId, String cleaningParaConfirmationMan, String cleaningParaConfirmationCode); + /** * 获取A0值 * 从action封出来的 - * @param washAndDisinfectRecordId 清洗记录id + * @param washAndDisinfectRecord 清洗记录 * @param washDataId 清洗参数记录id * @return */ - public String getA0(String washAndDisinfectRecordId, Long washDataId); + public String getA0(WashAndDisinfectRecord washAndDisinfectRecord, Long washDataId); /** * 获取XinHuaSuper6000Data数据 * @param wdr 清洗记录 * @param washDataId 清洗参数记录id */ public JSONObject getWashDataOfXinHuaSuper6000Data(WashAndDisinfectRecord wdr, Long washDataId); + /** + * 获取A0和一些灭菌信息 + * @param washAndDisinfectRecordId + * @return + */ + public JSONObject getA0AndWashAndDisinfectRecordInfo(String washAndDisinfectRecordId); } Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java =================================================================== diff -u -r40942 -r41008 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java (.../SterilizerRecordLineChartAction.java) (revision 40942) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java (.../SterilizerRecordLineChartAction.java) (revision 41008) @@ -110,6 +110,7 @@ JSONObject rueslt = new JSONObject(); try { SterilizationRecord sterilizationRecord = sterilizationRecordManager.getSterilizationRecordById(Long.valueOf(sterilizationRecordId)); + JSONObject sterilizationRecordInfo = sterilizationRecordManager.getSterilizationRecord(sterilizationRecord, sterilizerRecordId, sterilizerRecordManager); List sterilizerRecords = null; Integer sterilizationParaType = sterilizationRecord.getSterilizationParaType(); if(sterilizationParaType != null){ @@ -128,6 +129,8 @@ }else{ rueslt = sterilizerRecordManager.createEChartData(sterilizationRecord, queryTable, sterilizerRecordId); } + rueslt.put("sterilizationRecordInfo", sterilizationRecordInfo); + rueslt.put("sterilizeParaConfirmationMan", sterilizationRecord.getSterilizeParaConfirmationMan()); StrutsResponseUtils.output(true, rueslt); }else{ sterilizerRecords = sterilizationRecordManager.getSterilizaerRecordsById(sterilizationRecord.getId() @@ -161,6 +164,8 @@ rueslt.put("sterilizerRecordArr", sterilizerRecordArr); rueslt.put("t1TempData", t1TempArray); rueslt.put("p1MbarData", p1MbarArray); + rueslt.put("sterilizationRecordInfo", sterilizationRecordInfo); + rueslt.put("sterilizeParaConfirmationMan", sterilizationRecord.getSterilizeParaConfirmationMan()); StrutsResponseUtils.output(true, rueslt); }else{ StrutsResponseUtils.output(false, rueslt); @@ -502,4 +507,16 @@ StrutsResponseUtils.output(false, e.getMessage()); } } + public void saveSterilizeParaConfirmationMan(){ + String sterilizeParaConfirmationMan = StrutsParamUtils.getPraramValue("sterilizeParaConfirmationMan", null); + String sterilizeParaConfirmationCode = StrutsParamUtils.getPraramValue("sterilizeParaConfirmationCode", null); + Long sterilizationRecordId = StrutsParamUtils.getPraramLongValue("sterilizationRecordId", 0L); + try { + sterilizationRecordManager.saveSterilizeParaConfirmationMan(sterilizationRecordId, sterilizeParaConfirmationMan, sterilizeParaConfirmationCode); + StrutsResponseUtils.output(true); + } catch (Exception e) { + e.printStackTrace(); + StrutsResponseUtils.output(false, e.getMessage()); + } + } } \ No newline at end of file Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashDataLineChartAction.java =================================================================== diff -u -r40952 -r41008 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashDataLineChartAction.java (.../WashDataLineChartAction.java) (revision 40952) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashDataLineChartAction.java (.../WashDataLineChartAction.java) (revision 41008) @@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse; +import com.forgon.disinfectsystem.entity.basedatamanager.rinser.Rinser; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.*; import com.forgon.tools.date.DateTools; import net.sf.json.JSONArray; @@ -102,13 +103,11 @@ public void getA0(){ String washAndDisinfectRecordId = StrutsParamUtils.getPraramValue( "washAndDisinfectRecordId", null); - String A0 = washAndDisinfectRecordManager.getA0(washAndDisinfectRecordId, null); + JSONObject washAndDisinfectRecordInfo = washAndDisinfectRecordManager.getA0AndWashAndDisinfectRecordInfo(washAndDisinfectRecordId); try { - if(StringUtils.isNotBlank(A0)){ - StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8"); - StrutsParamUtils.getResponse().getWriter() - .println(A0); - } + StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8"); + StrutsParamUtils.getResponse().getWriter() + .println(washAndDisinfectRecordInfo.toString()); } catch (IOException e) { logger.error(e.getMessage()); } @@ -290,5 +289,16 @@ logger.error(e); } } - + public void saveCleaningParaConfirmationMan(){ + String cleaningParaConfirmationMan = StrutsParamUtils.getPraramValue("cleaningParaConfirmationMan", null); + String cleaningParaConfirmationCode = StrutsParamUtils.getPraramValue("cleaningParaConfirmationCode", null); + Long washAndDisinfectRecordId = StrutsParamUtils.getPraramLongValue("washAndDisinfectRecordId", 0L); + try { + washAndDisinfectRecordManager.saveCleaningParaConfirmationMan(washAndDisinfectRecordId, cleaningParaConfirmationMan, cleaningParaConfirmationCode); + StrutsResponseUtils.output(true); + } catch (Exception e) { + e.printStackTrace(); + StrutsResponseUtils.output(false, e.getMessage()); + } + } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java =================================================================== diff -u -r40891 -r41008 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 40891) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 41008) @@ -383,8 +383,17 @@ /**未卸载状态*/ public static final String STATUS_NOTUNLOAD = "未卸载"; + /** + * 灭菌参数确认人 + */ + @FieldDescription("灭菌参数确认人") + private String sterilizeParaConfirmationMan; /** + * 灭菌参数确认人条码 + */ + private String sterilizeParaConfirmationCode; + /** * 灭菌物品是否包含植入物 * 不保存到数据库 */ @@ -1109,5 +1118,22 @@ public void setReviewers(User reviewers) { this.reviewers = reviewers; } + + public String getSterilizeParaConfirmationMan() { + return sterilizeParaConfirmationMan; + } + + public void setSterilizeParaConfirmationMan(String sterilizeParaConfirmationMan) { + this.sterilizeParaConfirmationMan = sterilizeParaConfirmationMan; + } + + public String getSterilizeParaConfirmationCode() { + return sterilizeParaConfirmationCode; + } + + public void setSterilizeParaConfirmationCode( + String sterilizeParaConfirmationCode) { + this.sterilizeParaConfirmationCode = sterilizeParaConfirmationCode; + } } Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r40991 -r41008 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 40991) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 41008) @@ -114,17 +114,21 @@ import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.GtCommonStageDetails; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.GtCommonSterilizerRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.HighTempSterilizerRecord; +import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.Johnson100NXSterilizerRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempForJohnsonRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempSterilizerRecord; +import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.MaTa130LFSterilizerRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.OneOfGetingeSterilizerRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.SenohStageDetails; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.SenohSterilizerRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.SterilizerRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.Ps100gxpStageDetails; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.Ps100gxpSterilizerRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.CommonStageDetails; +import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.XG2CXinhuaSterilizerRecord; import com.forgon.disinfectsystem.entity.systemwarning.SystemWarningVo; import com.forgon.disinfectsystem.entity.urgent.UrgentLevel; +import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord; import com.forgon.disinfectsystem.expirationdateinfo.service.ExpirationDateInfoManager; import com.forgon.disinfectsystem.idcardinstance.service.IDCardInstanceManager; import com.forgon.disinfectsystem.invoicemanager.service.InvoiceManager; @@ -134,6 +138,7 @@ import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.vo.SterilizationRecordPrintTousseItem; import com.forgon.disinfectsystem.sterilizationmanager.sterilizationunload.service.SterileUnloadScanTousseManager; import com.forgon.disinfectsystem.sterilizationmanager.sterilizerrecord.service.SenohSterilizerRecordManager; +import com.forgon.disinfectsystem.sterilizationmanager.sterilizerrecord.service.SterilizerRecordManager; import com.forgon.disinfectsystem.stockmanage.departmentstock.service.DepartmentStockManager; import com.forgon.disinfectsystem.tousse.imagefilemanager.service.ImageFileManager; import com.forgon.disinfectsystem.tousse.instrumentinstance.service.InstrumentInstanceManager; @@ -10330,5 +10335,124 @@ } return arr; } - + @Override + public void saveSterilizeParaConfirmationMan(Long sterilizationRecordId, + String sterilizeParaConfirmationMan, + String sterilizeParaConfirmationCode) { + SterilizationRecord sterilizationRecord = null; + if(DatabaseUtil.isPoIdValid(sterilizationRecordId)){ + sterilizationRecord = get(sterilizationRecordId); + } + if(sterilizationRecord == null){ + throw new RuntimeException(sterilizationRecordId + " 对应的灭菌记录不存在"); + } + if(StringUtils.isBlank(sterilizeParaConfirmationCode) || StringUtils.isBlank(sterilizeParaConfirmationMan) ){ + //避免存空字符 + sterilizationRecord.setSterilizeParaConfirmationCode(null); + sterilizationRecord.setSterilizeParaConfirmationMan(null); + }else{ + sterilizationRecord.setSterilizeParaConfirmationCode(sterilizeParaConfirmationCode); + sterilizationRecord.setSterilizeParaConfirmationMan(sterilizeParaConfirmationMan); + } + update(sterilizationRecord); + } + @Override + public JSONObject getSterilizationRecord(SterilizationRecord sterilizationRecord, + Long sterilizerRecordId, SterilizerRecordManager sterilizerRecordManager) { + JSONObject obj = new JSONObject(); + if (sterilizationRecord != null) { + obj.put("机器",StringUtils.defaultString(sterilizationRecord.getSterilizerName(), " ")); //机器炉号 + List sterilizerRecords = null; + //开始灭菌时间 + String firstSlrProcStartTime = null; + //结束灭菌时间 + String lastSlrProcStartTime = null; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + if1 : if(DatabaseUtil.isPoIdValid(sterilizerRecordId)){ + Sterilizer sterilizer = sterilizationRecord.getSterilizer(); + DeviceInterface deviceInterface = sterilizer.getDeviceInterface(); + if(deviceInterface == null){ + throw new SystemException("灭菌炉未设置设备接口"); + } + if(DeviceInterface.GETINGE.equals(deviceInterface.getDeviceBrand())){ + if(DeviceInterface.GETINGETYPE_HS_ONE.equals(deviceInterface.getDeviceModel()) || DeviceInterface.GETINGETYPE_HS66.equals(deviceInterface.getDeviceModel()) ){ + // 这些型号不会调这个接口 + break if1;//跳出if1 + }else{ + GtCommonSterilizerRecord record = (GtCommonSterilizerRecord)objectDao.getById(GtCommonSterilizerRecord.class.getSimpleName(), sterilizerRecordId); + if(record != null){ + lastSlrProcStartTime = sdf.format(record.getEndDate()); + firstSlrProcStartTime = sdf.format(record.getStartDate()); + } + break if1; + } + } + throw new SystemException("暂不支持的设备接口"); + }else if(sterilizationRecord.getSterilizationParaType() != null){ + if(SterilizationRecord.STERILIZATIONPARATYPE_TYPE_COMMON == sterilizationRecord.getSterilizationParaType()){ + CommonSterilizerRecord commonSterilizerRecord = (CommonSterilizerRecord)objectDao.getByProperty(CommonSterilizerRecord.class.getSimpleName(), "sterilizationRecord.id", sterilizationRecord.getId()); + if(commonSterilizerRecord != null){ + lastSlrProcStartTime = sdf.format(commonSterilizerRecord.getEndDate()); + firstSlrProcStartTime = sdf.format(commonSterilizerRecord.getStartDate()); + } + }else if(SterilizationRecord.STERILIZATIONPARATYPE_TYPE_GETINGE_COMMON == sterilizationRecord.getSterilizationParaType()){ + GtCommonSterilizerRecord record = (GtCommonSterilizerRecord)objectDao.getByProperty(GtCommonSterilizerRecord.class.getSimpleName(), "sterilizationRecord.id", sterilizationRecord.getId()); + if(record != null){ + lastSlrProcStartTime = sdf.format(record.getEndDate()); + firstSlrProcStartTime = sdf.format(record.getStartDate()); + } + }else if(SterilizationRecord.STERILIZATIONPARATYPE_BELIMED == sterilizationRecord.getSterilizationParaType()){ + BelimedSterilizerRecord record = (BelimedSterilizerRecord)objectDao.getByProperty(BelimedSterilizerRecord.class.getSimpleName(), "sterilizationRecord.id", sterilizationRecord.getId()); + if(record != null){ + lastSlrProcStartTime = sdf.format(record.getEndDate()); + firstSlrProcStartTime = sdf.format(record.getStartDate()); + } + }else if(SterilizationRecord.STERILIZATIONPARATYPE_MATACHANA_130LF == sterilizationRecord.getSterilizationParaType()){ + MaTa130LFSterilizerRecord record = (MaTa130LFSterilizerRecord)objectDao.getByProperty(MaTa130LFSterilizerRecord.class.getSimpleName(), "sterilizationRecordId", sterilizationRecord.getId()); + if(record != null){ + lastSlrProcStartTime = sdf.format(record.getEndDate()); + firstSlrProcStartTime = sdf.format(record.getStartDate()); + } + } else if(SterilizationRecord.STERILIZATIONPARATYPE_XINHUA_XG2_C.equals(sterilizationRecord.getSterilizationParaType())){ + XG2CXinhuaSterilizerRecord record = (XG2CXinhuaSterilizerRecord)objectDao.getByProperty(XG2CXinhuaSterilizerRecord.class.getSimpleName(), "sterilizationRecordId", sterilizationRecord.getId()); + if(record != null){ + lastSlrProcStartTime = sdf.format(record.getEndDate()); + firstSlrProcStartTime = sdf.format(record.getStartDate()); + obj.put("程序",record.getProgramName()); + } + } else if(SterilizationRecord.STERILIZATIONPARATYPE_JOHNSON_100NX.equals(sterilizationRecord.getSterilizationParaType())){ + Johnson100NXSterilizerRecord record = (Johnson100NXSterilizerRecord)objectDao.getByProperty(Johnson100NXSterilizerRecord.class.getSimpleName(), "sterilizationRecordId", sterilizationRecord.getId()); + if(record != null){ + lastSlrProcStartTime = sdf.format(record.getEndDate()); + firstSlrProcStartTime = sdf.format(record.getStartDate()); + obj.put("程序",record.getProgramNo()); + obj.put("曲线下面积1",record.getAuc1()); + obj.put("曲线下面积2",record.getAuc2()); + obj.put("花费时间",record.getTakeTime()); + obj.put("循环状态",record.getStatus()); + } + } + }else{ + sterilizerRecords = sterilizerRecordManager.getSterilizerRecord(sterilizationRecord.getId().toString()); + if(sterilizerRecords != null){ + lastSlrProcStartTime = sterilizerRecords.get(sterilizerRecords.size()-1).getTime(); + firstSlrProcStartTime = sterilizerRecords.get(0).getTime(); + } + } + Sterilizer sDefine = sterilizationRecord.getSterilizer(); + obj.put("灭菌状态",StringUtils.defaultString(sterilizationRecord.getStatus(), " ")); //灭菌状态 + obj.put("灭菌程序", StringUtils.defaultString(sterilizationRecord.getSterilizationType(), " "));//灭菌程序 + obj.put("已启动",StringUtils.defaultString(firstSlrProcStartTime, " ")); //开始时间 + obj.put("已结束", StringUtils.defaultString(lastSlrProcStartTime, " ")); //结束时间 + obj.put("灭菌员", StringUtils.defaultString(sterilizationRecord.getSterilizationUser(), " ")); //灭菌员 + obj.put("循环次数", StringUtils.defaultString(sterilizationRecord.getCycleCounter().toString(), " ")); //循环次数 + obj.put("炉号",StringUtils.defaultString(sDefine.getMachineNumber(), " ")); //灭菌炉接口机器名称 + obj.put("炉次", StringUtils.defaultString(sterilizationRecord.getFrequency().toString(), " ")); //炉次 + obj.put("审核员", StringUtils.defaultString(sterilizationRecord.getFinishComfirmer(), " ")); //完成操作人 + DeviceInterface deviceInterface = sDefine.getDeviceInterface(); + obj.put("设备品牌", deviceInterface == null?StringUtils.EMPTY:deviceInterface.getDeviceBrand()); + + } + return obj; + } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java =================================================================== diff -u -r40891 -r41008 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java (.../WashAndDisinfectRecord.java) (revision 40891) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java (.../WashAndDisinfectRecord.java) (revision 41008) @@ -163,8 +163,16 @@ * 清洗数据类型 */ private Integer washDataType; - /** + * 清洗参数确认人 + */ + private String cleaningParaConfirmationMan; + + /** + * 清洗参数确认人条码 + */ + private String cleaningParaConfirmationCode; + /** * 通用型数据 */ public static final Integer WASHDATATYPE_COMMON = 1; @@ -533,4 +541,20 @@ } } + public String getCleaningParaConfirmationMan() { + return cleaningParaConfirmationMan; + } + + public void setCleaningParaConfirmationMan(String cleaningParaConfirmationMan) { + this.cleaningParaConfirmationMan = cleaningParaConfirmationMan; + } + + public String getCleaningParaConfirmationCode() { + return cleaningParaConfirmationCode; + } + + public void setCleaningParaConfirmationCode(String cleaningParaConfirmationCode) { + this.cleaningParaConfirmationCode = cleaningParaConfirmationCode; + } + } Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java =================================================================== diff -u -r40952 -r41008 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 40952) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 41008) @@ -7360,8 +7360,28 @@ result.put("data", base64PdfContent); return result; } - @Override + public void saveCleaningParaConfirmationMan(Long washAndDisinfectRecordId, + String cleaningParaConfirmationMan, + String cleaningParaConfirmationCode) { + WashAndDisinfectRecord washAndDisinfectRecord = null; + if(DatabaseUtil.isPoIdValid(washAndDisinfectRecordId)){ + washAndDisinfectRecord = get(washAndDisinfectRecordId); + } + if(washAndDisinfectRecord == null){ + throw new RuntimeException(washAndDisinfectRecordId + " 对应的清洗记录不存在"); + } + if(StringUtils.isBlank(cleaningParaConfirmationCode) || StringUtils.isBlank(cleaningParaConfirmationMan) ){ + //避免存空字符 + washAndDisinfectRecord.setCleaningParaConfirmationCode(null); + washAndDisinfectRecord.setCleaningParaConfirmationMan(null); + }else{ + washAndDisinfectRecord.setCleaningParaConfirmationCode(cleaningParaConfirmationCode); + washAndDisinfectRecord.setCleaningParaConfirmationMan(cleaningParaConfirmationMan); + } + update(washAndDisinfectRecord); + } + @Override public JSONArray createPhaseTempChart(String washAndDisinfectRecordId, Long washDataId) { WashAndDisinfectRecord washAndDisinfectRecord = null; if(DatabaseUtil.isPoIdValid(washAndDisinfectRecordId)){ @@ -7412,21 +7432,34 @@ } return array; } - @Override - public String getA0(String washAndDisinfectRecordId, Long washDataId) { - WashAndDisinfectRecord washAndDisinfectRecord = null; - if(DatabaseUtil.isPoIdValid(washAndDisinfectRecordId)){ - washAndDisinfectRecord = get(washAndDisinfectRecordId); + public JSONObject getA0AndWashAndDisinfectRecordInfo( + String washAndDisinfectRecordId) { + WashAndDisinfectRecord washAndDisinfectRecord = get(washAndDisinfectRecordId); + JSONObject washAndDisinfectRecordInfo = new JSONObject(); + if(washAndDisinfectRecord != null){ + washAndDisinfectRecordInfo.put("rinserName", washAndDisinfectRecord.getDisinfectIdentification()); + washAndDisinfectRecordInfo.put("disinfectProgram", washAndDisinfectRecord.getDisinfectProgram()); + DateFormat dateFormat = DateTools.YMDHMSFORMAT.get(); + washAndDisinfectRecordInfo.put("startDate", washAndDisinfectRecord.getStartDate() != null?dateFormat.format(washAndDisinfectRecord.getStartDate()):StringUtils.EMPTY); + washAndDisinfectRecordInfo.put("endDate", washAndDisinfectRecord.getEndDate() != null?dateFormat.format(washAndDisinfectRecord.getEndDate()):StringUtils.EMPTY); + washAndDisinfectRecordInfo.put("operator", washAndDisinfectRecord.getOperator()); + washAndDisinfectRecordInfo.put("cleaningParaConfirmationMan", washAndDisinfectRecord.getCleaningParaConfirmationMan()); } + String A0 = getA0(washAndDisinfectRecord, null); + washAndDisinfectRecordInfo.put("A0", A0); + return washAndDisinfectRecordInfo; + } + @Override + public String getA0(WashAndDisinfectRecord washAndDisinfectRecord, Long washDataId) { String A0 = null; int A0Value = 0; if(washAndDisinfectRecord != null && WashAndDisinfectRecord.WASHDATATYPE_COMMON.equals(washAndDisinfectRecord.getWashDataType()) || DatabaseUtil.isPoIdValid(washDataId)){ CommonWashDataRecord commonWashDataRecord = null; if(DatabaseUtil.isPoIdValid(washDataId)){ commonWashDataRecord = (CommonWashDataRecord)objectDao.getById(CommonWashDataRecord.class.getSimpleName(),washDataId); - }else if(DatabaseUtil.isPoIdValid(washAndDisinfectRecordId)){ + }else if(DatabaseUtil.isPoIdValid(washAndDisinfectRecord.getId())){ commonWashDataRecord = getCommonWashDataRecord(washAndDisinfectRecord.getId()); } if (commonWashDataRecord == null) {