Merge branch 'master' of http://git.kivii.org/neoturing/Njhg.Third.Semir.V4.5

Src/Entities/SemirOrderBase.cs

@@ -98,7 +98,7 @@ namespace Njhg.Third.Semir.Entities
             var reports = conn.SelectByIds<Report>(thirdDetails.ConvertAll(o => o.ReportKvid));
             if (reports.IsNullOrEmpty()) return false;
             if (reports.Exists(o => o.Status <= (int)ReportStatusType.ReportIssue)) return false;
-
+            if (reports.Exists(o => o.AmountTest + o.Amount > 0 && o.AmountSettlement <= 0)) return false;
             var result_info = new ReportResultInfo();
             result_info.DOC_NO = third.SerialNumber;
             result_info.URL_PDF = new List<UrlPdf>();
@@ -148,7 +148,7 @@ namespace Njhg.Third.Semir.Entities
 
                 #region result_info
                 result_info.EXT_DOC_NO = report.ReportId;
-                result_info.CHECK_FEE += report.Amount + report.AmountTest;
+                result_info.CHECK_FEE += report.AmountSettlement;
                 result_info.RESULT = 4;
                 if (report.TestJudgement == "合格") result_info.RESULT = 1;
                 if (report.TestJudgement == "不合格")