From 1a786a2b5552d2c5d59f321bd40eb9a18af97fc2 Mon Sep 17 00:00:00 2001
From: 林致杰 <1003392067@qq.com>
Date: 星期二, 23 十一月 2021 18:17:26 +0800
Subject: [PATCH] MAQ_IAR导出报告兼容
---
src/main/java/com/ots/project/tool/report/MAQNEW/condition/ResponseFidelityDiagnosis_V2.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ots/project/tool/report/MAQNEW/condition/ResponseFidelityDiagnosis_V2.java b/src/main/java/com/ots/project/tool/report/MAQNEW/condition/ResponseFidelityDiagnosis_V2.java
index 4dbcb1c..7f6f337 100644
--- a/src/main/java/com/ots/project/tool/report/MAQNEW/condition/ResponseFidelityDiagnosis_V2.java
+++ b/src/main/java/com/ots/project/tool/report/MAQNEW/condition/ResponseFidelityDiagnosis_V2.java
@@ -32,15 +32,15 @@
String p_sde23 = map.get("P_SDE23");
String p_im24 = map.get("P_IM24");
String p_incon25 = map.get("P_INCON25");
+ P_SDE23 = Double.valueOf(p_sde23);
+ P_IM24 = Double.valueOf(p_im24);
+ P_INCON25 = Double.valueOf(p_incon25);
if (checkParamsIsNull(p_sde_t1, p_im_t1, p_incon_t1, p_sde23, p_im24, p_incon25)) {
return null;
}
Double P_SDE_T1 = Double.valueOf(p_sde_t1);
Double P_IM_T1 = Double.valueOf(p_im_t1);
Double P_INCON_T1 = Double.valueOf(p_incon_t1);
- P_SDE23 = Double.valueOf(p_sde23);
- P_IM24 = Double.valueOf(p_im24);
- P_INCON25 = Double.valueOf(p_incon25);
boolean LIBMAQV28801_3 = (P_SDE_T1 >= 95 || P_IM_T1 >= 95 || P_INCON_T1 >= 95) && (P_SDE23 >= 95 || P_IM24 >= 95 || P_INCON25 >= 95);
boolean LIBMAQV28802_3 = (P_SDE_T1 >= 95 || P_IM_T1 >= 95 || P_INCON_T1 >= 95) && ((5 < P_SDE23 && P_SDE23 < 95) && (5 < P_IM24 && P_IM24 < 95) && P_INCON25 < 95);
boolean LIBMAQV28803_3 = (P_SDE_T1 >= 95 || P_IM_T1 >= 95 || P_INCON_T1 >= 95) && (P_SDE23 <= 5 || P_IM24 <= 5) && (P_INCON25 < 95);
@@ -73,15 +73,15 @@
String p_sde23 = map.get("P_SDE23");
String p_im24 = map.get("P_IM24");
String p_incon25 = map.get("P_INCON25");
+ P_SDE23 = Double.valueOf(p_sde23);
+ P_IM24 = Double.valueOf(p_im24);
+ P_INCON25 = Double.valueOf(p_incon25);
if (checkParamsIsNull(p_sde_t1, p_im_t1, p_incon_t1, p_sde23, p_im24, p_incon25)) {
return null;
}
Double P_SDE_T1 = Double.valueOf(p_sde_t1);
Double P_IM_T1 = Double.valueOf(p_im_t1);
Double P_INCON_T1 = Double.valueOf(p_incon_t1);
- P_SDE23 = Double.valueOf(p_sde23);
- P_IM24 = Double.valueOf(p_im24);
- P_INCON25 = Double.valueOf(p_incon25);
boolean LIBMAQV28801_3 = (P_SDE_T1 >= 95 || P_IM_T1 >= 95 || P_INCON_T1 >= 95) && (P_SDE23 >= 95 || P_IM24 >= 95 || P_INCON25 >= 95);
boolean LIBMAQV28802_3 = (P_SDE_T1 >= 95 || P_IM_T1 >= 95 || P_INCON_T1 >= 95) && ((5 < P_SDE23 && P_SDE23 < 95) && (5 < P_IM24 && P_IM24 < 95) && P_INCON25 < 95);
boolean LIBMAQV28803_3 = (P_SDE_T1 >= 95 || P_IM_T1 >= 95 || P_INCON_T1 >= 95) && (P_SDE23 <= 5 || P_IM24 <= 5) && (P_INCON25 < 95);
--
Gitblit v1.9.1