Merge branch 'dev'

src/main/java/com/patzn/cloud/service/lims/common/CollectUtil.java

@@ -105,6 +105,8 @@ public class CollectUtil {
                     content = content.replace("灵 敏 度","灵敏度");
                     content = content.replace("粘 聚 力","凝聚力");
                     content = content.replace("粘聚力","凝聚力");
+                    content = content.replace("原 状Qu","原状Qu");
+                    content = content.replace("重 塑Qu","重塑Qu");
                     content = content.replace("固结系数(t90):","固结系数(t90)");
                     content = content.replace("压缩系数(100-200KPa):","压缩系数(100-200KPa)");
                     content = content.replace("压缩模量(100-200KPa):","压缩模量(100-200KPa)");
@@ -145,6 +147,10 @@ public class CollectUtil {
             String youxiaonianjuli = "";
             String youxiaomocajiao = "";
 
+            String yzQu = "";
+            String csQu = "";
+            String lingmindu = "";
+
             for (int i = 0; i < size; i++) {
                 String str = titleList.get(i);
                 if ("凝聚力".equals(str)){
@@ -241,7 +247,7 @@ public class CollectUtil {
                     }
                 }
 
-                if ("有效粘聚力".equals(str)){
+                if ("有效凝聚力".equals(str)){
                     youxiaonianjuli = titleList.get(i+1);
                     if (StringUtils.isNotBlank(youxiaonianjuli)){
                         SoilExperimentCollectData collectData = new SoilExperimentCollectData();
@@ -268,6 +274,45 @@ public class CollectUtil {
                     }
                 }
 
+                if ("原状Qu".equals(str)){
+                    yzQu = titleList.get(i+1);
+                    if (StringUtils.isNotBlank(yzQu)){
+                        SoilExperimentCollectData collectData = new SoilExperimentCollectData();
+                        collectData.setName("原状剪切强度");
+                        collectData.setTestValue(yzQu);
+                        if (i+2<size){
+                            collectData.setUnit(titleList.get(i+2));
+                        }
+                        dataList.add(collectData);
+                    }
+                }
+
+
+                if ("重塑Qu".equals(str)){
+                    csQu = titleList.get(i+1);
+                    if (StringUtils.isNotBlank(csQu)){
+                        SoilExperimentCollectData collectData = new SoilExperimentCollectData();
+                        collectData.setName("重塑剪切强度");
+                        collectData.setTestValue(csQu);
+                        if (i+2<size){
+                            collectData.setUnit(titleList.get(i+2));
+                        }
+                        dataList.add(collectData);
+                    }
+                }
+
+
+                if ("灵敏度".equals(str)){
+                    lingmindu = titleList.get(i+1);
+                    if (StringUtils.isNotBlank(lingmindu)){
+                        SoilExperimentCollectData collectData = new SoilExperimentCollectData();
+                        collectData.setName("灵敏度");
+                        collectData.setTestValue(lingmindu);
+                        dataList.add(collectData);
+                    }
+                }
+
+
                 if ("试验编号".equals(str)){
                     sampleCode = titleList.get(i+1);
                 }