Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r16373 -r16416 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 16373) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 16416) @@ -367,7 +367,7 @@ List materialInstances = new ArrayList(); List diposableGoodsInstances = new ArrayList(); - boolean includeImplantFlag = false; + Integer includeImplantFlag = TousseDefinition.UNINCLUDE_IMPLANT; //判断是否包含植入物（cjr） for (int i = 0; i < jsonArray.size(); i++) { JSONObject obj = jsonArray.getJSONObject(i); @@ -405,8 +405,8 @@ } } - if (Constants.STR_YES.equals(materialDefinition.getIsImplant())) { //包含植入物（cjr） - includeImplantFlag = true; + if (Constants.STR_YES.equals(materialDefinition.getIsImplant())) { + includeImplantFlag = TousseDefinition.INCLUDE_IMPLANT; } materialInstance.setMaterialDefinition(materialDefinition); materialInstance.setMaterialName(materialName); @@ -471,7 +471,7 @@ } } - td.setIncludeImplant(includeImplantFlag ? 0 : 1); + td.setIncludeImplant(includeImplantFlag); td.setMaterialInstances(materialInstances); // 如果isTraceble这个字段为是，则将一次性物品明细插入器械包定义中 // 如果isTraceble这个字段为否，则将价格计算出来放入器械包定义中 Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.5.4_4.5.5.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.5.4_4.5.5.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.5.4_4.5.5.sql (revision 16416) @@ -0,0 +1,14 @@ +update TousseDefinition set includeImplant=0 +where id in ( + select distinct case when md.isImplant='是' then td.id else 0 end + from TousseDefinition td + inner join MaterialInstance mi on mi.tousse_id=td.id + inner join MaterialDefinition md on md.id=mi.materialDefinition_id +); +update TousseDefinition set includeImplant=1 +where id not in ( + select distinct case when md.isImplant='是' then td.id else 0 end + from TousseDefinition td + inner join MaterialInstance mi on mi.tousse_id=td.id + inner join MaterialDefinition md on md.id=mi.materialDefinition_id +); \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js =================================================================== diff -u -r16396 -r16416 --- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js (.../config.js) (revision 16396) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js (.../config.js) (revision 16416) @@ -103,7 +103,9 @@ //发货计划列表,物品类型过滤的数据源 invoicePlanListTousseTypeArray:[{name:'全部物品类型',value:''},{name:'消毒物品',value:'消毒物品'}], // 装配物品按钮是否显示 - showPackingGoodsBtn: true + showPackingGoodsBtn: true, + //做生物监测时监测核对员必须填写 + monitorCheckerMustFill : true // 是否显示辅助发货按钮 // showAuxiliaryInvoiceBtn: true } \ No newline at end of file Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java =================================================================== diff -u -r16376 -r16416 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java (.../InvoiceManager.java) (revision 16376) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java (.../InvoiceManager.java) (revision 16416) @@ -178,6 +178,7 @@ * * @param tousseBarcodes 器械包条码集合的字符串，用分号分隔 * @return + * @author Chenjiaru */ public JSONObject getBiologicalMonitoringInfo(String tousseBarcodes); /** Index: forgon-core/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r16384 -r16416 --- forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 16384) +++ forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 16416) @@ -19,7 +19,7 @@ "3.3.0","3.3.8", "3.3.9", "3.3.10","3.3.12","3.3.13","3.8.0","3.9.0","3.9.1","3.9.2","4.0.2","4.0.3","4.0.4", "4.0.5","4.0.6","4.0.44","4.0.45","4.1.0","4.1.1","4.1.2","4.1.3","4.1.4","4.1.5","4.1.6","4.1.7","4.1.8","4.1.9","4.2.0","4.2.1","4.2.2", "4.2.3","4.2.4","4.2.5","4.2.6","4.2.7","4.2.8","4.2.9","4.3.0","4.3.1","4.3.2","4.3.3","4.3.4","4.3.5","4.3.6","4.3.7","4.3.8","4.3.9", - "4.4.0","4.4.1","4.4.2","4.4.3","4.4.4","4.4.5","4.4.6","4.4.7","4.4.8","4.4.9","4.5.0","4.5.1","4.5.2","4.5.3","4.5.4"};// 版本列表 + "4.4.0","4.4.1","4.4.2","4.4.3","4.4.4","4.4.5","4.4.6","4.4.7","4.4.8","4.4.9","4.5.0","4.5.1","4.5.2","4.5.3","4.5.4","4.5.5"};// 版本列表 public final static List SOFTWARE_VERSION_LIST = Arrays .asList(SOFTWARE_VERSION_ARRAY); public final static String SOFTWARE_VERSION = SOFTWARE_VERSION_ARRAY[SOFTWARE_VERSION_ARRAY.length - 1];// 软件最新版本 Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r16415 -r16416 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 16415) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 16416) @@ -2645,12 +2645,21 @@ var monitorUser = top.Ext.getCmp('monitorUser').getValue(); var monitorChecker = top.Ext.getCmp('monitorChecker').getValue(); - if (biologyResult != '无' && (!biologicalMonitoringStartDateString || !biologicalMonitoringEndDateString || !monitorUser || !monitorChecker)) { - showResult('生物监测开始时间，结束时间，监测员，监测核对员，都要填写！'); - return false; + if (sstsConfig.monitorCheckerMustFill) { //保存时，监测核对员也要填写 + if (biologyResult != '无' && (!biologicalMonitoringStartDateString || !biologicalMonitoringEndDateString || !monitorUser || !monitorChecker)) { + showResult('生物监测开始时间，结束时间，监测员，监测核对员，都要填写！'); + return false; + } + } else { + if (biologyResult != '无' && (!biologicalMonitoringStartDateString || !biologicalMonitoringEndDateString || !monitorUser)) { + showResult('生物监测开始时间，结束时间，监测员，都要填写！'); + return false; + } } + + // 验证循环计数器是否已经存在，一个灭菌炉的一个循环次数应是唯一的。 { DWREngine.setAsync(false); Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r16407 -r16416 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 16407) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 16416) @@ -3969,7 +3969,7 @@ List materialInstanceList = new ArrayList(); int tousseAmount = 0; - Integer isIncludeImplant = TousseDefinition.UNINCLUDE_IMPLANT; //此外来器械拆分小包是否有植入物 + Integer includeImplantFlag = TousseDefinition.UNINCLUDE_IMPLANT; //判断是否包含植入物（cjr） for (int i=0;i * 4、urgentDelivery * - * @param voBarcodes - * @param invoiceGoodsVo + * @param voBarcodes InvoiceGoodsVo码集合的字符串，用分号分隔 + * @param invoiceGoodsVo 对应的InvoiceGoodsVo集合 */ private void updateVOs(String voBarcodes, Collection vos) { - JSONObject jsonObj = invoiceManager.getBiologicalMonitoringInfo(voBarcodes); //（cjr） + JSONObject jsonObj = invoiceManager.getBiologicalMonitoringInfo(voBarcodes); for (InvoiceGoodsVo vo : vos) { String barcode = vo.getBarcode();