质检质量指标保留位数和总量计算

src/main/resources/static/app/storage/controller/qualitycheckAssayCtrl.js

@@ -782,7 +782,7 @@ angular.module('app.storage')
 
         $scope.getMath = function(v) {
             if (isNaN(v) || v == "") {
-                v = 0.00;
+                v = "0.00";
             } else {
                 v = Math.round(v*100)/100;
                 v = v.toString();
@@ -797,7 +797,7 @@ angular.module('app.storage')
         }
         $scope.getMath1 = function(v) {
             if (isNaN(v) || v == "") {
-                v = 0.0;
+                v = "0.0";
             } else {
                 v = Math.round(v*10)/10;
                 v = v.toString();
@@ -873,616 +873,518 @@ angular.module('app.storage')
         $scope.zjzl = function() {
         	var pz = $scope.qualitycheck.subType;
         	if (pz=="3164") {
-        		if($scope.qualitycheck.water != null){
+        		
         			var sf = parseFloat($scope.qualitycheck.water);//水分
-            		sf = $scope.checkJqos(sf,1);
+            		//sf = $scope.checkJqos(sf,1);
             		$scope.qualitycheck.water = $scope.getMath1(sf);
-        		}
+        		
         		/*if($scope.qualitycheckInspection.unitWeight != null){
         			var rz = parseFloat($scope.qualitycheckInspection.unitWeight);//容重
             		rz = $scope.checkJqos(rz,1);
             		$scope.qualitycheckInspection.unitWeight = $scope.getMath1(rz);
         		}*/
-        		if($scope.qualitycheck.hardIndex != null){
+        		
         			var xmydzs = parseFloat($scope.qualitycheck.hardIndex);//小麦硬度指数
-            		xmydzs = $scope.checkJqos(xmydzs,1);
+            		//xmydzs = $scope.checkJqos(xmydzs,1);
             		$scope.qualitycheck.hardIndex = $scope.getMath1(xmydzs);
-        		}
-        		if($scope.qualitycheck.mineral != null){
+        		
+        		
         			var mineral = parseFloat($scope.qualitycheck.mineral);//矿物质
-            		mineral = $scope.checkJqos(mineral,2);
+            		//mineral = $scope.checkJqos(mineral,2);
             		//mineral = isNaN(mineral) ? 0.00 : mineral;
             		$scope.qualitycheck.mineral = $scope.getMath(mineral);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsScabBlackembryo != null){
+        		
+        		
         			var black = parseFloat($scope.qualitycheckInspection.imperfectgrainsScabBlackembryo);//黒胚粒
-            		black = $scope.checkJqos(black,2);
+            		//black = $scope.checkJqos(black,2);
             		//black = isNaN(black) ? 0 : black;
             		$scope.qualitycheckInspection.imperfectgrainsScabBlackembryo = $scope.getMath(black);
-        		}
-        		if($scope.qualitycheckInspection.impurityInorganic != null){
+        		
+        		
         			var inorganic = parseFloat($scope.qualitycheckInspection.impurityInorganic);//无机杂质
             		//inorganic = isNaN(inorganic) ? 0 : inorganic;
-            		inorganic = $scope.checkJqos(inorganic,2);
+            		//inorganic = $scope.checkJqos(inorganic,2);
             		$scope.qualitycheckInspection.impurityInorganic = $scope.getMath(inorganic);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsScabGibberella != null){
+        	
+        		
         			var gibberella = parseFloat($scope.qualitycheckInspection.imperfectgrainsScabGibberella);//赤霉病粒
             		//gibberella = isNaN(gibberella) ? 0 : gibberella;
-            		gibberella = $scope.checkJqos(gibberella,2);
+            		//gibberella = $scope.checkJqos(gibberella,2);
             		$scope.qualitycheckInspection.imperfectgrainsScabGibberella = $scope.getMath(gibberella);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsScabQtbl != null){
+        		
+        		
         			var qtbl = parseFloat($scope.qualitycheckInspection.imperfectgrainsScabQtbl);//其它病粒
             		//qtbl = isNaN(qtbl) ? 0 : qtbl;
-            		qtbl = $scope.checkJqos(qtbl,2);
+            		//qtbl = $scope.checkJqos(qtbl,2);
             		$scope.qualitycheckInspection.imperfectgrainsScabQtbl = $scope.getMath(qtbl);
-        		}
-        		if($scope.qualitycheckInspection.impurityOrganic != null){
+        		
+        		
         			var organic = parseFloat($scope.qualitycheckInspection.impurityOrganic);//有机杂质
             		//organic = isNaN(organic) ? 0 : organic;
-        			organic = $scope.checkJqos(organic,2);
+        			//organic = $scope.checkJqos(organic,2);
             		$scope.qualitycheckInspection.impurityOrganic = $scope.getMath(organic);
-        		}
-        		if($scope.qualitycheckInspection.sieveResidue != null){
+        		
+        		
         			var sieveResidue = parseFloat($scope.qualitycheckInspection.sieveResidue);//筛下物%
             		//sieveResidue = isNaN(sieveResidue) ? 0 : sieveResidue;
-            		sieveResidue = $scope.checkJqos(sieveResidue,2);
+            		//sieveResidue = $scope.checkJqos(sieveResidue,2);
             		$scope.qualitycheckInspection.sieveResidue = $scope.getMath(sieveResidue);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsInjuredkernel != null){
+        		
+        		
         			var csl = parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel);//虫蚀粒%
             		//csl = isNaN(csl) ? 0 : csl;
-            		csl = $scope.checkJqos(csl,2);
+            		//csl = $scope.checkJqos(csl,2);
             		$scope.qualitycheckInspection.imperfectgrainsInjuredkernel = $scope.getMath(csl);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsDamage != null){
+        		
+        		
         			var psl = parseFloat($scope.qualitycheckInspection.imperfectgrainsDamage);//破损粒%
             		//psl = isNaN(psl) ? 0 : psl;
-            		psl = $scope.checkJqos(psl,2);
+            		//psl = $scope.checkJqos(psl,2);
             		$scope.qualitycheckInspection.imperfectgrainsDamage = $scope.getMath(psl);
-        		}
-        		if($scope.qualitycheck.mildewCount != null){
+        		
+        		
         			var sml = parseFloat($scope.qualitycheck.mildewCount);//生霉粒%
             		//sml = isNaN(sml) ? 0 : sml;
-            		sml = $scope.checkJqos(sml,2);
+            		//sml = $scope.checkJqos(sml,2);
             		$scope.qualitycheck.mildewCount = $scope.getMath(sml);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsSproutedkernel != null){
+        		
+        		
         			var syl = parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel);//生芽粒%
             		//syl = isNaN(syl) ? 0 : syl;
-            		syl = $scope.checkJqos(syl,2);
+            		//syl = $scope.checkJqos(syl,2);
             		$scope.qualitycheckInspection.imperfectgrainsSproutedkernel = $scope.getMath(syl);
-        		}
         		
-        		if(black == null || black == undefined){
-        			black = 0;
-    			}
-    			if(gibberella == null || gibberella == undefined){
-    				gibberella = 0;
-    			}
-    			if(qtbl == null || qtbl == undefined){
-    				qtbl = 0;
-    			}
-    			if(black == 0 && gibberella == 0 && qtbl == 0){
-    				$scope.qualitycheckInspection.imperfectgrainsScabTotal = null;
-    			}else{
-            		var bblzl = ((parseFloat(black)*100) + (parseFloat(gibberella)*100) + (parseFloat(qtbl)*100))/100;//病斑粒总量%
-            		bblzl = $scope.checkJqos(bblzl,1);
-        			$scope.qualitycheckInspection.imperfectgrainsScabTotal = isNaN(bblzl) ? '0.0' : $scope.getMath1(bblzl);
-    			}
+        		
+        		
+            		//var bblzl = ((parseFloat(black)*100) + (parseFloat(gibberella)*100) + (parseFloat(qtbl)*100))/100;//病斑粒总量%
+            		//bblzl = $scope.checkJqos(bblzl,1);
+        			//$scope.qualitycheckInspection.imperfectgrainsScabTotal = isNaN(bblzl) ? '0.0' : $scope.getMath1(bblzl);
+    			
         		//bblzl = isNaN(bblzl) ? 0 : bblzl;
         		//$scope.qualitycheckInspection.imperfectgrainsSproutedkernel = $scope.getMath(syl);
         		
-        		if($scope.qualitycheckInspection.inputTwo != null){
+        		
         			var zdy = parseFloat($scope.qualitycheckInspection.inputTwo);//自定义属性
-            		zdy = $scope.checkJqos(zdy,1);
+            		//zdy = $scope.checkJqos(zdy,1);
             		$scope.qualitycheckInspection.inputTwo = $scope.getMath1(zdy);
-        		}
+        		
         		
         		
         		
         		if($scope.qualitycheck !== undefined && $scope.qualitycheck !== ""){
         			//杂质总量
-        			if(mineral == null || mineral == undefined){
-        				mineral = 0;
-        			}
-        			if(inorganic == null || inorganic == undefined){
-        				inorganic = 0;
-        			}
-        			if(organic == null || organic == undefined){
-        				organic = 0;
-        			}
-        			if(sieveResidue == null || sieveResidue == undefined){
-        				sieveResidue = 0;
-        			}
         			
-        			if(mineral == 0 && inorganic == 0 && organic == 0 && sieveResidue == 0){
-        				$scope.qualitycheckInspection.impurityTotal = null;
-        			}else{
-        				var zzzl = ((parseFloat(mineral)*100) + (parseFloat(inorganic)*100)+ (parseFloat(organic)*100)+ (parseFloat(sieveResidue)*100))/100;
+        			
+        				var zzzl = ((parseFloat($scope.qualitycheck.mineral)*100) + (parseFloat($scope.qualitycheckInspection.impurityOrganic)*100)+ 
+        						(parseFloat($scope.qualitycheckInspection.impurityInorganic)*100)+ (parseFloat($scope.qualitycheckInspection.sieveResidue)*100))/100;
             			//$scope.qualitycheckInspection.impurityTotal = $scope.getMath($scope.qualitycheckInspection.impurityTotal);
-            			zzzl = $scope.checkJqos(zzzl,1);
+            			//zzzl = $scope.checkJqos(zzzl,1);
             			$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
-        			}
+        			
         			
         			//病斑粒总量
-        			if(black == null || black == undefined){
-        				black = 0;
-        			}
-        			if(gibberella == null || gibberella == undefined){
-        				gibberella = 0;
-        			}
-        			if(qtbl == null || qtbl == undefined){
-        				qtbl = 0;
-        			}
-        			if(black == 0 && gibberella == 0 && qtbl == 0){
-        				$scope.qualitycheckInspection.imperfectgrainsScabTotal = null;
-        			}else{
-        				var bblzl = ((parseFloat(black)*100) + (parseFloat(gibberella)*100) + (parseFloat(qtbl)*100))/100;
+        			
+        				var bblzl = ((parseFloat($scope.qualitycheckInspection.imperfectgrainsScabBlackembryo)*100) + 
+        						(parseFloat($scope.qualitycheckInspection.imperfectgrainsScabGibberella)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsScabQtbl)*100))/100;
             			//$scope.qualitycheckInspection.imperfectgrainsScabTotal = $scope.getMath($scope.qualitycheckInspection.imperfectgrainsScabTotal);
-            			bblzl = $scope.checkJqos(bblzl,1);
+            			//bblzl = $scope.checkJqos(bblzl,1);
             			$scope.qualitycheckInspection.imperfectgrainsScabTotal = isNaN(bblzl) ? '0.0' : $scope.getMath1(bblzl);
-        			}
+        			
         			
         			//不完善粒总量
-        			if(csl == null || csl == undefined){
-        				csl = 0;
-        			}
-        			if(psl == null || psl == undefined){
-        				psl = 0;
-        			}
-        			if(sml == null || sml == undefined){
-        				sml = 0;
-        			}
-        			if(bblzl == null || bblzl == undefined){
-        				bblzl = 0;
-        			}
-        			if(syl == null || syl == undefined){
-        				syl = 0;
-        			}
         			
-        			if(csl == 0 && psl ==0 && sml == 0 && bblzl == 0 && syl == 0){
-        				$scope.qualitycheckInspection.imperfectgrainsTotal = null;
-        			}else{
-        				var bwslzl = ((parseFloat(csl)*100) + (parseFloat(psl)*100)+(parseFloat(sml)*100) + (parseFloat(bblzl)*100) + (parseFloat(syl)*100))/100;
+        				var bwslzl = ((parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsDamage)*100)
+        						+(parseFloat($scope.qualitycheck.mildewCount)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsScabTotal)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel)*100))/100;
             			//$scope.qualitycheckInspection.imperfectgrainsTotal = $scope.getMath($scope.qualitycheckInspection.imperfectgrainsTotal);
-            			bwslzl = $scope.checkJqos(bwslzl,1);
+            			//bwslzl = $scope.checkJqos(bwslzl,1);
             			$scope.qualitycheckInspection.imperfectgrainsTotal = isNaN(bwslzl) ? '0.0' : $scope.getMath1(bwslzl);
-        			}
+        			
         			
         		}
         	} else if (pz=="3166") {
-        		if($scope.qualitycheck.water != null){
+        		
         			var sf = parseFloat($scope.qualitycheck.water);//水分
-            		sf = $scope.checkJqos(sf,1);
+            		//sf = $scope.checkJqos(sf,1);
             		$scope.qualitycheck.water = $scope.getMath1(sf);
-        		}
-        		if($scope.qualitycheck.huskedRation != null){
+
+            		
         			var ccl = parseFloat($scope.qualitycheck.huskedRation);//出糙率
-            		ccl = $scope.checkJqos(ccl,1);
+            		//ccl = $scope.checkJqos(ccl,1);
             		$scope.qualitycheck.huskedRation = $scope.getMath1(ccl);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsImmaturegrain != null){
+        		
+        		
         			var wsl = parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain);//未熟粒
-            		wsl = $scope.checkJqos(wsl,2);
+            		//wsl = $scope.checkJqos(wsl,2);
             		$scope.qualitycheckInspection.imperfectgrainsImmaturegrain = $scope.getMath(wsl);
-        		}
-        		if($scope.qualitycheck.fullGoodRation != null){
+        		
+        		
         			var zjml = parseFloat($scope.qualitycheck.fullGoodRation);//整精米率
-            		zjml = $scope.checkJqos(zjml,1);
+            		//zjml = $scope.checkJqos(zjml,1);
             		$scope.qualitycheck.fullGoodRation = $scope.getMath1(zjml);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsInjuredkernel != null){
+        		
+        		
         			var csl = parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel);//虫蚀粒
-            		csl = $scope.checkJqos(csl,2);
+            		//csl = $scope.checkJqos(csl,2);
             		$scope.qualitycheckInspection.imperfectgrainsInjuredkernel = $scope.getMath(csl);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsScab != null){
+        		
+        		
         			var bbl = parseFloat($scope.qualitycheckInspection.imperfectgrainsScab);//病斑粒
-            		bbl = $scope.checkJqos(bbl,2);
+            		//bbl = $scope.checkJqos(bbl,2);
             		$scope.qualitycheckInspection.imperfectgrainsScab = $scope.getMath(bbl);
-        		}
-        		if($scope.qualitycheckInspection.sieveResidue != null){
+        		
+        		
         			var sieveResidue = parseFloat($scope.qualitycheckInspection.sieveResidue);//筛下物%
-            		sieveResidue = $scope.checkJqos(sieveResidue,2);
+            		//sieveResidue = $scope.checkJqos(sieveResidue,2);
             		$scope.qualitycheckInspection.sieveResidue = $scope.getMath(sieveResidue);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsSproutedkernel != null ){
+        		
+        		
         			var syl = parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel);//生芽粒
-            		syl = $scope.checkJqos(syl,2);
+            		//syl = $scope.checkJqos(syl,2);
             		$scope.qualitycheckInspection.imperfectgrainsSproutedkernel = $scope.getMath(syl);
-        		}
-        		if($scope.qualitycheckInspection.impurityOrganic != null){
+        		
+        		
         			var yjzz = parseFloat($scope.qualitycheckInspection.impurityOrganic);//有机杂质
-            		yjzz = $scope.checkJqos(yjzz,2);
+            		//yjzz = $scope.checkJqos(yjzz,2);
             		$scope.qualitycheckInspection.impurityOrganic = $scope.getMath(yjzz);
-        		}
-        		if($scope.qualitycheck.mildewCount != null){
+        		
+        		
         			var sml = parseFloat($scope.qualitycheck.mildewCount);//生霉粒
-            		sml = $scope.checkJqos(sml,2);
+            		//sml = $scope.checkJqos(sml,2);
             		$scope.qualitycheck.mildewCount = $scope.getMath(sml);
-        		}
-        		if($scope.qualitycheckInspection.impurityInorganic != null){
+        		
+        		
         			var wjzz = parseFloat($scope.qualitycheckInspection.impurityInorganic);//无机杂质
-            		wjzz = $scope.checkJqos(wjzz,2);
+            		//wjzz = $scope.checkJqos(wjzz,2);
             		$scope.qualitycheckInspection.impurityInorganic = $scope.getMath(wjzz);
-        		}
-        		if($scope.qualitycheck.outHuskedRation != null){
+        		
+        		
         			var gwcm = parseFloat($scope.qualitycheck.outHuskedRation);//谷外糙米
-            		gwcm = $scope.checkJqos(gwcm, 1);
+            		//gwcm = $scope.checkJqos(gwcm, 1);
             		$scope.qualitycheck.outHuskedRation = $scope.getMath1(gwcm);
-        		}
-        		if($scope.qualitycheckInspection.riceYield != null){
+        		
+        		
         			var cml = parseFloat($scope.qualitycheckInspection.riceYield);//出米率
-            		cml = $scope.checkJqos(cml, 1);
+            		//cml = $scope.checkJqos(cml, 1);
             		$scope.qualitycheckInspection.riceYield = $scope.getMath1(cml);
-        		}
-        		if($scope.qualitycheckInspection.yellowRice != null){
+        		
+        		
         			var hlm = parseFloat($scope.qualitycheckInspection.yellowRice);//黄粒米
-            		hlm = $scope.checkJqos(hlm, 1);
+            		//hlm = $scope.checkJqos(hlm, 1);
             		$scope.qualitycheckInspection.yellowRice = $scope.getMath1(hlm);
-        		}
-        		if($scope.qualitycheck.intermixingRate != null){
+        		
+        		
         			var hhl = parseFloat($scope.qualitycheck.intermixingRate);//互混率
-            		hhl = $scope.checkJqos(hhl, 1);
+            		//hhl = $scope.checkJqos(hhl, 1);
             		$scope.qualitycheck.intermixingRate = $scope.getMath1(hhl);
-        		}
-        		if($scope.qualitycheckInspection.inputTwo != null){
+        		
+        		
         			var zdy = parseFloat($scope.qualitycheckInspection.inputTwo);//自定义属性
-            		zdy = $scope.checkJqos(zdy, 1);
+            		//zdy = $scope.checkJqos(zdy, 1);
             		$scope.qualitycheckInspection.inputTwo = $scope.getMath1(zdy);
-        		}
-        		
         		
         		
         		if($scope.qualitycheck !== undefined && $scope.qualitycheck !== ""){
         			//杂质总量=筛下物+有机杂质+无机杂质，四舍五入，保留一位小数
-        			if(sieveResidue == null || sieveResidue == undefined){
-        				sieveResidue = 0;
-        			}
-        			if(yjzz == null || yjzz == undefined){
-        				yjzz = 0;
-        			}
-        			if(wjzz == null || wjzz == undefined){
-        				wjzz = 0;
-        			}
-        			if(sieveResidue == 0 && yjzz == 0 && wjzz == 0){
-        				$scope.qualitycheckInspection.impurityTotal = null;
-        			}else{
-        				var zzzl = ((parseFloat(sieveResidue)*100) + (parseFloat(yjzz)*100)+ (parseFloat(wjzz)*100))/100;
-            			zzzl = $scope.checkJqos(zzzl, 1);
+        			
+        				var zzzl = ((parseFloat($scope.qualitycheckInspection.sieveResidue)*100) + (parseFloat($scope.qualitycheckInspection.impurityOrganic)*100)+ (parseFloat($scope.qualitycheckInspection.impurityInorganic)*100))/100;
+            			//zzzl = $scope.checkJqos(zzzl, 1);
             			$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
-        			}
+        			
         			
         			//zzzl.toFixed(1);
         			//$scope.qualitycheckInspection.impurityTotal = $scope.getMath1($scope.qualitycheckInspection.impurityTotal);
         			//不完善粒总量=未熟粒+虫蚀粒+病斑粒+生芽粒+生霉粒
-        			if(wsl == null || wsl == undefined){
-        				wsl = 0;
-        			}
-        			if(csl == null || csl == undefined){
-        				csl = 0;
-        			}
-        			if(bbl == null || bbl == undefined){
-        				bbl = 0;
-        			}
-        			if(syl == null || syl == undefined){
-        				syl = 0;
-        			}
-        			if(sml == null || sml == undefined){
-        				sml = 0;
-        			}
         			
-        			if(wsl == 0 && csl == 0 && bbl == 0 && syl == 0 && sml == 0){
-        				$scope.qualitycheckInspection.imperfectgrainsTotal = null;
-        			}else{
-        				var bwslzl = ((parseFloat(wsl)*100) + (parseFloat(csl)*100) + (parseFloat(bbl)*100) + (parseFloat(syl)*100) + (parseFloat(sml)*100))/100;
-            			bwslzl = $scope.checkJqos(bwslzl, 1);
+        			
+        			
+        				var bwslzl = ((parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel)*100) + 
+        						(parseFloat($scope.qualitycheckInspection.imperfectgrainsScab)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel)*100) + (parseFloat($scope.qualitycheck.mildewCount)*100))/100;
+            			//bwslzl = $scope.checkJqos(bwslzl, 1);
             			$scope.qualitycheckInspection.imperfectgrainsTotal = isNaN(bwslzl) ? '0.0' : $scope.getMath1(bwslzl);
-        			}
+        			
         			
         		}
         	}else if(pz=="3165"){
 
-        		if($scope.qualitycheck.water != null){
+        		
         			var sf = parseFloat($scope.qualitycheck.water);//水分
-            		sf = $scope.checkJqos(sf,1);
+            		//sf = $scope.checkJqos(sf,1);
             		$scope.qualitycheck.water = $scope.getMath1(sf);
-        		}
-        		if($scope.qualitycheckInspection.impurityOrganic != null){
+        		
+        		
         			var yjzz = parseFloat($scope.qualitycheckInspection.impurityOrganic);//有机杂质
-        			yjzz = $scope.checkJqos(yjzz,2);
+        			//yjzz = $scope.checkJqos(yjzz,2);
             		$scope.qualitycheckInspection.impurityOrganic = $scope.getMath(yjzz);
-        		}
-        		if($scope.qualitycheckInspection.impurityInorganic != null){
+        		
+        		
         			var wjzz = parseFloat($scope.qualitycheckInspection.impurityInorganic);//无机杂质
-            		wjzz = $scope.checkJqos(wjzz,2);
+            		//wjzz = $scope.checkJqos(wjzz,2);
             		$scope.qualitycheckInspection.impurityInorganic = $scope.getMath(wjzz);
-        		}
-        		if($scope.qualitycheckInspection.sieveResidue != null){
+        		
+        		
         			var sieveResidue = parseFloat($scope.qualitycheckInspection.sieveResidue);//筛下物%
             		//sieveResidue = isNaN(sieveResidue) ? 0 : sieveResidue;
-            		sieveResidue = $scope.checkJqos(sieveResidue,2);
+            		//sieveResidue = $scope.checkJqos(sieveResidue,2);
             		$scope.qualitycheckInspection.sieveResidue = $scope.getMath(sieveResidue);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsInjuredkernel != null){
+        		
+        		
         			var csl = parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel);//虫蚀粒%
             		//csl = isNaN(csl) ? 0 : csl;
-            		csl = $scope.checkJqos(csl,2);
+            		//csl = $scope.checkJqos(csl,2);
             		$scope.qualitycheckInspection.imperfectgrainsInjuredkernel = $scope.getMath(csl);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsScab != null){
+        		
+        		
         			var bbl = parseFloat($scope.qualitycheckInspection.imperfectgrainsScab);//病斑粒
-            		bbl = $scope.checkJqos(bbl,2);
+            		//bbl = $scope.checkJqos(bbl,2);
             		$scope.qualitycheckInspection.imperfectgrainsScab = $scope.getMath(bbl);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsDamage != null){
+        		
+        		
         			var psl = parseFloat($scope.qualitycheckInspection.imperfectgrainsDamage);//破损粒%
             		//psl = isNaN(psl) ? 0 : psl;
-            		psl = $scope.checkJqos(psl,2);
+            		//psl = $scope.checkJqos(psl,2);
             		$scope.qualitycheckInspection.imperfectgrainsDamage = $scope.getMath(psl);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsSproutedkernel != null){
+        		
+        		
         			var syl = parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel);//生芽粒%
             		//syl = isNaN(syl) ? 0 : syl;
-            		syl = $scope.checkJqos(syl,2);
+            		//syl = $scope.checkJqos(syl,2);
             		$scope.qualitycheckInspection.imperfectgrainsSproutedkernel = $scope.getMath(syl);
-        		}
-        		if($scope.qualitycheck.mildewCount != null){
+        		
+        		
         			var sml = parseFloat($scope.qualitycheck.mildewCount);//生霉粒%
             		//sml = isNaN(sml) ? 0 : sml;
-            		sml = $scope.checkJqos(sml,2);
+            		//sml = $scope.checkJqos(sml,2);
             		$scope.qualitycheck.mildewCount = $scope.getMath(sml);
-        		}
-        		if($scope.qualitycheckInspection.mildew != null){
+        		
+        		
         			var mbl = parseFloat($scope.qualitycheckInspection.mildew);//霉变粒%
-        			mbl = $scope.checkJqos(mbl,2);
+        			//mbl = $scope.checkJqos(mbl,2);
             		$scope.qualitycheckInspection.mildew = $scope.getMath(mbl);
-        		}
-        		if($scope.qualitycheckInspection.naturally != null){
+        		
+        		
         			var zrrssl = parseFloat($scope.qualitycheckInspection.naturally);//自然热损伤粒%
             		//sml = isNaN(sml) ? 0 : sml;
-        			zrrssl = $scope.checkJqos(zrrssl,2);
+        			//zrrssl = $scope.checkJqos(zrrssl,2);
             		$scope.qualitycheckInspection.naturally = $scope.getMath(zrrssl);
-        		}
-        		if($scope.qualitycheckInspection.stoving != null){
+        		
+        		
         			var hgrssl = parseFloat($scope.qualitycheckInspection.stoving);//烘干热损伤粒%
-        			hgrssl = $scope.checkJqos(hgrssl,2);
+        			//hgrssl = $scope.checkJqos(hgrssl,2);
             		$scope.qualitycheckInspection.stoving = $scope.getMath(hgrssl);
-        		}
+        		
         		
         		if($scope.qualitycheck !== undefined && $scope.qualitycheck !== ""){
         			//杂质总量=筛下物+有机杂质+无机杂质，四舍五入，保留一位小数
-        			if(sieveResidue == null || sieveResidue == undefined){
-        				sieveResidue = 0;
-        			}
-        			if(yjzz == null || yjzz == undefined){
-        				yjzz = 0;
-        			}
-        			if(wjzz == null || wjzz == undefined){
-        				wjzz = 0;
-        			}
-        			if(sieveResidue == 0 && yjzz == 0 && wjzz == 0){
-        				$scope.qualitycheckInspection.impurityTotal = null;
-        			}else{
-        				var zzzl = ((parseFloat(sieveResidue)*100) + (parseFloat(yjzz)*100)+ (parseFloat(wjzz)*100))/100;
-            			zzzl = $scope.checkJqos(zzzl, 1);
+        			
+        			
+        				var zzzl = ((parseFloat($scope.qualitycheckInspection.sieveResidue)*100) + (parseFloat($scope.qualitycheckInspection.impurityOrganic)*100)+ 
+        						(parseFloat($scope.qualitycheckInspection.impurityInorganic)*100))/100;
+            			//zzzl = $scope.checkJqos(zzzl, 1);
             			$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
-        			}
+        			
         			
         			//zzzl.toFixed(1);
         			//$scope.qualitycheckInspection.impurityTotal = $scope.getMath1($scope.qualitycheckInspection.impurityTotal);
         			//不完善粒总量=虫蚀粒+病斑粒++破损粒+生芽粒+生霉粒
-        			if(csl == null || csl == undefined){
-        				csl = 0;
-        			}
-        			if(bbl == null || bbl == undefined){
-        				bbl = 0;
-        			}
-        			if(psl == null || psl == undefined){
-        				psl = 0;
-        			}
-        			if(syl == null || syl == undefined){
-        				syl = 0;
-        			}
-        			if(sml == null || sml == undefined){
-        				sml = 0;
-        			}
         			
-        			if(csl == 0 && bbl == 0 && psl == 0 && syl == 0 && sml == 0){
-        				bwslzl = null;
-        				$scope.qualitycheckInspection.imperfectgrainsTotal = bwslzl;
-        			}else{
-        				var bwslzl = ((parseFloat(psl)*100) + (parseFloat(csl)*100) + (parseFloat(bbl)*100) + (parseFloat(syl)*100) + (parseFloat(sml)*100))/100;
-            			bwslzl = $scope.checkJqos(bwslzl, 1);
+        			
+        				var bwslzl = ((parseFloat($scope.qualitycheckInspection.imperfectgrainsDamage)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel)*100) + 
+        						(parseFloat($scope.qualitycheckInspection.imperfectgrainsScab)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel)*100) +
+        						(parseFloat($scope.qualitycheck.mildewCount)*100))/100;
+            			//bwslzl = $scope.checkJqos(bwslzl, 1);
             			$scope.qualitycheckInspection.imperfectgrainsTotal = $scope.getMath1(bwslzl);
-        			}
+        			
         			//$scope.qualitycheckInspection.imperfectgrainsTotal = isNaN(bwslzl) ? '0.0' : $scope.getMath1(bwslzl);
         			
         		}
         	
         	
         	}else if(pz == "7107"){
-        		if($scope.qualitycheck.water != null){
+        		
         			var sf = parseFloat($scope.qualitycheck.water);//水分
-            		sf = $scope.checkJqos(sf,1);
+            		//sf = $scope.checkJqos(sf,1);
             		$scope.qualitycheck.water = $scope.getMath1(sf);
-        		}
-        		if($scope.qualitycheckInspection.avgLength != null){
+        		
+        		
         			var pjcd = parseFloat($scope.qualitycheckInspection.avgLength);//平均长度
-        			pjcd = $scope.checkJqos(pjcd,2);
-            		$scope.qualitycheckInspection.avgLength = $scope.getMath(pjcd);
-        		}
-        		if($scope.qualitycheckInspection.riceGrains != null){
+        			//pjcd = $scope.checkJqos(pjcd,1);
+            		$scope.qualitycheckInspection.avgLength = $scope.getMath1(pjcd);
+        		
+        		
         			var wzml = parseFloat($scope.qualitycheckInspection.riceGrains);//完整米粒
-        			wzml = $scope.checkJqos(wzml,2);
-            		$scope.qualitycheckInspection.riceGrains = $scope.getMath(wzml);
-        		}
-        		if($scope.qualitycheckInspection.brokenriceBig != null){
+        			//wzml = $scope.checkJqos(wzml,1);
+            		$scope.qualitycheckInspection.riceGrains = $scope.getMath1(wzml);
+        		
+        		
         			var dsm = parseFloat($scope.qualitycheckInspection.brokenriceBig);//大碎米
             		//sieveResidue = isNaN(sieveResidue) ? 0 : sieveResidue;
-        			dsm = $scope.checkJqos(dsm,2);
+        			//dsm = $scope.checkJqos(dsm,2);
             		$scope.qualitycheckInspection.brokenriceBig = $scope.getMath(dsm);
-        		}
-        		if($scope.qualitycheckInspection.brokenriceSmall != null){
+        		
+        		
         			var xsm = parseFloat($scope.qualitycheckInspection.brokenriceSmall);//小碎米
             		//csl = isNaN(csl) ? 0 : csl;
-        			xsm = $scope.checkJqos(xsm,2);
+        			//xsm = $scope.checkJqos(xsm,2);
             		$scope.qualitycheckInspection.brokenriceSmall = $scope.getMath(xsm);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsContent != null){
+        		
+        		
         			var hl = parseFloat($scope.qualitycheckInspection.imperfectgrainsContent);//含量
             		//csl = isNaN(csl) ? 0 : csl;
-        			hl = $scope.checkJqos(hl,2);
+        			//hl = $scope.checkJqos(hl,2);
             		$scope.qualitycheckInspection.imperfectgrainsContent = $scope.getMath(hl);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsImmaturegrain != null){
+        		
+        		
         			var wsl = parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain);//未熟粒
-            		wsl = $scope.checkJqos(wsl,2);
+            		//wsl = $scope.checkJqos(wsl,2);
             		$scope.qualitycheckInspection.imperfectgrainsImmaturegrain = $scope.getMath(wsl);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsInjuredkernel != null){
+        	
+        		
         			var csl = parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel);//虫蚀粒
-            		csl = $scope.checkJqos(csl,2);
+            		//csl = $scope.checkJqos(csl,2);
             		$scope.qualitycheckInspection.imperfectgrainsInjuredkernel = $scope.getMath(csl);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsScab != null){
+        		
+        		
         			var bbl = parseFloat($scope.qualitycheckInspection.imperfectgrainsScab);//病斑粒
-            		bbl = $scope.checkJqos(bbl,2);
+            		//bbl = $scope.checkJqos(bbl,2);
             		$scope.qualitycheckInspection.imperfectgrainsScab = $scope.getMath(bbl);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsBrownrice != null){
+        		
+        		
         			var cml = parseFloat($scope.qualitycheckInspection.imperfectgrainsBrownrice);//糙米粒
-        			cml = $scope.checkJqos(cml,2);
+        			//cml = $scope.checkJqos(cml,2);
             		$scope.qualitycheckInspection.imperfectgrainsBrownrice = $scope.getMath(cml);
-        		}
-        		if($scope.qualitycheck.mildewCount != null){
+        		
+        		
         			var sml = parseFloat($scope.qualitycheck.mildewCount);//生霉粒%
             		//sml = isNaN(sml) ? 0 : sml;
-            		sml = $scope.checkJqos(sml,2);
+            		//sml = $scope.checkJqos(sml,2);
             		$scope.qualitycheck.mildewCount = $scope.getMath(sml);
-        		}
-        		/*if($scope.qualitycheckInspection.machiningaccuracyEssence != null){
-        			var jn = parseFloat($scope.qualitycheckInspection.machiningaccuracyEssence);//精碾
-            		//sml = isNaN(sml) ? 0 : sml;
-        			jn = $scope.checkJqos(jn,2);
-            		$scope.qualitycheckInspection.machiningaccuracyEssence = $scope.getMath(jn);
-        		}
-        		if($scope.qualitycheckInspection.machiningaccuracySuitable != null){
-        			var sn = parseFloat($scope.qualitycheckInspection.machiningaccuracySuitable);//适碾
-            		//sml = isNaN(sml) ? 0 : sml;
-        			sn = $scope.checkJqos(sn,2);
-            		$scope.qualitycheckInspection.machiningaccuracySuitable = $scope.getMath(sn);
-        		}*/
-        		if($scope.qualitycheckInspection.yellowRice != null){
+        		
+        		
         			var hlm = parseFloat($scope.qualitycheckInspection.yellowRice);//黄粒米
-            		hlm = $scope.checkJqos(hlm, 1);
+            		//hlm = $scope.checkJqos(hlm, 1);
             		$scope.qualitycheckInspection.yellowRice = $scope.getMath1(hlm);
-        		}
-        		if($scope.qualitycheck.intermixingRate != null){
+        		
+        		
         			var hhl = parseFloat($scope.qualitycheck.intermixingRate);//互混率
-            		hhl = $scope.checkJqos(hhl, 1);
+            		//hhl = $scope.checkJqos(hhl, 1);
             		$scope.qualitycheck.intermixingRate = $scope.getMath1(hhl);
-        		}
-        		if($scope.qualitycheckInspection.impurityBranPowder != null){
+        		
+        		
         			var kf = parseFloat($scope.qualitycheckInspection.impurityBranPowder);//糠粉
-        			kf = $scope.checkJqos(kf, 2);
-            		$scope.qualitycheckInspection.impurityBranPowder = $scope.getMath1(kf);
-        		}
-        		if($scope.qualitycheckInspection.impurityOrganic != null){
+        			//kf = $scope.checkJqos(kf, 2);
+            		$scope.qualitycheckInspection.impurityBranPowder = $scope.getMath(kf);
+        		
+        		
         			var yjzz = parseFloat($scope.qualitycheckInspection.impurityOrganic);//有机杂质
-            		yjzz = $scope.checkJqos(yjzz,2);
+            		//yjzz = $scope.checkJqos(yjzz,2);
             		$scope.qualitycheckInspection.impurityOrganic = $scope.getMath(yjzz);
-        		}
-        		if($scope.qualitycheckInspection.impurityInorganic != null){
+        		
+        		
         			var wjzz = parseFloat($scope.qualitycheckInspection.impurityInorganic);//无机杂质
-            		wjzz = $scope.checkJqos(wjzz,2);
+            		//wjzz = $scope.checkJqos(wjzz,2);
             		$scope.qualitycheckInspection.impurityInorganic = $scope.getMath(wjzz);
-        		}
-        		if($scope.qualitycheckInspection.chalkiness != null){
+        		
+        		
         			var ebd = parseFloat($scope.qualitycheckInspection.chalkiness);//垩白度
-        			ebd = $scope.checkJqos(ebd,2);
-            		$scope.qualitycheckInspection.chalkiness = $scope.getMath(ebd);
-        		}
-        		if($scope.qualitycheckInspection.amylose != null){
+        			//ebd = $scope.checkJqos(ebd,1);
+            		$scope.qualitycheckInspection.chalkiness = $scope.getMath1(ebd);
+        		
+        		
         			var zldfhl = parseFloat($scope.qualitycheckInspection.amylose);//直链淀粉含量
-        			zldfhl = $scope.checkJqos(zldfhl,2);
-            		$scope.qualitycheckInspection.amylose = $scope.getMath(zldfhl);
-        		}
+        			//zldfhl = $scope.checkJqos(zldfhl,1);
+            		$scope.qualitycheckInspection.amylose = $scope.getMath1(zldfhl);
+        		
         		
         		//杂质总量=糠粉+有机杂质+无机杂质，四舍五入，保留一位小数
-    			if(kf == null || kf == undefined){
-    				kf = 0;
-    			}
-    			if(yjzz == null || yjzz == undefined){
-    				yjzz = 0;
-    			}
-    			if(wjzz == null || wjzz == undefined){
-    				wjzz = 0;
-    			}
-    			if(kf == 0 && yjzz == 0 && wjzz == 0){
-    				$scope.qualitycheckInspection.impurityTotal = null;
-    			}else{
-    				var zzzl = ((parseFloat(kf)*100) + (parseFloat(yjzz)*100)+ (parseFloat(wjzz)*100))/100;
-        			zzzl = $scope.checkJqos(zzzl, 1);
+    			
+    			
+    				var zzzl = ((parseFloat($scope.qualitycheckInspection.impurityBranPowder)*100) + (parseFloat($scope.qualitycheckInspection.impurityOrganic)*100)+
+    						(parseFloat($scope.qualitycheckInspection.impurityInorganic)*100))/100;
+        			//zzzl = $scope.checkJqos(zzzl, 1);
         			$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
-    			}
+    			
     			
     			//zzzl.toFixed(1);
     			//$scope.qualitycheckInspection.impurityTotal = $scope.getMath1($scope.qualitycheckInspection.impurityTotal);
     			//不完善粒总量=含量+未熟粒+虫蚀粒+病斑粒+糙米粒+生霉粒
-    			if(hl == null || hl == undefined){
-    				hl = 0;
-    			}
-    			if(wsl == null || wsl == undefined){
-    				wsl = 0;
-    			}
-    			if(csl == null || csl == undefined){
-    				csl = 0;
-    			}
-    			if(bbl == null || bbl == undefined){
-    				bbl = 0;
-    			}
-    			if(cml == null || cml == undefined){
-    				cml = 0;
-    			}
-    			if(sml == null || sml == undefined){
-    				sml = 0;
-    			}
     			
-    			if(hl == 0 && wsl == 0 && csl == 0 && bbl == 0 && cml == 0 && sml == 0){
-    				bwslzl = null;
-    				$scope.qualitycheckInspection.imperfectgrainsTotal = bwslzl;
-    			}else{
-    				var bwslzl = ((parseFloat(hl)*100) + (parseFloat(wsl)*100) + (parseFloat(csl)*100) + (parseFloat(bbl)*100) + (parseFloat(cml)*100) + (parseFloat(sml)*100))/100;
-        			bwslzl = $scope.checkJqos(bwslzl, 1);
+    			
+    				var bwslzl = ((parseFloat($scope.qualitycheckInspection.imperfectgrainsContent)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain)*100) +
+    						(parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsScab)*100) +
+    						(parseFloat($scope.qualitycheckInspection.imperfectgrainsBrownrice)*100) + (parseFloat($scope.qualitycheck.mildewCount)*100))/100;
+        			//bwslzl = $scope.checkJqos(bwslzl, 1);
         			$scope.qualitycheckInspection.imperfectgrainsTotal = $scope.getMath1(bwslzl);
-    			}
+    			
     			
     			
     			//碎米 = 大碎米 + 小碎米；
-    			if(dsm == null || dsm == undefined){
-    				dsm = 0;
-    			}
-    			if(xsm == null || xsm == undefined){
-    				xsm = 0;
-    			}
     			
-    			if(xsm == 0 && dsm == 0){
-    				bwslzl = null;
-    				$scope.qualitycheckInspection.brokenriceTotal = bwslzl;
-    			}else{
-    				var bwslzl = ((parseFloat(dsm)*100) + (parseFloat(xsm)*100))/100;
-        			bwslzl = $scope.checkJqos(bwslzl, 1);
-        			$scope.qualitycheckInspection.brokenriceTotal = $scope.getMath1(bwslzl);
-    			}
+    				var sm = ((parseFloat($scope.qualitycheckInspection.brokenriceBig)*100) + (parseFloat($scope.qualitycheckInspection.brokenriceSmall)*100))/100;
+        			//sm = $scope.checkJqos(sm, 1);
+        			$scope.qualitycheckInspection.brokenriceTotal = $scope.getMath1(sm);
+    			
         	}else if(pz == "7051" || pz == "7038"){
-        		if($scope.qualitycheck.water != null){
+        		
         			var sf = parseFloat($scope.qualitycheck.water);//水分
-            		sf = $scope.checkJqos(sf,1);
+            		//sf = $scope.checkJqos(sf,1);
             		$scope.qualitycheck.water = $scope.getMath1(sf);
-        		}
+        		
+        	}else if(pz == "2777"){//大豆
+        		
+        		var sf = parseFloat($scope.qualitycheck.water);//水分
+        		$scope.qualitycheck.water = $scope.getMath1(sf);
+        		
+        		var wzll = parseFloat($scope.qualitycheck.goodpart);//完整粒率
+        		$scope.qualitycheck.goodpart = $scope.getMath1(wzll);
+        		
+        		var wsll = parseFloat($scope.qualitycheckInspection.immatureGrainRate);//未熟粒率
+        		$scope.qualitycheckInspection.immatureGrainRate = $scope.getMath1(wsll);
+        		
+        		var psl = parseFloat($scope.qualitycheckInspection.crushingRate);//破碎率
+        		$scope.qualitycheckInspection.crushingRate = $scope.getMath1(psl);
+        		
+        		
+        		var yjzz = parseFloat($scope.qualitycheckInspection.impurityOrganic);//有机杂质
+        		$scope.qualitycheckInspection.impurityOrganic = $scope.getMath(yjzz);
+    		
+    			var wjzz = parseFloat($scope.qualitycheckInspection.impurityInorganic);//无机杂质
+        		$scope.qualitycheckInspection.impurityInorganic = $scope.getMath(wjzz);
+        		
+        		
+        		var zzzl = ((parseFloat(yjzz)*100) + (parseFloat(wjzz)*100))/100;
+    			$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
+        		
+    			var czfhl = parseFloat($scope.qualitycheckInspection.crudeFatContent);//粗脂肪含量（干基）
+        		$scope.qualitycheckInspection.crudeFatContent = $scope.getMath1(czfhl);
+        		
+        		
+        		var rssl = parseFloat($scope.qualitycheck.hotDamageRatio);//热损伤粒
+        		$scope.qualitycheck.hotDamageRatio = $scope.getMath(rssl);
+        		
+        		var csl = parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel);//虫蚀粒%
+        		$scope.qualitycheckInspection.imperfectgrainsInjuredkernel = $scope.getMath(csl);
+    		
+    		
+        		var bbl = parseFloat($scope.qualitycheckInspection.imperfectgrainsScab);//病斑粒
+        		$scope.qualitycheckInspection.imperfectgrainsScab = $scope.getMath(bbl);
+        		
+    			var syzdl = parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel);//生芽、涨大粒
+        		$scope.qualitycheckInspection.imperfectgrainsSproutedkernel = $scope.getMath(syzdl);
+    		
+    			var sml = parseFloat($scope.qualitycheck.mildewCount);//生霉粒%
+        		$scope.qualitycheck.mildewCount = $scope.getMath(sml);
+        		
+        		var dsl = parseFloat($scope.qualitycheckInspection.imperfectgrainsFrostbite);//冻伤粒%
+        		$scope.qualitycheckInspection.imperfectgrainsFrostbite = $scope.getMath(dsl);
+        		
+        		
+        		var ssllzl = ((parseFloat($scope.qualitycheck.hotDamageRatio)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel)*100)+
+        				(parseFloat($scope.qualitycheckInspection.imperfectgrainsScab)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel)*100) + 
+        				(parseFloat($scope.qualitycheck.mildewCount)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsFrostbite)*100))/100;
+    			$scope.qualitycheckInspection.imperfectgrainsTotal = isNaN(ssllzl) ? '0.0' : $scope.getMath1(ssllzl);
+        		
+    			var zdy = parseFloat($scope.qualitycheckInspection.inputTwo);//自定义属性
+        		$scope.qualitycheckInspection.inputTwo = $scope.getMath1(zdy);
         	}
         };
 
@@ -1512,6 +1414,7 @@ angular.module('app.storage')
         // 提交表单
         var validator = $("#qualitycheck-form").validate();
         $scope.saveData = function (checktype) {
+        	$scope.zjzl();
             var zblbId ="";
             var storeQualityId ="";
             if($scope.qualitycheck.zblb == null || $scope.qualitycheck.zblb == ""){

src/main/resources/static/app/storage/controller/qualitycheckCtrl.js

@@ -807,7 +807,7 @@ angular.module('app.storage')
         //四舍五入保留两位小数
         $scope.getMath = function(v) {
             if (isNaN(v) || v == "") {
-                v = 0.00;
+                v = "0.00";
             } else {
                 v = Math.round(v*100)/100;
                 v = v.toString();
@@ -820,10 +820,11 @@ angular.module('app.storage')
             }
             return v;
         }
+       
         //四舍五入保留一位小数
         $scope.getMath1 = function(v) {
             if (isNaN(v) || v == "") {
-                v = 0.0;
+                v = "0.0";
             } else {
                 v = Math.round(v*10)/10;
                 v = v.toString();
@@ -842,6 +843,7 @@ angular.module('app.storage')
          * v:原数据值
          * n:要保留的小数位数
          */
+        
         $scope.checkJqos = function(v, n) {
         	if (!isNaN(v) && v != "") {
         	    var pos = v.toString().indexOf(".");
@@ -895,583 +897,526 @@ angular.module('app.storage')
         	return v;
         }
 
+       
         // 计算总量
         $scope.zjzl = function() {
+
         	var pz = $scope.qualitycheck.subType;
         	if (pz=="3164") {
-        		if($scope.qualitycheck.water != null){
+        		
         			var sf = parseFloat($scope.qualitycheck.water);//水分
-            		sf = $scope.checkJqos(sf,1);
+            		//sf = $scope.checkJqos(sf,1);
             		$scope.qualitycheck.water = $scope.getMath1(sf);
-        		}
+        		
         		/*if($scope.qualitycheckInspection.unitWeight != null){
         			var rz = parseFloat($scope.qualitycheckInspection.unitWeight);//容重
             		rz = $scope.checkJqos(rz,1);
             		$scope.qualitycheckInspection.unitWeight = $scope.getMath1(rz);
         		}*/
-        		if($scope.qualitycheck.hardIndex != null){
+        		
         			var xmydzs = parseFloat($scope.qualitycheck.hardIndex);//小麦硬度指数
-            		xmydzs = $scope.checkJqos(xmydzs,1);
+            		//xmydzs = $scope.checkJqos(xmydzs,1);
             		$scope.qualitycheck.hardIndex = $scope.getMath1(xmydzs);
-        		}
-        		if($scope.qualitycheck.mineral != null){
+        		
+        		
         			var mineral = parseFloat($scope.qualitycheck.mineral);//矿物质
-            		mineral = $scope.checkJqos(mineral,2);
+            		//mineral = $scope.checkJqos(mineral,2);
             		//mineral = isNaN(mineral) ? 0.00 : mineral;
             		$scope.qualitycheck.mineral = $scope.getMath(mineral);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsScabBlackembryo != null){
+        		
+        		
         			var black = parseFloat($scope.qualitycheckInspection.imperfectgrainsScabBlackembryo);//黒胚粒
-            		black = $scope.checkJqos(black,2);
+            		//black = $scope.checkJqos(black,2);
             		//black = isNaN(black) ? 0 : black;
             		$scope.qualitycheckInspection.imperfectgrainsScabBlackembryo = $scope.getMath(black);
-        		}
-        		if($scope.qualitycheckInspection.impurityInorganic != null){
+        		
+        		
         			var inorganic = parseFloat($scope.qualitycheckInspection.impurityInorganic);//无机杂质
             		//inorganic = isNaN(inorganic) ? 0 : inorganic;
-            		inorganic = $scope.checkJqos(inorganic,2);
+            		//inorganic = $scope.checkJqos(inorganic,2);
             		$scope.qualitycheckInspection.impurityInorganic = $scope.getMath(inorganic);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsScabGibberella != null){
+        	
+        		
         			var gibberella = parseFloat($scope.qualitycheckInspection.imperfectgrainsScabGibberella);//赤霉病粒
             		//gibberella = isNaN(gibberella) ? 0 : gibberella;
-            		gibberella = $scope.checkJqos(gibberella,2);
+            		//gibberella = $scope.checkJqos(gibberella,2);
             		$scope.qualitycheckInspection.imperfectgrainsScabGibberella = $scope.getMath(gibberella);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsScabQtbl != null){
+        		
+        		
         			var qtbl = parseFloat($scope.qualitycheckInspection.imperfectgrainsScabQtbl);//其它病粒
             		//qtbl = isNaN(qtbl) ? 0 : qtbl;
-            		qtbl = $scope.checkJqos(qtbl,2);
+            		//qtbl = $scope.checkJqos(qtbl,2);
             		$scope.qualitycheckInspection.imperfectgrainsScabQtbl = $scope.getMath(qtbl);
-        		}
-        		if($scope.qualitycheckInspection.impurityOrganic != null){
+        		
+        		
         			var organic = parseFloat($scope.qualitycheckInspection.impurityOrganic);//有机杂质
             		//organic = isNaN(organic) ? 0 : organic;
-        			organic = $scope.checkJqos(organic,2);
+        			//organic = $scope.checkJqos(organic,2);
             		$scope.qualitycheckInspection.impurityOrganic = $scope.getMath(organic);
-        		}
-        		if($scope.qualitycheckInspection.sieveResidue != null){
+        		
+        		
         			var sieveResidue = parseFloat($scope.qualitycheckInspection.sieveResidue);//筛下物%
             		//sieveResidue = isNaN(sieveResidue) ? 0 : sieveResidue;
-            		sieveResidue = $scope.checkJqos(sieveResidue,2);
+            		//sieveResidue = $scope.checkJqos(sieveResidue,2);
             		$scope.qualitycheckInspection.sieveResidue = $scope.getMath(sieveResidue);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsInjuredkernel != null){
+        		
+        		
         			var csl = parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel);//虫蚀粒%
             		//csl = isNaN(csl) ? 0 : csl;
-            		csl = $scope.checkJqos(csl,2);
+            		//csl = $scope.checkJqos(csl,2);
             		$scope.qualitycheckInspection.imperfectgrainsInjuredkernel = $scope.getMath(csl);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsDamage != null){
+        		
+        		
         			var psl = parseFloat($scope.qualitycheckInspection.imperfectgrainsDamage);//破损粒%
             		//psl = isNaN(psl) ? 0 : psl;
-            		psl = $scope.checkJqos(psl,2);
+            		//psl = $scope.checkJqos(psl,2);
             		$scope.qualitycheckInspection.imperfectgrainsDamage = $scope.getMath(psl);
-        		}
-        		if($scope.qualitycheck.mildewCount != null){
+        		
+        		
         			var sml = parseFloat($scope.qualitycheck.mildewCount);//生霉粒%
             		//sml = isNaN(sml) ? 0 : sml;
-            		sml = $scope.checkJqos(sml,2);
+            		//sml = $scope.checkJqos(sml,2);
             		$scope.qualitycheck.mildewCount = $scope.getMath(sml);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsSproutedkernel != null){
+        		
+        		
         			var syl = parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel);//生芽粒%
             		//syl = isNaN(syl) ? 0 : syl;
-            		syl = $scope.checkJqos(syl,2);
+            		//syl = $scope.checkJqos(syl,2);
             		$scope.qualitycheckInspection.imperfectgrainsSproutedkernel = $scope.getMath(syl);
-        		}
         		
-        		var bblzl = ((parseFloat(black)*100) + (parseFloat(gibberella)*100) + (parseFloat(qtbl)*100))/100;//病斑粒总量%
+        		
+        		
+            		//var bblzl = ((parseFloat(black)*100) + (parseFloat(gibberella)*100) + (parseFloat(qtbl)*100))/100;//病斑粒总量%
+            		//bblzl = $scope.checkJqos(bblzl,1);
+        			//$scope.qualitycheckInspection.imperfectgrainsScabTotal = isNaN(bblzl) ? '0.0' : $scope.getMath1(bblzl);
+    			
         		//bblzl = isNaN(bblzl) ? 0 : bblzl;
         		//$scope.qualitycheckInspection.imperfectgrainsSproutedkernel = $scope.getMath(syl);
         		
-        		if($scope.qualitycheckInspection.inputTwo != null){
+        		
         			var zdy = parseFloat($scope.qualitycheckInspection.inputTwo);//自定义属性
-            		zdy = $scope.checkJqos(zdy,1);
+            		//zdy = $scope.checkJqos(zdy,1);
             		$scope.qualitycheckInspection.inputTwo = $scope.getMath1(zdy);
-        		}
+        		
         		
         		
         		
         		if($scope.qualitycheck !== undefined && $scope.qualitycheck !== ""){
         			//杂质总量
-        			if(mineral == null || mineral == undefined){
-        				mineral = 0;
-        			}
-        			if(inorganic == null || inorganic == undefined){
-        				inorganic = 0;
-        			}
-        			if(organic == null || organic == undefined){
-        				organic = 0;
-        			}
-        			if(sieveResidue == null || sieveResidue == undefined){
-        				sieveResidue = 0;
-        			}
-        			var zzzl = ((parseFloat(mineral)*100) + (parseFloat(inorganic)*100)+ (parseFloat(organic)*100)+ (parseFloat(sieveResidue)*100))/100;
-        			//$scope.qualitycheckInspection.impurityTotal = $scope.getMath($scope.qualitycheckInspection.impurityTotal);
-        			zzzl = $scope.checkJqos(zzzl,1);
-        			$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
+        			
+        			
+        				var zzzl = ((parseFloat($scope.qualitycheck.mineral)*100) + (parseFloat($scope.qualitycheckInspection.impurityOrganic)*100)+ 
+        						(parseFloat($scope.qualitycheckInspection.impurityInorganic)*100)+ (parseFloat($scope.qualitycheckInspection.sieveResidue)*100))/100;
+            			//$scope.qualitycheckInspection.impurityTotal = $scope.getMath($scope.qualitycheckInspection.impurityTotal);
+            			//zzzl = $scope.checkJqos(zzzl,1);
+            			$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
+        			
+        			
         			//病斑粒总量
-        			if(black == null || black == undefined){
-        				black = 0;
-        			}
-        			if(gibberella == null || gibberella == undefined){
-        				gibberella = 0;
-        			}
-        			if(qtbl == null || qtbl == undefined){
-        				qtbl = 0;
-        			}
-        			var bblzl = ((parseFloat(black)*100) + (parseFloat(gibberella)*100) + (parseFloat(qtbl)*100))/100;
-        			//$scope.qualitycheckInspection.imperfectgrainsScabTotal = $scope.getMath($scope.qualitycheckInspection.imperfectgrainsScabTotal);
-        			//bblzl = $scope.checkJqos(bblzl,1);
-        			$scope.qualitycheckInspection.imperfectgrainsScabTotal = isNaN(bblzl) ? '0.0' : $scope.getMath1(bblzl);
+        			
+        				var bblzl = ((parseFloat($scope.qualitycheckInspection.imperfectgrainsScabBlackembryo)*100) + 
+        						(parseFloat($scope.qualitycheckInspection.imperfectgrainsScabGibberella)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsScabQtbl)*100))/100;
+            			//$scope.qualitycheckInspection.imperfectgrainsScabTotal = $scope.getMath($scope.qualitycheckInspection.imperfectgrainsScabTotal);
+            			//bblzl = $scope.checkJqos(bblzl,1);
+            			$scope.qualitycheckInspection.imperfectgrainsScabTotal = isNaN(bblzl) ? '0.0' : $scope.getMath1(bblzl);
+        			
+        			
         			//不完善粒总量
-        			if(csl == null || csl == undefined){
-        				csl = 0;
-        			}
-        			if(psl == null || psl == undefined){
-        				psl = 0;
-        			}
-        			if(sml == null || sml == undefined){
-        				sml = 0;
-        			}
-        			if(bblzl == null || bblzl == undefined){
-        				bblzl = 0;
-        			}
-        			if(syl == null || syl == undefined){
-        				syl = 0;
-        			}
-        			var bwslzl = ((parseFloat(csl)*100) + (parseFloat(psl)*100)+(parseFloat(sml)*100) + (parseFloat(bblzl)*100) + (parseFloat(syl)*100))/100;
-        			//$scope.qualitycheckInspection.imperfectgrainsTotal = $scope.getMath($scope.qualitycheckInspection.imperfectgrainsTotal);
-        			bwslzl = $scope.checkJqos(bwslzl,1);
-        			$scope.qualitycheckInspection.imperfectgrainsTotal = isNaN(bwslzl) ? '0.0' : $scope.getMath1(bwslzl);
+        			
+        				var bwslzl = ((parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsDamage)*100)
+        						+(parseFloat($scope.qualitycheck.mildewCount)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsScabTotal)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel)*100))/100;
+            			//$scope.qualitycheckInspection.imperfectgrainsTotal = $scope.getMath($scope.qualitycheckInspection.imperfectgrainsTotal);
+            			//bwslzl = $scope.checkJqos(bwslzl,1);
+            			$scope.qualitycheckInspection.imperfectgrainsTotal = isNaN(bwslzl) ? '0.0' : $scope.getMath1(bwslzl);
+        			
+        			
         		}
         	} else if (pz=="3166") {
-        		if($scope.qualitycheck.water != null){
+        		
         			var sf = parseFloat($scope.qualitycheck.water);//水分
-            		sf = $scope.checkJqos(sf,1);
+            		//sf = $scope.checkJqos(sf,1);
             		$scope.qualitycheck.water = $scope.getMath1(sf);
-        		}
-        		if($scope.qualitycheck.huskedRation != null){
+
+            		
         			var ccl = parseFloat($scope.qualitycheck.huskedRation);//出糙率
-            		ccl = $scope.checkJqos(ccl,1);
+            		//ccl = $scope.checkJqos(ccl,1);
             		$scope.qualitycheck.huskedRation = $scope.getMath1(ccl);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsImmaturegrain != null){
+        		
+        		
         			var wsl = parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain);//未熟粒
-            		wsl = $scope.checkJqos(wsl,2);
+            		//wsl = $scope.checkJqos(wsl,2);
             		$scope.qualitycheckInspection.imperfectgrainsImmaturegrain = $scope.getMath(wsl);
-        		}
-        		if($scope.qualitycheck.fullGoodRation != null){
+        		
+        		
         			var zjml = parseFloat($scope.qualitycheck.fullGoodRation);//整精米率
-            		zjml = $scope.checkJqos(zjml,1);
+            		//zjml = $scope.checkJqos(zjml,1);
             		$scope.qualitycheck.fullGoodRation = $scope.getMath1(zjml);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsInjuredkernel != null){
+        		
+        		
         			var csl = parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel);//虫蚀粒
-            		csl = $scope.checkJqos(csl,2);
+            		//csl = $scope.checkJqos(csl,2);
             		$scope.qualitycheckInspection.imperfectgrainsInjuredkernel = $scope.getMath(csl);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsScab != null){
+        		
+        		
         			var bbl = parseFloat($scope.qualitycheckInspection.imperfectgrainsScab);//病斑粒
-            		bbl = $scope.checkJqos(bbl,2);
+            		//bbl = $scope.checkJqos(bbl,2);
             		$scope.qualitycheckInspection.imperfectgrainsScab = $scope.getMath(bbl);
-        		}
-        		if($scope.qualitycheckInspection.sieveResidue != null){
+        		
+        		
         			var sieveResidue = parseFloat($scope.qualitycheckInspection.sieveResidue);//筛下物%
-            		sieveResidue = $scope.checkJqos(sieveResidue,2);
+            		//sieveResidue = $scope.checkJqos(sieveResidue,2);
             		$scope.qualitycheckInspection.sieveResidue = $scope.getMath(sieveResidue);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsSproutedkernel != null ){
+        		
+        		
         			var syl = parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel);//生芽粒
-            		syl = $scope.checkJqos(syl,2);
+            		//syl = $scope.checkJqos(syl,2);
             		$scope.qualitycheckInspection.imperfectgrainsSproutedkernel = $scope.getMath(syl);
-        		}
-        		if($scope.qualitycheckInspection.impurityOrganic != null){
+        		
+        		
         			var yjzz = parseFloat($scope.qualitycheckInspection.impurityOrganic);//有机杂质
-            		yjzz = $scope.checkJqos(yjzz,2);
+            		//yjzz = $scope.checkJqos(yjzz,2);
             		$scope.qualitycheckInspection.impurityOrganic = $scope.getMath(yjzz);
-        		}
-        		if($scope.qualitycheck.mildewCount != null){
+        		
+        		
         			var sml = parseFloat($scope.qualitycheck.mildewCount);//生霉粒
-            		sml = $scope.checkJqos(sml,2);
+            		//sml = $scope.checkJqos(sml,2);
             		$scope.qualitycheck.mildewCount = $scope.getMath(sml);
-        		}
-        		if($scope.qualitycheckInspection.impurityInorganic != null){
+        		
+        		
         			var wjzz = parseFloat($scope.qualitycheckInspection.impurityInorganic);//无机杂质
-            		wjzz = $scope.checkJqos(wjzz,2);
+            		//wjzz = $scope.checkJqos(wjzz,2);
             		$scope.qualitycheckInspection.impurityInorganic = $scope.getMath(wjzz);
-        		}
-        		if($scope.qualitycheck.outHuskedRation != null){
+        		
+        		
         			var gwcm = parseFloat($scope.qualitycheck.outHuskedRation);//谷外糙米
-            		gwcm = $scope.checkJqos(gwcm, 1);
+            		//gwcm = $scope.checkJqos(gwcm, 1);
             		$scope.qualitycheck.outHuskedRation = $scope.getMath1(gwcm);
-        		}
-        		if($scope.qualitycheckInspection.riceYield != null){
+        		
+        		
         			var cml = parseFloat($scope.qualitycheckInspection.riceYield);//出米率
-            		cml = $scope.checkJqos(cml, 1);
+            		//cml = $scope.checkJqos(cml, 1);
             		$scope.qualitycheckInspection.riceYield = $scope.getMath1(cml);
-        		}
-        		if($scope.qualitycheckInspection.yellowRice != null){
+        		
+        		
         			var hlm = parseFloat($scope.qualitycheckInspection.yellowRice);//黄粒米
-            		hlm = $scope.checkJqos(hlm, 1);
+            		//hlm = $scope.checkJqos(hlm, 1);
             		$scope.qualitycheckInspection.yellowRice = $scope.getMath1(hlm);
-        		}
-        		if($scope.qualitycheck.intermixingRate != null){
+        		
+        		
         			var hhl = parseFloat($scope.qualitycheck.intermixingRate);//互混率
-            		hhl = $scope.checkJqos(hhl, 1);
+            		//hhl = $scope.checkJqos(hhl, 1);
             		$scope.qualitycheck.intermixingRate = $scope.getMath1(hhl);
-        		}
-        		if($scope.qualitycheckInspection.inputTwo != null){
+        		
+        		
         			var zdy = parseFloat($scope.qualitycheckInspection.inputTwo);//自定义属性
-            		zdy = $scope.checkJqos(zdy, 1);
+            		//zdy = $scope.checkJqos(zdy, 1);
             		$scope.qualitycheckInspection.inputTwo = $scope.getMath1(zdy);
-        		}
-        		
         		
         		
         		if($scope.qualitycheck !== undefined && $scope.qualitycheck !== ""){
         			//杂质总量=筛下物+有机杂质+无机杂质，四舍五入，保留一位小数
-        			if(sieveResidue == null || sieveResidue == undefined){
-        				sieveResidue = 0;
-        			}
-        			if(yjzz == null || yjzz == undefined){
-        				yjzz = 0;
-        			}
-        			if(wjzz == null || wjzz == undefined){
-        				wjzz = 0;
-        			}
         			
-        			var zzzl = ((parseFloat(sieveResidue)*100) + (parseFloat(yjzz)*100)+ (parseFloat(wjzz)*100))/100;
-        			zzzl = $scope.checkJqos(zzzl, 1);
-        			$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
+        				var zzzl = ((parseFloat($scope.qualitycheckInspection.sieveResidue)*100) + (parseFloat($scope.qualitycheckInspection.impurityOrganic)*100)+ (parseFloat($scope.qualitycheckInspection.impurityInorganic)*100))/100;
+            			//zzzl = $scope.checkJqos(zzzl, 1);
+            			$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
+        			
+        			
         			//zzzl.toFixed(1);
         			//$scope.qualitycheckInspection.impurityTotal = $scope.getMath1($scope.qualitycheckInspection.impurityTotal);
         			//不完善粒总量=未熟粒+虫蚀粒+病斑粒+生芽粒+生霉粒
-        			if(wsl == null || wsl == undefined){
-        				wsl = 0;
-        			}
-        			if(csl == null || csl == undefined){
-        				csl = 0;
-        			}
-        			if(bbl == null || bbl == undefined){
-        				bbl = 0;
-        			}
-        			if(syl == null || syl == undefined){
-        				syl = 0;
-        			}
-        			if(sml == null || sml == undefined){
-        				sml = 0;
-        			}
-        			var bwslzl = ((parseFloat(wsl)*100) + (parseFloat(csl)*100) + (parseFloat(bbl)*100) + (parseFloat(syl)*100) + (parseFloat(sml)*100))/100;
-        			bwslzl = $scope.checkJqos(bwslzl, 1);
-        			$scope.qualitycheckInspection.imperfectgrainsTotal = isNaN(bwslzl) ? '0.0' : $scope.getMath1(bwslzl);
+        			
+        			
+        			
+        				var bwslzl = ((parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel)*100) + 
+        						(parseFloat($scope.qualitycheckInspection.imperfectgrainsScab)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel)*100) + (parseFloat($scope.qualitycheck.mildewCount)*100))/100;
+            			//bwslzl = $scope.checkJqos(bwslzl, 1);
+            			$scope.qualitycheckInspection.imperfectgrainsTotal = isNaN(bwslzl) ? '0.0' : $scope.getMath1(bwslzl);
+        			
+        			
         		}
         	}else if(pz=="3165"){
 
-
-        		if($scope.qualitycheck.water != null){
+        		
         			var sf = parseFloat($scope.qualitycheck.water);//水分
-            		sf = $scope.checkJqos(sf,1);
+            		//sf = $scope.checkJqos(sf,1);
             		$scope.qualitycheck.water = $scope.getMath1(sf);
-        		}
-        		if($scope.qualitycheckInspection.impurityOrganic != null){
+        		
+        		
         			var yjzz = parseFloat($scope.qualitycheckInspection.impurityOrganic);//有机杂质
-        			yjzz = $scope.checkJqos(yjzz,2);
+        			//yjzz = $scope.checkJqos(yjzz,2);
             		$scope.qualitycheckInspection.impurityOrganic = $scope.getMath(yjzz);
-        		}
-        		if($scope.qualitycheckInspection.impurityInorganic != null){
+        		
+        		
         			var wjzz = parseFloat($scope.qualitycheckInspection.impurityInorganic);//无机杂质
-            		wjzz = $scope.checkJqos(wjzz,2);
+            		//wjzz = $scope.checkJqos(wjzz,2);
             		$scope.qualitycheckInspection.impurityInorganic = $scope.getMath(wjzz);
-        		}
-        		if($scope.qualitycheckInspection.sieveResidue != null){
+        		
+        		
         			var sieveResidue = parseFloat($scope.qualitycheckInspection.sieveResidue);//筛下物%
             		//sieveResidue = isNaN(sieveResidue) ? 0 : sieveResidue;
-            		sieveResidue = $scope.checkJqos(sieveResidue,2);
+            		//sieveResidue = $scope.checkJqos(sieveResidue,2);
             		$scope.qualitycheckInspection.sieveResidue = $scope.getMath(sieveResidue);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsInjuredkernel != null){
+        		
+        		
         			var csl = parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel);//虫蚀粒%
             		//csl = isNaN(csl) ? 0 : csl;
-            		csl = $scope.checkJqos(csl,2);
+            		//csl = $scope.checkJqos(csl,2);
             		$scope.qualitycheckInspection.imperfectgrainsInjuredkernel = $scope.getMath(csl);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsScab != null){
+        		
+        		
         			var bbl = parseFloat($scope.qualitycheckInspection.imperfectgrainsScab);//病斑粒
-            		bbl = $scope.checkJqos(bbl,2);
+            		//bbl = $scope.checkJqos(bbl,2);
             		$scope.qualitycheckInspection.imperfectgrainsScab = $scope.getMath(bbl);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsDamage != null){
+        		
+        		
         			var psl = parseFloat($scope.qualitycheckInspection.imperfectgrainsDamage);//破损粒%
             		//psl = isNaN(psl) ? 0 : psl;
-            		psl = $scope.checkJqos(psl,2);
+            		//psl = $scope.checkJqos(psl,2);
             		$scope.qualitycheckInspection.imperfectgrainsDamage = $scope.getMath(psl);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsSproutedkernel != null){
+        		
+        		
         			var syl = parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel);//生芽粒%
             		//syl = isNaN(syl) ? 0 : syl;
-            		syl = $scope.checkJqos(syl,2);
+            		//syl = $scope.checkJqos(syl,2);
             		$scope.qualitycheckInspection.imperfectgrainsSproutedkernel = $scope.getMath(syl);
-        		}
-        		if($scope.qualitycheck.mildewCount != null){
+        		
+        		
         			var sml = parseFloat($scope.qualitycheck.mildewCount);//生霉粒%
             		//sml = isNaN(sml) ? 0 : sml;
-            		sml = $scope.checkJqos(sml,2);
+            		//sml = $scope.checkJqos(sml,2);
             		$scope.qualitycheck.mildewCount = $scope.getMath(sml);
-        		}
-        		if($scope.qualitycheckInspection.mildew != null){
+        		
+        		
         			var mbl = parseFloat($scope.qualitycheckInspection.mildew);//霉变粒%
-        			mbl = $scope.checkJqos(mbl,2);
+        			//mbl = $scope.checkJqos(mbl,2);
             		$scope.qualitycheckInspection.mildew = $scope.getMath(mbl);
-        		}
-        		if($scope.qualitycheckInspection.naturally != null){
+        		
+        		
         			var zrrssl = parseFloat($scope.qualitycheckInspection.naturally);//自然热损伤粒%
             		//sml = isNaN(sml) ? 0 : sml;
-        			zrrssl = $scope.checkJqos(zrrssl,2);
+        			//zrrssl = $scope.checkJqos(zrrssl,2);
             		$scope.qualitycheckInspection.naturally = $scope.getMath(zrrssl);
-        		}
-        		if($scope.qualitycheckInspection.stoving != null){
+        		
+        		
         			var hgrssl = parseFloat($scope.qualitycheckInspection.stoving);//烘干热损伤粒%
-        			hgrssl = $scope.checkJqos(hgrssl,2);
+        			//hgrssl = $scope.checkJqos(hgrssl,2);
             		$scope.qualitycheckInspection.stoving = $scope.getMath(hgrssl);
-        		}
+        		
         		
         		if($scope.qualitycheck !== undefined && $scope.qualitycheck !== ""){
         			//杂质总量=筛下物+有机杂质+无机杂质，四舍五入，保留一位小数
-        			if(sieveResidue == null || sieveResidue == undefined){
-        				sieveResidue = 0;
-        			}
-        			if(yjzz == null || yjzz == undefined){
-        				yjzz = 0;
-        			}
-        			if(wjzz == null || wjzz == undefined){
-        				wjzz = 0;
-        			}
-        			if(sieveResidue == 0 && yjzz == 0 && wjzz == 0){
-        				$scope.qualitycheckInspection.impurityTotal = null;
-        			}else{
-        				var zzzl = ((parseFloat(sieveResidue)*100) + (parseFloat(yjzz)*100)+ (parseFloat(wjzz)*100))/100;
-            			zzzl = $scope.checkJqos(zzzl, 1);
+        			
+        			
+        				var zzzl = ((parseFloat($scope.qualitycheckInspection.sieveResidue)*100) + (parseFloat($scope.qualitycheckInspection.impurityOrganic)*100)+ 
+        						(parseFloat($scope.qualitycheckInspection.impurityInorganic)*100))/100;
+            			//zzzl = $scope.checkJqos(zzzl, 1);
             			$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
-        			}
+        			
         			
         			//zzzl.toFixed(1);
         			//$scope.qualitycheckInspection.impurityTotal = $scope.getMath1($scope.qualitycheckInspection.impurityTotal);
         			//不完善粒总量=虫蚀粒+病斑粒++破损粒+生芽粒+生霉粒
-        			if(csl == null || csl == undefined){
-        				csl = 0;
-        			}
-        			if(bbl == null || bbl == undefined){
-        				bbl = 0;
-        			}
-        			if(psl == null || psl == undefined){
-        				psl = 0;
-        			}
-        			if(syl == null || syl == undefined){
-        				syl = 0;
-        			}
-        			if(sml == null || sml == undefined){
-        				sml = 0;
-        			}
         			
-        			if(csl == 0 && bbl == 0 && psl == 0 && syl == 0 && sml == 0){
-        				bwslzl = null;
-        				$scope.qualitycheckInspection.imperfectgrainsTotal = bwslzl;
-        			}else{
-        				var bwslzl = ((parseFloat(psl)*100) + (parseFloat(csl)*100) + (parseFloat(bbl)*100) + (parseFloat(syl)*100) + (parseFloat(sml)*100))/100;
-            			bwslzl = $scope.checkJqos(bwslzl, 1);
+        			
+        				var bwslzl = ((parseFloat($scope.qualitycheckInspection.imperfectgrainsDamage)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel)*100) + 
+        						(parseFloat($scope.qualitycheckInspection.imperfectgrainsScab)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel)*100) +
+        						(parseFloat($scope.qualitycheck.mildewCount)*100))/100;
+            			//bwslzl = $scope.checkJqos(bwslzl, 1);
             			$scope.qualitycheckInspection.imperfectgrainsTotal = $scope.getMath1(bwslzl);
-        			}
+        			
         			//$scope.qualitycheckInspection.imperfectgrainsTotal = isNaN(bwslzl) ? '0.0' : $scope.getMath1(bwslzl);
         			
         		}
         	
         	
-        	
         	}else if(pz == "7107"){
-
-        		if($scope.qualitycheck.water != null){
+        		
         			var sf = parseFloat($scope.qualitycheck.water);//水分
-            		sf = $scope.checkJqos(sf,1);
+            		//sf = $scope.checkJqos(sf,1);
             		$scope.qualitycheck.water = $scope.getMath1(sf);
-        		}
-        		if($scope.qualitycheckInspection.avgLength != null){
+        		
+        		
         			var pjcd = parseFloat($scope.qualitycheckInspection.avgLength);//平均长度
-        			pjcd = $scope.checkJqos(pjcd,2);
-            		$scope.qualitycheckInspection.avgLength = $scope.getMath(pjcd);
-        		}
-        		if($scope.qualitycheckInspection.riceGrains != null){
+        			//pjcd = $scope.checkJqos(pjcd,1);
+            		$scope.qualitycheckInspection.avgLength = $scope.getMath1(pjcd);
+        		
+        		
         			var wzml = parseFloat($scope.qualitycheckInspection.riceGrains);//完整米粒
-        			wzml = $scope.checkJqos(wzml,2);
-            		$scope.qualitycheckInspection.riceGrains = $scope.getMath(wzml);
-        		}
-        		if($scope.qualitycheckInspection.brokenriceBig != null){
+        			//wzml = $scope.checkJqos(wzml,1);
+            		$scope.qualitycheckInspection.riceGrains = $scope.getMath1(wzml);
+        		
+        		
         			var dsm = parseFloat($scope.qualitycheckInspection.brokenriceBig);//大碎米
             		//sieveResidue = isNaN(sieveResidue) ? 0 : sieveResidue;
-        			dsm = $scope.checkJqos(dsm,2);
+        			//dsm = $scope.checkJqos(dsm,2);
             		$scope.qualitycheckInspection.brokenriceBig = $scope.getMath(dsm);
-        		}
-        		if($scope.qualitycheckInspection.brokenriceSmall != null){
+        		
+        		
         			var xsm = parseFloat($scope.qualitycheckInspection.brokenriceSmall);//小碎米
             		//csl = isNaN(csl) ? 0 : csl;
-        			xsm = $scope.checkJqos(xsm,2);
+        			//xsm = $scope.checkJqos(xsm,2);
             		$scope.qualitycheckInspection.brokenriceSmall = $scope.getMath(xsm);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsContent != null){
+        		
+        		
         			var hl = parseFloat($scope.qualitycheckInspection.imperfectgrainsContent);//含量
             		//csl = isNaN(csl) ? 0 : csl;
-        			hl = $scope.checkJqos(hl,2);
+        			//hl = $scope.checkJqos(hl,2);
             		$scope.qualitycheckInspection.imperfectgrainsContent = $scope.getMath(hl);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsImmaturegrain != null){
+        		
+        		
         			var wsl = parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain);//未熟粒
-            		wsl = $scope.checkJqos(wsl,2);
+            		//wsl = $scope.checkJqos(wsl,2);
             		$scope.qualitycheckInspection.imperfectgrainsImmaturegrain = $scope.getMath(wsl);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsInjuredkernel != null){
+        	
+        		
         			var csl = parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel);//虫蚀粒
-            		csl = $scope.checkJqos(csl,2);
+            		//csl = $scope.checkJqos(csl,2);
             		$scope.qualitycheckInspection.imperfectgrainsInjuredkernel = $scope.getMath(csl);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsScab != null){
+        		
+        		
         			var bbl = parseFloat($scope.qualitycheckInspection.imperfectgrainsScab);//病斑粒
-            		bbl = $scope.checkJqos(bbl,2);
+            		//bbl = $scope.checkJqos(bbl,2);
             		$scope.qualitycheckInspection.imperfectgrainsScab = $scope.getMath(bbl);
-        		}
-        		if($scope.qualitycheckInspection.imperfectgrainsBrownrice != null){
+        		
+        		
         			var cml = parseFloat($scope.qualitycheckInspection.imperfectgrainsBrownrice);//糙米粒
-        			cml = $scope.checkJqos(cml,2);
+        			//cml = $scope.checkJqos(cml,2);
             		$scope.qualitycheckInspection.imperfectgrainsBrownrice = $scope.getMath(cml);
-        		}
-        		if($scope.qualitycheck.mildewCount != null){
+        		
+        		
         			var sml = parseFloat($scope.qualitycheck.mildewCount);//生霉粒%
             		//sml = isNaN(sml) ? 0 : sml;
-            		sml = $scope.checkJqos(sml,2);
+            		//sml = $scope.checkJqos(sml,2);
             		$scope.qualitycheck.mildewCount = $scope.getMath(sml);
-        		}
-        		/*if($scope.qualitycheckInspection.machiningaccuracyEssence != null){
-        			var jn = parseFloat($scope.qualitycheckInspection.machiningaccuracyEssence);//精碾
-            		//sml = isNaN(sml) ? 0 : sml;
-        			jn = $scope.checkJqos(jn,2);
-            		$scope.qualitycheckInspection.machiningaccuracyEssence = $scope.getMath(jn);
-        		}
-        		if($scope.qualitycheckInspection.machiningaccuracySuitable != null){
-        			var sn = parseFloat($scope.qualitycheckInspection.machiningaccuracySuitable);//适碾
-            		//sml = isNaN(sml) ? 0 : sml;
-        			sn = $scope.checkJqos(sn,2);
-            		$scope.qualitycheckInspection.machiningaccuracySuitable = $scope.getMath(sn);
-        		}*/
-        		if($scope.qualitycheckInspection.yellowRice != null){
+        		
+        		
         			var hlm = parseFloat($scope.qualitycheckInspection.yellowRice);//黄粒米
-            		hlm = $scope.checkJqos(hlm, 1);
+            		//hlm = $scope.checkJqos(hlm, 1);
             		$scope.qualitycheckInspection.yellowRice = $scope.getMath1(hlm);
-        		}
-        		if($scope.qualitycheck.intermixingRate != null){
+        		
+        		
         			var hhl = parseFloat($scope.qualitycheck.intermixingRate);//互混率
-            		hhl = $scope.checkJqos(hhl, 1);
+            		//hhl = $scope.checkJqos(hhl, 1);
             		$scope.qualitycheck.intermixingRate = $scope.getMath1(hhl);
-        		}
-        		if($scope.qualitycheckInspection.impurityBranPowder != null){
+        		
+        		
         			var kf = parseFloat($scope.qualitycheckInspection.impurityBranPowder);//糠粉
-        			kf = $scope.checkJqos(kf, 2);
-            		$scope.qualitycheckInspection.impurityBranPowder = $scope.getMath1(kf);
-        		}
-        		if($scope.qualitycheckInspection.impurityOrganic != null){
+        			//kf = $scope.checkJqos(kf, 2);
+            		$scope.qualitycheckInspection.impurityBranPowder = $scope.getMath(kf);
+        		
+        		
         			var yjzz = parseFloat($scope.qualitycheckInspection.impurityOrganic);//有机杂质
-            		yjzz = $scope.checkJqos(yjzz,2);
+            		//yjzz = $scope.checkJqos(yjzz,2);
             		$scope.qualitycheckInspection.impurityOrganic = $scope.getMath(yjzz);
-        		}
-        		if($scope.qualitycheckInspection.impurityInorganic != null){
+        		
+        		
         			var wjzz = parseFloat($scope.qualitycheckInspection.impurityInorganic);//无机杂质
-            		wjzz = $scope.checkJqos(wjzz,2);
+            		//wjzz = $scope.checkJqos(wjzz,2);
             		$scope.qualitycheckInspection.impurityInorganic = $scope.getMath(wjzz);
-        		}
-        		if($scope.qualitycheckInspection.chalkiness != null){
+        		
+        		
         			var ebd = parseFloat($scope.qualitycheckInspection.chalkiness);//垩白度
-        			ebd = $scope.checkJqos(ebd,2);
-            		$scope.qualitycheckInspection.chalkiness = $scope.getMath(ebd);
-        		}
-        		if($scope.qualitycheckInspection.amylose != null){
+        			//ebd = $scope.checkJqos(ebd,1);
+            		$scope.qualitycheckInspection.chalkiness = $scope.getMath1(ebd);
+        		
+        		
         			var zldfhl = parseFloat($scope.qualitycheckInspection.amylose);//直链淀粉含量
-        			zldfhl = $scope.checkJqos(zldfhl,2);
-            		$scope.qualitycheckInspection.amylose = $scope.getMath(zldfhl);
-        		}
+        			//zldfhl = $scope.checkJqos(zldfhl,1);
+            		$scope.qualitycheckInspection.amylose = $scope.getMath1(zldfhl);
+        		
         		
         		//杂质总量=糠粉+有机杂质+无机杂质，四舍五入，保留一位小数
-    			if(kf == null || kf == undefined){
-    				kf = 0;
-    			}
-    			if(yjzz == null || yjzz == undefined){
-    				yjzz = 0;
-    			}
-    			if(wjzz == null || wjzz == undefined){
-    				wjzz = 0;
-    			}
-    			if(kf == 0 && yjzz == 0 && wjzz == 0){
-    				$scope.qualitycheckInspection.impurityTotal = null;
-    			}else{
-    				var zzzl = ((parseFloat(kf)*100) + (parseFloat(yjzz)*100)+ (parseFloat(wjzz)*100))/100;
-        			zzzl = $scope.checkJqos(zzzl, 1);
+    			
+    			
+    				var zzzl = ((parseFloat($scope.qualitycheckInspection.impurityBranPowder)*100) + (parseFloat($scope.qualitycheckInspection.impurityOrganic)*100)+
+    						(parseFloat($scope.qualitycheckInspection.impurityInorganic)*100))/100;
+        			//zzzl = $scope.checkJqos(zzzl, 1);
         			$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
-    			}
+    			
     			
     			//zzzl.toFixed(1);
     			//$scope.qualitycheckInspection.impurityTotal = $scope.getMath1($scope.qualitycheckInspection.impurityTotal);
     			//不完善粒总量=含量+未熟粒+虫蚀粒+病斑粒+糙米粒+生霉粒
-    			if(hl == null || hl == undefined){
-    				hl = 0;
-    			}
-    			if(wsl == null || wsl == undefined){
-    				wsl = 0;
-    			}
-    			if(csl == null || csl == undefined){
-    				csl = 0;
-    			}
-    			if(bbl == null || bbl == undefined){
-    				bbl = 0;
-    			}
-    			if(cml == null || cml == undefined){
-    				cml = 0;
-    			}
-    			if(sml == null || sml == undefined){
-    				sml = 0;
-    			}
     			
-    			if(hl == 0 && wsl == 0 && csl == 0 && bbl == 0 && cml == 0 && sml == 0){
-    				bwslzl = null;
-    				$scope.qualitycheckInspection.imperfectgrainsTotal = bwslzl;
-    			}else{
-    				var bwslzl = ((parseFloat(hl)*100) + (parseFloat(wsl)*100) + (parseFloat(csl)*100) + (parseFloat(bbl)*100) + (parseFloat(cml)*100) + (parseFloat(sml)*100))/100;
-        			bwslzl = $scope.checkJqos(bwslzl, 1);
+    			
+    				var bwslzl = ((parseFloat($scope.qualitycheckInspection.imperfectgrainsContent)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain)*100) +
+    						(parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsScab)*100) +
+    						(parseFloat($scope.qualitycheckInspection.imperfectgrainsBrownrice)*100) + (parseFloat($scope.qualitycheck.mildewCount)*100))/100;
+        			//bwslzl = $scope.checkJqos(bwslzl, 1);
         			$scope.qualitycheckInspection.imperfectgrainsTotal = $scope.getMath1(bwslzl);
-    			}
+    			
     			
     			
     			//碎米 = 大碎米 + 小碎米；
-    			if(dsm == null || dsm == undefined){
-    				dsm = 0;
-    			}
-    			if(xsm == null || xsm == undefined){
-    				xsm = 0;
-    			}
     			
-    			if(xsm == 0 && dsm == 0){
-    				bwslzl = null;
-    				$scope.qualitycheckInspection.brokenriceTotal = bwslzl;
-    			}else{
-    				var bwslzl = ((parseFloat(dsm)*100) + (parseFloat(xsm)*100))/100;
-        			bwslzl = $scope.checkJqos(bwslzl, 1);
-        			$scope.qualitycheckInspection.brokenriceTotal = $scope.getMath1(bwslzl);
-    			}
-        	
+    				var sm = ((parseFloat($scope.qualitycheckInspection.brokenriceBig)*100) + (parseFloat($scope.qualitycheckInspection.brokenriceSmall)*100))/100;
+        			//sm = $scope.checkJqos(sm, 1);
+        			$scope.qualitycheckInspection.brokenriceTotal = $scope.getMath1(sm);
+    			
         	}else if(pz == "7051" || pz == "7038"){
-        		if($scope.qualitycheck.water != null){
+        		
         			var sf = parseFloat($scope.qualitycheck.water);//水分
-            		sf = $scope.checkJqos(sf,1);
+            		//sf = $scope.checkJqos(sf,1);
             		$scope.qualitycheck.water = $scope.getMath1(sf);
-        		}
+        		
+        	}else if(pz == "2777"){//大豆
+        		
+        		var sf = parseFloat($scope.qualitycheck.water);//水分
+        		$scope.qualitycheck.water = $scope.getMath1(sf);
+        		
+        		var wzll = parseFloat($scope.qualitycheck.goodpart);//完整粒率
+        		$scope.qualitycheck.goodpart = $scope.getMath1(wzll);
+        		
+        		var wsll = parseFloat($scope.qualitycheckInspection.immatureGrainRate);//未熟粒率
+        		$scope.qualitycheckInspection.immatureGrainRate = $scope.getMath1(wsll);
+        		
+        		var psl = parseFloat($scope.qualitycheckInspection.crushingRate);//破碎率
+        		$scope.qualitycheckInspection.crushingRate = $scope.getMath1(psl);
+        		
+        		
+        		var yjzz = parseFloat($scope.qualitycheckInspection.impurityOrganic);//有机杂质
+        		$scope.qualitycheckInspection.impurityOrganic = $scope.getMath(yjzz);
+    		
+    			var wjzz = parseFloat($scope.qualitycheckInspection.impurityInorganic);//无机杂质
+        		$scope.qualitycheckInspection.impurityInorganic = $scope.getMath(wjzz);
+        		
+        		
+        		var zzzl = ((parseFloat(yjzz)*100) + (parseFloat(wjzz)*100))/100;
+    			$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
+        		
+    			var czfhl = parseFloat($scope.qualitycheckInspection.crudeFatContent);//粗脂肪含量（干基）
+        		$scope.qualitycheckInspection.crudeFatContent = $scope.getMath1(czfhl);
+        		
+        		
+        		var rssl = parseFloat($scope.qualitycheck.hotDamageRatio);//热损伤粒
+        		$scope.qualitycheck.hotDamageRatio = $scope.getMath(rssl);
+        		
+        		var csl = parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel);//虫蚀粒%
+        		$scope.qualitycheckInspection.imperfectgrainsInjuredkernel = $scope.getMath(csl);
+    		
+    		
+        		var bbl = parseFloat($scope.qualitycheckInspection.imperfectgrainsScab);//病斑粒
+        		$scope.qualitycheckInspection.imperfectgrainsScab = $scope.getMath(bbl);
+        		
+    			var syzdl = parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel);//生芽、涨大粒
+        		$scope.qualitycheckInspection.imperfectgrainsSproutedkernel = $scope.getMath(syzdl);
+    		
+    			var sml = parseFloat($scope.qualitycheck.mildewCount);//生霉粒%
+        		$scope.qualitycheck.mildewCount = $scope.getMath(sml);
+        		
+        		var dsl = parseFloat($scope.qualitycheckInspection.imperfectgrainsFrostbite);//冻伤粒%
+        		$scope.qualitycheckInspection.imperfectgrainsFrostbite = $scope.getMath(dsl);
+        		
+        		
+        		var ssllzl = ((parseFloat($scope.qualitycheck.hotDamageRatio)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel)*100)+
+        				(parseFloat($scope.qualitycheckInspection.imperfectgrainsScab)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel)*100) + 
+        				(parseFloat($scope.qualitycheck.mildewCount)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsFrostbite)*100))/100;
+    			$scope.qualitycheckInspection.imperfectgrainsTotal = isNaN(ssllzl) ? '0.0' : $scope.getMath1(ssllzl);
+        		
+    			var zdy = parseFloat($scope.qualitycheckInspection.inputTwo);//自定义属性
+        		$scope.qualitycheckInspection.inputTwo = $scope.getMath1(zdy);
         	}
+        
         };
 
         if($stateParams.isNotEdit != null){
@@ -1500,7 +1445,8 @@ angular.module('app.storage')
         // 提交表单
         var validator = $("#qualitycheck-form").validate();
         $scope.saveData = function (checktype) {
-            var zblbId ="";
+        	$scope.zjzl();
+        	var zblbId ="";
             var storeQualityId ="";
             if($scope.qualitycheck.zblb == null || $scope.qualitycheck.zblb == ""){
                 alert("请选择指标类别！");

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-firstcheck-edit.html

@@ -766,14 +766,14 @@
 													<td class="text-center" colspan="2">水分%</td>
 													<td>
 														<label class="input">
-															<input type="text" ng-model="qualitycheck.water" name="water" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheck.water" name="water" ng-blur="zjzl()" ng-readonly="isNotEdit">
 														</label>
 													</td>
 													<td rowspan="7" class="text-center" style="vertical-align: middle;">损伤粒率%</td>
 													<td class="text-center" colspan="2">总量</td>
 													<td class="text-center" colspan="2">
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.imperfectgrainsTotal" name="imperfectgrainsTotal" ng-readonly="true">
+															<input type="text" ng-model="qualitycheckInspection.imperfectgrainsTotal" ng-blur="zjzl()" name="imperfectgrainsTotal" ng-readonly="true">
 														</label>
 													</td>
 												</tr>
@@ -781,14 +781,14 @@
 													<td class="text-center" colspan="2">完整粒率%</td>
 													<td>
 														<label class="input">
-															<input type="text" ng-model="qualitycheck.goodpart" name="goodpart" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheck.goodpart" name="goodpart" ng-blur="zjzl()" ng-readonly="isNotEdit">
 														</label>
 													</td>
 													<!-- <td></td> -->
 													<td class="text-center" colspan="2">热损伤粒%</td>
 													<td class="text-center" colspan="2">
 														<label class="input">
-															<input type="text" ng-model="qualitycheck.hotDamageRatio" name="hotDamageRatio" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheck.hotDamageRatio" name="hotDamageRatio" ng-blur="zjzl()" ng-readonly="isNotEdit">
 														</label>
 													</td>
 												</tr>
@@ -796,14 +796,14 @@
 													<td class="text-center" colspan="2">未熟粒率%</td>
 													<td>
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.immatureGrainRate" name="immatureGrainRate" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheckInspection.immatureGrainRate"  ng-blur="zjzl()" name="immatureGrainRate" ng-readonly="isNotEdit">
 														</label>
 													</td>
 													<!-- <td></td> -->
 													<td class="text-center" colspan="2">虫蚀粒</td>
 													<td class="text-center" colspan="2">
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.imperfectgrainsInjuredkernel" name="imperfectgrainsInjuredkernel" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheckInspection.imperfectgrainsInjuredkernel" ng-blur="zjzl()" name="imperfectgrainsInjuredkernel" ng-readonly="isNotEdit">
 														</label>
 													</td>
 												</tr>
@@ -811,14 +811,14 @@
 													<td class="text-center" colspan="2">破碎率%</td>
 													<td>
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.crushingRate" name="crushingRate" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheckInspection.crushingRate" ng-blur="zjzl()" name="crushingRate" ng-readonly="isNotEdit">
 														</label>
 													</td>
 													<!-- <td></td> -->
 													<td class="text-center" colspan="2">病斑粒</td>
 													<td class="text-center" colspan="2">
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.imperfectgrainsScab" name="imperfectgrainsScab" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheckInspection.imperfectgrainsScab" ng-blur="zjzl()" name="imperfectgrainsScab" ng-readonly="isNotEdit">
 														</label>
 													</td>
 												</tr>
@@ -827,14 +827,14 @@
 													<td>总量%</td>
 													<td>
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.impurityTotal" name="impurityTotal" ng-readonly="true">
+															<input type="text" ng-model="qualitycheckInspection.impurityTotal" ng-blur="zjzl()" name="impurityTotal" ng-readonly="true">
 														</label>
 													</td>
 
 													<td class="text-center" colspan="2">生芽、涨大粒%</td>
 													<td colspan="2">
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.imperfectgrainsSproutedkernel" name="imperfectgrainsSproutedkernel" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheckInspection.imperfectgrainsSproutedkernel" ng-blur="zjzl()" name="imperfectgrainsSproutedkernel" ng-readonly="isNotEdit">
 														</label>
 													</td>
 												</tr>
@@ -842,14 +842,14 @@
 													<td>有机杂质%</td>
 													<td>
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.impurityOrganic" name="impurityOrganic" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheckInspection.impurityOrganic" ng-blur="zjzl()" name="impurityOrganic" ng-readonly="isNotEdit">
 														</label>
 													</td>
 
 													<td class="text-center" colspan="2">生霉粒%</td>
 													<td colspan="2">
 														<label class="input">
-															<input type="text" ng-model="qualitycheck.mildewCount" name="mildewCount" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheck.mildewCount" name="mildewCount" ng-blur="zjzl()" ng-readonly="isNotEdit">
 														</label>
 													</td>
 												</tr>
@@ -857,13 +857,13 @@
 													<td>无机杂质%</td>
 													<td>
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.impurityInorganic" name="impurityInorganic" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheckInspection.impurityInorganic" ng-blur="zjzl()" name="impurityInorganic" ng-readonly="isNotEdit">
 														</label>
 													</td>
 													<td class="text-center" colspan="2">冻伤粒%</td>
 													<td colspan="2">
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.imperfectgrainsFrostbite" name="imperfectgrainsFrostbite" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheckInspection.imperfectgrainsFrostbite" ng-blur="zjzl()" name="imperfectgrainsFrostbite" ng-readonly="isNotEdit">
 														</label>
 													</td>
 												</tr>
@@ -871,7 +871,7 @@
 													<td class="text-center" colspan="2">粗脂肪含量（干基）%</td>
 													<td>
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.crudeFatContent" name="crudeFatContent" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheckInspection.crudeFatContent" ng-blur="zjzl()" name="crudeFatContent" ng-readonly="isNotEdit">
 														</label>
 													</td>
 													<!-- <td></td> -->
@@ -882,7 +882,7 @@
 													</td>
 													<td class="text-center" colspan="2">
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.inputTwo" name="inputTwo" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheckInspection.inputTwo" ng-blur="zjzl()" name="inputTwo" ng-readonly="isNotEdit">
 														</label>
 													</td>
 												</tr>

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-outcheck-edit.html

@@ -757,14 +757,14 @@
 													<td class="text-center" colspan="2">水分%</td>
 													<td>
 														<label class="input">
-															<input type="text" ng-model="qualitycheck.water" name="water" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheck.water" name="water" ng-blur="zjzl()" ng-readonly="isNotEdit">
 														</label>
 													</td>
 													<td rowspan="7" class="text-center" style="vertical-align: middle;">损伤粒率%</td>
 													<td class="text-center" colspan="2">总量</td>
 													<td class="text-center" colspan="2">
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.imperfectgrainsTotal" name="imperfectgrainsTotal" ng-readonly="true">
+															<input type="text" ng-model="qualitycheckInspection.imperfectgrainsTotal" ng-blur="zjzl()" name="imperfectgrainsTotal" ng-readonly="true">
 														</label>
 													</td>
 												</tr>
@@ -772,14 +772,14 @@
 													<td class="text-center" colspan="2">完整粒率%</td>
 													<td>
 														<label class="input">
-															<input type="text" ng-model="qualitycheck.goodpart" name="goodpart" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheck.goodpart" name="goodpart" ng-blur="zjzl()" ng-readonly="isNotEdit">
 														</label>
 													</td>
 													<!-- <td></td> -->
 													<td class="text-center" colspan="2">热损伤粒%</td>
 													<td class="text-center" colspan="2">
 														<label class="input">
-															<input type="text" ng-model="qualitycheck.hotDamageRatio" name="hotDamageRatio" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheck.hotDamageRatio" name="hotDamageRatio" ng-blur="zjzl()" ng-readonly="isNotEdit">
 														</label>
 													</td>
 												</tr>
@@ -787,14 +787,14 @@
 													<td class="text-center" colspan="2">未熟粒率%</td>
 													<td>
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.immatureGrainRate" name="immatureGrainRate" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheckInspection.immatureGrainRate" ng-blur="zjzl()" name="immatureGrainRate" ng-readonly="isNotEdit">
 														</label>
 													</td>
 													<!-- <td></td> -->
 													<td class="text-center" colspan="2">虫蚀粒</td>
 													<td class="text-center" colspan="2">
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.imperfectgrainsInjuredkernel" name="imperfectgrainsInjuredkernel" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheckInspection.imperfectgrainsInjuredkernel" ng-blur="zjzl()" name="imperfectgrainsInjuredkernel" ng-readonly="isNotEdit">
 														</label>
 													</td>
 												</tr>
@@ -802,14 +802,14 @@
 													<td class="text-center" colspan="2">破碎率%</td>
 													<td>
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.crushingRate" name="crushingRate" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheckInspection.crushingRate" ng-blur="zjzl()" name="crushingRate" ng-readonly="isNotEdit">
 														</label>
 													</td>
 													<!-- <td></td> -->
 													<td class="text-center" colspan="2">病斑粒</td>
 													<td class="text-center" colspan="2">
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.imperfectgrainsScab" name="imperfectgrainsScab" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheckInspection.imperfectgrainsScab" ng-blur="zjzl()" name="imperfectgrainsScab" ng-readonly="isNotEdit">
 														</label>
 													</td>
 												</tr>
@@ -818,14 +818,14 @@
 													<td>总量%</td>
 													<td>
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.impurityTotal" name="impurityTotal" ng-readonly="true">
+															<input type="text" ng-model="qualitycheckInspection.impurityTotal" ng-blur="zjzl()" name="impurityTotal" ng-readonly="true">
 														</label>
 													</td>
 
 													<td class="text-center" colspan="2">生芽、涨大粒%</td>
 													<td colspan="2">
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.imperfectgrainsSproutedkernel" name="imperfectgrainsSproutedkernel" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheckInspection.imperfectgrainsSproutedkernel" ng-blur="zjzl()" name="imperfectgrainsSproutedkernel" ng-readonly="isNotEdit">
 														</label>
 													</td>
 												</tr>
@@ -833,14 +833,14 @@
 													<td>有机杂质%</td>
 													<td>
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.impurityOrganic" name="impurityOrganic" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheckInspection.impurityOrganic" ng-blur="zjzl()" name="impurityOrganic" ng-readonly="isNotEdit">
 														</label>
 													</td>
 
 													<td class="text-center" colspan="2">生霉粒%</td>
 													<td colspan="2">
 														<label class="input">
-															<input type="text" ng-model="qualitycheck.mildewCount" name="mildewCount" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheck.mildewCount" ng-blur="zjzl()" name="mildewCount" ng-readonly="isNotEdit">
 														</label>
 													</td>
 												</tr>
@@ -848,13 +848,13 @@
 													<td>无机杂质%</td>
 													<td>
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.impurityInorganic" name="impurityInorganic" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheckInspection.impurityInorganic" ng-blur="zjzl()" name="impurityInorganic" ng-readonly="isNotEdit">
 														</label>
 													</td>
 													<td class="text-center" colspan="2">冻伤粒%</td>
 													<td colspan="2">
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.imperfectgrainsFrostbite" name="imperfectgrainsFrostbite" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheckInspection.imperfectgrainsFrostbite" ng-blur="zjzl()" name="imperfectgrainsFrostbite" ng-readonly="isNotEdit">
 														</label>
 													</td>
 												</tr>
@@ -862,7 +862,7 @@
 													<td class="text-center" colspan="2">粗脂肪含量（干基）%</td>
 													<td>
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.crudeFatContent" name="crudeFatContent" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheckInspection.crudeFatContent" ng-blur="zjzl()" name="crudeFatContent" ng-readonly="isNotEdit">
 														</label>
 													</td>
 													<!-- <td></td> -->
@@ -873,7 +873,7 @@
 													</td>
 													<td class="text-center" colspan="2">
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.inputTwo" name="inputTwo" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheckInspection.inputTwo" ng-blur="zjzl()" name="inputTwo" ng-readonly="isNotEdit">
 														</label>
 													</td>
 												</tr>