增加校核的特殊想处理

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EntrustMapper.xml

@@ -354,11 +354,18 @@
         SELECT s.sample_name,s.cement_code,s.sample_form,s.sample_code,esscct.* FROM (SELECT
         sscct.*,client_id,entrust_code,project_name,sample_num,send_name,send_phone,create_time FROM entrust e
         RIGHT JOIN
-        (SELECT count_result as input_result,sample_id,entrust_id,team_group_name,team_group_id,user_id FROM
+        (
+
+
+        SELECT count_result as input_result,sample_id,entrust_id,team_group_name,team_group_id,user_id FROM
         sample_check sc
         RIGHT JOIN
         (SELECT * FROM sample_check_team) sct
-        ON sct.check_id = sc.id WHERE sc.entrust_id = #{entrustId}) sscct
+        ON sct.check_id = sc.id WHERE sc.entrust_id = #{entrustId}
+
+
+
+        ) sscct
         ON e.id = sscct.entrust_id) esscct
         LEFT JOIN
         (SELECT name as sample_name,id,cement_code,sample_form,sample_code FROM sample) s

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/CommonServiceImpl.java

@@ -357,8 +357,11 @@ public class CommonServiceImpl {
 			}else if(name.equals("激光粒度分析")){
 				countMap.put(name,CheckCountUtil.countJGLD(resultMap));
 			}else if(name.equals("可磨")){
-				String km = CheckCountUtil.countKm(resultMap);
-				countMap.put(name, km);
+				countMap.put(name, CheckCountUtil.countKm(resultMap));
+			}else if(name.equals("辊磨")){
+				countMap.put(name, CheckCountUtil.countGm(resultMap));
+			}else if(name.equals("塑性指数")){
+				countMap.put(name, CheckCountUtil.countSxzs(resultMap));
 			}
 
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java

@@ -5098,7 +5098,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 			if(StringUtils.isNotBlank(kmLastResult) && kmLastResult.contains("=")){
 				Map<String,String> kmMap = splitLastResult(kmLastResult);
 				report.setHgi(kmMap==null || org.springframework.util.StringUtils.isEmpty(kmMap.get("HGI")) ?"—":kmMap.get("HGI"));
-				report.setCyl(kmMap==null || org.springframework.util.StringUtils.isEmpty(kmMap.get("出样率(%)")) ?"—":kmMap.get("出样率(%)"));
+				report.setCyl(kmMap==null || org.springframework.util.StringUtils.isEmpty(kmMap.get("制样率")) ?"—":kmMap.get("制样率"));
 			}else{
 				report.setHgi("—");
 				report.setCyl("—");
@@ -5344,9 +5344,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 
 
 
-
-
-
 	/**
 	 * 特殊处理的检测项最终结果拆分显示
 	 * @param lastResult

cement-business/src/main/java/cn/wise/sc/cement/business/util/CheckCountUtil.java

@@ -436,7 +436,50 @@ public class CheckCountUtil {
 	}
 
 
+	/**
+	 * 求辊磨
+	 * @param resultMap
+	 * @return
+	 */
+	public static String countGm(Map<String, String> resultMap) {
+		String count = "";
+
+		String TMF="";
+		String TWF="";
+		if( StringUtils.isNotBlank(resultMap.get("TMF"))){
+			TMF = resultMap.get("TMF").trim();
+		}
+		if( StringUtils.isNotBlank(resultMap.get("TWF(kg/t)"))){
+			TWF  = resultMap.get("TWF(kg/t)").trim();
+		}
+
+		count = "TMF="+TMF+" \n TWF(kg/t)="+TWF;
+		return  count;
+	}
 
+	/**
+	 * 求塑性指数
+	 * @param resultMap
+	 * @return
+	 */
+	public static String countSxzs(Map<String, String> resultMap) {
+		String count = "";
+
+		String YX="";
+		String SX="";
+		String SXZS="";
+		if( StringUtils.isNotBlank(resultMap.get("液限"))){
+			YX = resultMap.get("液限").trim();
+		}
+		if( StringUtils.isNotBlank(resultMap.get("塑限"))){
+			SX  = resultMap.get("塑限").trim();
+		}
+		if( StringUtils.isNotBlank(resultMap.get("塑性指数"))){
+			SXZS  = resultMap.get("塑性指数").trim();
+		}
+		count = "液限="+YX+" \n 塑限="+SX+" \n 塑性指数="+SXZS;
+		return  count;
+	}
 
 
 	/**