CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -1262,7 +1262,7 @@
                                }
                              
                            }
                            else if (inquirySHiJuanModel.Nianji == "三年级" || inquirySHiJuanModel.Nianji == "四年级" || inquirySHiJuanModel.Nianji == "五年级" || inquirySHiJuanModel.Nianji == "六年级")
                            else if (inquirySHiJuanModel.Nianji == "三年级" || inquirySHiJuanModel.Nianji == "四年级" || inquirySHiJuanModel.Nianji == "五年级" )
                            {
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
                                {
@@ -1289,6 +1289,74 @@
                              
                              
                            }
                            else if ( inquirySHiJuanModel.Nianji == "六年级")
                            {
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
                                {
                                    //printDemand += "英语:" + inquirySHiJuanModel.yingyucheckboxinput + "张,";
                                    //printDemand += inquirySHiJuanModel.yingyuselect + ",";
                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">英语:" + inquirySHiJuanModel.yingyucheckboxinput + "张," + inquirySHiJuanModel.yingyuselect + "</td>";
                                }
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.kexuecheckboxinput))
                                {
                                    //printDemand += "科学:" + inquirySHiJuanModel.kexuecheckboxinput + "张,";
                                    //printDemand += inquirySHiJuanModel.kexueselect + ",";
                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">科学:" + inquirySHiJuanModel.kexuecheckboxinput + "张," + inquirySHiJuanModel.kexueselect + "</td>";
                                }
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.pingdecheckboxinput))
                                {
                                    //printDemand += "品德与生活:" + inquirySHiJuanModel.pingdecheckboxinput + "张,";
                                    //printDemand += inquirySHiJuanModel.pingdeselect + ",";
                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">品德与生活:" + inquirySHiJuanModel.pingdecheckboxinput + "张," + inquirySHiJuanModel.pingdeselect + "</td>";
                                }
                                printDemand += "</tr>";
                                printDemand += "<tr>";
                                // printDemand += "答题卡:";
                                printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">答题卡:</td>";
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yuwendatikacheckboxinput))
                                {
                                    //printDemand += "语文:" + inquirySHiJuanModel.yuwendatikacheckboxinput + "张,";
                                    //printDemand += inquirySHiJuanModel.yuwendatikaselect + ",";
                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">语文:" + inquirySHiJuanModel.yuwendatikacheckboxinput + "张," + inquirySHiJuanModel.yuwendatikaselect + "</td>";
                                }
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shuxuedatikacheckboxinput))
                                {
                                    //printDemand += "数学:" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "张,";
                                    //printDemand += inquirySHiJuanModel.shuxuedatikaselect + ",";
                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">数学:" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "张," + inquirySHiJuanModel.shuxuedatikaselect + "</td>";
                                }
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyudatikacheckboxinput))
                                {
                                    //printDemand += "英语:" + inquirySHiJuanModel.yingyudatikacheckboxinput + "张,";
                                    //printDemand += inquirySHiJuanModel.yingyudatikaselect + ",";
                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">英语:" + inquirySHiJuanModel.yingyudatikacheckboxinput + "张," + inquirySHiJuanModel.yingyudatikaselect + "</td>";
                                }
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.kexuedatikacheckboxinput))
                                {
                                    //printDemand += "历史:" + inquirySHiJuanModel.kexuedatikacheckboxinput + "张,";
                                    //printDemand += inquirySHiJuanModel.kexuedatikaselect + ",";
                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">科学:" + inquirySHiJuanModel.kexuedatikacheckboxinput + "张," + inquirySHiJuanModel.kexuedatikaselect + "</td>";
                                }
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.pingdedatikacheckboxinput))
                                {
                                    //printDemand += "地理:" + inquirySHiJuanModel.pingdedatikacheckboxinput + "张,";
                                    //printDemand += inquirySHiJuanModel.pingdedatikaselect + ",";
                                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">品德与生活:" + inquirySHiJuanModel.pingdedatikacheckboxinput + "张," + inquirySHiJuanModel.pingdedatikaselect + "</td>";
                                }
                            }
                            else if (inquirySHiJuanModel.Nianji == "七年级")
                            {
                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))