土工平台修改

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilExperimentServiceImpl.java

@@ -2704,6 +2704,14 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                 }else if (expname.contains("三轴压缩")&&(expname.contains("三轴压缩"))){
                     expname="三轴压缩重塑";
                 }
+
+                String nouKuoZhanName =    name.replace(".bmp","");
+                String lastName = nouKuoZhanName.substring(nouKuoZhanName.length()-1,nouKuoZhanName.length());
+                if ("r".equals(lastName)){
+                    if (name.contains("三轴压缩")){
+                        name=name.replace("三轴压缩","三轴压缩重塑");
+                    }
+                }
                 if (name.contains(expname)){
                     SoilSample sample = soilSampleService.getBySampleCode(type.getSampleCode());
                     if (null !=sample){
@@ -2772,6 +2780,8 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
 
                     }
 
+                }else{
+
                 }