Răsfoiți Sursa

修改标称值只参与计算没有返回前端的bug

王苗苗 5 luni în urmă
părinte
comite
4c4bdb922c

+ 8 - 0
ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusinessServiceImpl.java

@@ -430,6 +430,7 @@ public class BusinessServiceImpl implements IBusinessService {
                         if(!CollectionUtils.isEmpty(list)){
                             ZQualityValue zQualityValue = list.get(0);//获取最新的一条,防止有多条数据的情况
                             Double highCodStandardVal = zQualityValue.getResultValue();
+                            assayDetailRes.setHighCodStandardVal(highCodStandardVal);
                             if(!Objects.isNull(highCodStandardVal) && highCodStandardVal > 0){
                                 Double val = (resultConcentration - highCodStandardVal) / highCodStandardVal;
                                 assayDetailRes.setHighCodDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4, val, INT_2));
@@ -455,6 +456,7 @@ public class BusinessServiceImpl implements IBusinessService {
                         if(!CollectionUtils.isEmpty(list)){
                             ZQualityValue zQualityValue = list.get(0);//获取最新的一条,防止有多条数据的情况
                             Double lowCodStandardVal = zQualityValue.getResultValue();
+                            assayDetailRes.setLowCodStandardVal(lowCodStandardVal);
                             if(!Objects.isNull(lowCodStandardVal) && lowCodStandardVal > 0){
                                 Double val = (resultConcentration - lowCodStandardVal) / lowCodStandardVal;
                                 assayDetailRes.setLowCodDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4, val, INT_2));
@@ -481,6 +483,7 @@ public class BusinessServiceImpl implements IBusinessService {
                         if(!CollectionUtils.isEmpty(list)){
                             ZQualityValue zQualityValue = list.get(0);//获取最新的一条,防止有多条数据的情况
                             Double anDanStandardVal = zQualityValue.getResultValue();
+                            assayDetailRes.setAnDanStandardVal(anDanStandardVal);
                             if(!Objects.isNull(anDanStandardVal) && anDanStandardVal > 0){
                                 Double val = (resultConcentration - anDanStandardVal) / anDanStandardVal;
                                 assayDetailRes.setAnDanDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4, val, INT_2));
@@ -506,6 +509,7 @@ public class BusinessServiceImpl implements IBusinessService {
                         if(!CollectionUtils.isEmpty(list)){
                             ZQualityValue zQualityValue = list.get(0);//获取最新的一条,防止有多条数据的情况
                             Double tnStandardVal = zQualityValue.getResultValue();
+                            assayDetailRes.setTnStandardVal(tnStandardVal);
                             if(!Objects.isNull(tnStandardVal) && tnStandardVal > 0){
                                 Double val = (resultConcentration - tnStandardVal) / tnStandardVal;
                                 assayDetailRes.setTnDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4, val, INT_2));
@@ -531,6 +535,7 @@ public class BusinessServiceImpl implements IBusinessService {
                         if(!CollectionUtils.isEmpty(list)){
                             ZQualityValue zQualityValue = list.get(0);//获取最新的一条,防止有多条数据的情况
                             Double tpStandardVal = zQualityValue.getResultValue();
+                            assayDetailRes.setTpStandardVal(tpStandardVal);
                             if(!Objects.isNull(tpStandardVal) && tpStandardVal > 0){
                                 Double val = (resultConcentration - tpStandardVal) / tpStandardVal;
                                 assayDetailRes.setTpDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4, val, INT_2));
@@ -556,6 +561,7 @@ public class BusinessServiceImpl implements IBusinessService {
                         if(!CollectionUtils.isEmpty(list)){
                             ZQualityValue zQualityValue = list.get(0);//获取最新的一条,防止有多条数据的情况
                             Double zlsyStandardVal = zQualityValue.getResultValue();
+                            assayDetailRes.setZlsyStandardVal(zlsyStandardVal);
                             if(!Objects.isNull(zlsyStandardVal) && zlsyStandardVal > 0){
                                 Double val = (resultConcentration - zlsyStandardVal) / zlsyStandardVal;
                                 assayDetailRes.setZlsyDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4, val, INT_2));
@@ -581,6 +587,7 @@ public class BusinessServiceImpl implements IBusinessService {
                         if(!CollectionUtils.isEmpty(list)){
                             ZQualityValue zQualityValue = list.get(0);//获取最新的一条,防止有多条数据的情况
                             Double yxsyStandardVal = zQualityValue.getResultValue();
+                            assayDetailRes.setYxsyStandardVal(yxsyStandardVal);
                             if(!Objects.isNull(yxsyStandardVal) && yxsyStandardVal > 0){
                                 Double val = (resultConcentration - yxsyStandardVal) / yxsyStandardVal;
                                 assayDetailRes.setYxsyDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4, val, INT_2));
@@ -606,6 +613,7 @@ public class BusinessServiceImpl implements IBusinessService {
                         if(!CollectionUtils.isEmpty(list)){
                             ZQualityValue zQualityValue = list.get(0);//获取最新的一条,防止有多条数据的情况
                             Double xsydStandardVal = zQualityValue.getResultValue();
+                            assayDetailRes.setXsydStandardVal(xsydStandardVal);
                             if(!Objects.isNull(xsydStandardVal) && xsydStandardVal > 0){
                                 Double val = (resultConcentration - xsydStandardVal) / xsydStandardVal;
                                 assayDetailRes.setXsydDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4, val, INT_2));