核价后台：1、修复计算公式空值问题

JLHHJSvr/Excutor/GetComputeMattressExcutor.cs

@@ -39,33 +39,34 @@ namespace JLHHJSvr.Excutor
                 // 初始化属性
                 AutoInit.AutoInitS(cmd, request.mattress);
 
-                if (request.mattress.copy_id != null && request.mattress.copy_id > 0)
-                {
-                    request.mattress.mattressid = 0;
-                    request.mattress.mattresscode = string.Empty;
-
-                    foreach (var mx in request.mattressMx)
-                    {
-                        mx.mattressid = 0;
-                        mx.mattressmxid = 0;
-                    }
-                }
-
-                if (request.mattress.dannum_type.Value == 0)
-                {
-                    request.mattress.dannum_type = 2; // 默认标准
-                }
-
-                foreach (var mx in request.mattressMx)
-                {
-                    AutoInit.AutoInitS(cmd, mx);
-                }
+                //foreach (var mx in request.mattressMx)
+                //{
+                //    AutoInit.AutoInitS(cmd, mx);
+                //}
 
                 using (cmd.Transaction = con.BeginTransaction())
                 {
                     var helper = HelperBase.GetHelper<MattressHelper>(cmd, new HelperBase.Context() { tokendata = tokendata });
                     var helperOld = HelperBase.GetHelper<MattressHelper>(cmd, new HelperBase.Context() { tokendata = tokendata });
 
+                    var mattressMx = helper.GetMattressMxMtrl(request.mattress.mattressid);
+
+                    if (request.mattress.copy_id != null && request.mattress.copy_id > 0)
+                    {
+                        request.mattress.mattressid = 0;
+                        request.mattress.mattresscode = string.Empty;
+
+                        foreach (var mx in mattressMx)
+                        {
+                            mx.mattressid = 0;
+                            mx.mattressmxid = 0;
+                        }
+                    }
+
+                    if (request.mattress.dannum_type.Value == 0)
+                    {
+                        request.mattress.dannum_type = 2; // 默认标准
+                    }
                     try
                     {
                         var differArr = new List<u_mattress_computed>();
@@ -76,7 +77,7 @@ namespace JLHHJSvr.Excutor
                             var _mattress = ObjectHelper.DeepCopy(request.mattress);
                             if (request.mattress.dannum_type.Value == i)
                             {
-                                helper.CalCulateFormula(_mattress, request.mattressMx, false);
+                                helper.CalCulateFormula(_mattress, mattressMx, false);
                                 rslt.replace = helper.Replacements;
                                 rslt.formulas = helper.FormulaReplacements;
                                 rslt.formulas_bednet = helper.BendetFormulasReplace;
@@ -84,7 +85,7 @@ namespace JLHHJSvr.Excutor
                             else
                             {
                                 _mattress.dannum_type = i;
-                                helper.CalCulateFormula(_mattress, request.mattressMx, false);
+                                helper.CalCulateFormula(_mattress, mattressMx, false);
                             }
 
                             differItem.replace = helper.Replacements;
@@ -94,7 +95,7 @@ namespace JLHHJSvr.Excutor
                             {
                                 _mattress.dannum_type = i;
 
-                                helperOld.CalCulateFormula(_mattress, request.mattressMx, false, false);
+                                helperOld.CalCulateFormula(_mattress, mattressMx, false, false);
                                 differItem.replace_origin = helperOld.Replacements;
                                 rslt.formulas_origin = helperOld.FormulaReplacements;
                             }