事前事中

Business/HisMainBusiness.cs

@@ -1859,11 +1859,11 @@ namespace PTMedicalInsurance.Business
                 //JObject jo9001Rtn = new JObject();
                 //cBus.signIn(out jo9001Rtn);
 
-                if (trig_scen == "5")
-                {
-                    outparam = inparam;
-                }
-                else
+                //if (trig_scen == "5")
+                //{
+                //    outparam = inparam;
+                //}
+                //else
                 {
                     //获取HIS返回的内容
                     if (hIS.PreAnalysis(out outparam) != 0)
@@ -1885,6 +1885,12 @@ namespace PTMedicalInsurance.Business
                 }
                 else
                 {
+                    if (JsonHelper.getDestValue(joRtn, "output.type") == "error")
+                    {
+                        outparam = JsonHelper.getDestValue(joRtn, "output.message");
+                        return -1;
+                    }
+
                     JArray jaResult = JArray.Parse(JsonHelper.getDestValue(joRtn, "output.result"));
                     if (jaResult.HasValues)
                     {
@@ -1892,16 +1898,26 @@ namespace PTMedicalInsurance.Business
                         if (paipaForm.ShowDialog() == DialogResult.OK)
                         {
                             JObject joData = new JObject();
-                            joData.Add("warnType",1);
-                            joData.Add("warns", paipaForm.jaWarns);
-                            joRtn = invoker.invokeCenterService(TradeEnum.PreAnalysisFeedback, joInput);
+                            JObject joTmp = new JObject();
+                            joTmp.Add("warnType",1);
+                            joTmp.Add("warns", paipaForm.jaWarns);
+                            joData.Add("data",joTmp);
+                            joRtn = invoker.invokeCenterService(TradeEnum.PreAnalysisFeedback, joData);
                             if(JsonHelper.parseCenterRtnValue(joRtn, out outparam) != 0)
                             {
                                 return -1;
                             }
                             else
                             {
-                                return 0;
+                                if (JsonHelper.getDestValue(joRtn, "output.type") == "error")
+                                {
+                                    outparam = JsonHelper.getDestValue(joRtn, "output.message");
+                                    return -1;
+                                }
+                                else
+                                {
+                                    return 0;
+                                }
                             }
                             
                         }

Business/Inpatient/IPFeeUploadProcess.cs

@@ -34,7 +34,9 @@ namespace PTMedicalInsurance.Business
             ////事前分析
             if (Global.curEvt.ext.isOpenAnalysis)
             {
-                if (hBus.PreAnalysis("4", "", out errMsg) != 0)
+                Global.pat.insuplc_admdvs = "370102";
+                Global.inf.areaCode = "370102";
+                if (hBus.PreAnalysis("5", "", out errMsg) != 0)
                 {
                     return Exception("事前分析", errMsg);
                 }

Business/IrisServices.cs

@@ -1095,8 +1095,8 @@ namespace PTMedicalInsurance.Business
                 joTmp.Add("med_type", Global.pat.medType);
                 joTmp.Add("insu_type", Global.pat.insuType);
                 joTmp.Add("psn_no", Global.pat.psn_no);
-                joTmp.Add("HospitalDr", Global.inf.hospitalDr);
-                joTmp.Add("InterfaceDr", Global.inf.interfaceDr);
+                if (!joTmp.ContainsKey("HospitalDr"))  joTmp.Add("HospitalDr", Global.inf.hospitalDr);
+                if (!joTmp.ContainsKey("InterfaceDr"))  joTmp.Add("InterfaceDr", Global.inf.interfaceDr);
 
                 JObject joRtn = invoker.invokeInsuService(joTmp.ToString(), "根据HIS的费用明细获取对照关系");
                 if (JsonHelper.parseIrisRtnValue(joRtn, out errMsg) != 0)

Business/PreAndInProcessAnalysis.cs

@@ -77,11 +77,11 @@ namespace PTMedicalInsurance.Business
             try
             {
                 JObject joInpar = new JObject();
-                joInpar.Add("syscode", "YBJK");
-                joInpar.Add("patient_dtos", GetPatient_dtos(trig_scen, p));
-                joInpar.Add("rule_ids", "");
-                joInpar.Add("task_id", GetMsgID());
-                joInpar.Add("trig_scen", trig_scen);
+                //joInpar.Add("syscode", "YBJK");
+                joInpar.Add("patientDtos", GetPatient_dtos(trig_scen, p));
+                joInpar.Add("ruleIds", "");
+                //joInpar.Add("task_id", GetMsgID());
+                joInpar.Add("trigScen", trig_scen);
                 JObject joData = new JObject();
                 joData.Add("data",joInpar);
                 return joData;
@@ -108,8 +108,8 @@ namespace PTMedicalInsurance.Business
                     curr_mdtrt_id = Global.pat.adm_Dr.ToString();
                 }
                 JObject joInpar = new JObject();
-                joInpar.Add("patn_id", p.psn_no);
-                joInpar.Add("patn_name", p.name);
+                joInpar.Add("patnId", p.psn_no);
+                joInpar.Add("patnName", p.name);
                 string gend = p.gend;
                 if (gend == "男") gend = "1";
                 if (gend == "女") gend = "2";
@@ -117,9 +117,9 @@ namespace PTMedicalInsurance.Business
                 joInpar.Add("brdy", p.brdy);
                 if (p.insuplc_admdvs == "") p.insuplc_admdvs = Global.pat.insuplc_admdvs;
                 joInpar.Add("poolarea", p.insuplc_admdvs);
-                joInpar.Add("curr_mdtrt_id", curr_mdtrt_id);
-                joInpar.Add("fsi_encounter_dtos", GetFsi_encounter_dtos(trig_scen,p));
-                joInpar.Add("fsi_his_data_dto", new JArray());
+                joInpar.Add("currMdtrtId", curr_mdtrt_id);
+                joInpar.Add("encounterDtos", GetFsi_encounter_dtos(trig_scen,p));
+                //joInpar.Add("fsi_his_data_dto", new JArray());
                 JArray ja = new JArray();
                 ja.Add(joInpar);
                 return ja;
@@ -139,41 +139,43 @@ namespace PTMedicalInsurance.Business
                 JObject joInpar = new JObject(); 
                 string mdtrtID = p.mdtrtID;
                 if (string.IsNullOrEmpty(mdtrtID)) mdtrtID = Global.pat.adm_Dr.ToString();
-                joInpar.Add("mdtrt_id", mdtrtID);  //就诊标识
-                joInpar.Add("medins_id", Global.inf.hospitalNO);  //医疗服务机构标识
-                joInpar.Add("medins_name", Global.inf.hospitalName);  //医疗机构名称
-                joInpar.Add("medins_admdvs", Global.inf.areaCode);  //医疗机构行政区划编码
-                joInpar.Add("medins_type", "A");  //医疗服务机构类型
-                joInpar.Add("medins_lv", "04");  //医疗机构等级
-                joInpar.Add("wardarea_codg", JsonHelper.getDestValue(jofsi_encounter_dtos, "wardarea_codg"));  //病区标识
+                joInpar.Add("mdtrtId", mdtrtID);  //就诊标识
+                joInpar.Add("medinsId", Global.inf.hospitalNO);  //医疗服务机构标识
+                joInpar.Add("medinsName", Global.inf.hospitalName);  //医疗机构名称
+                joInpar.Add("medinsAdmdvs", Global.inf.areaCode);  //医疗机构行政区划编码
+                joInpar.Add("medinsType", "A");  //医疗服务机构类型
+                joInpar.Add("medinsLv", "3");  //医疗机构等级
+                joInpar.Add("wardareaCodg", JsonHelper.getDestValue(jofsi_encounter_dtos, "wardarea_codg"));  //病区标识
                 joInpar.Add("wardno", JsonHelper.getDestValue(jofsi_encounter_dtos, "wardno"));  //病房号
                 joInpar.Add("bedno", JsonHelper.getDestValue(jofsi_encounter_dtos, "bedno"));  //病床号
-                joInpar.Add("adm_date", JsonHelper.getDestValue(jofsi_encounter_dtos, "adm_date"));  //入院日期
-                joInpar.Add("dscg_date", JsonHelper.getDestValue(jofsi_encounter_dtos, "dscg_date"));  //出院日期
-                joInpar.Add("dscg_main_dise_codg", JsonHelper.getDestValue(jofsi_encounter_dtos, "dscg_main_dise_codg"));  //主诊断编码
-                joInpar.Add("dscg_main_dise_name", JsonHelper.getDestValue(jofsi_encounter_dtos, "dscg_main_dise_name"));  //主诊断名称
-                joInpar.Add("fsi_diagnose_dtos", GetFsi_diagnose__dtos(trig_scen, p));  //诊断信息DTO
-                joInpar.Add("dr_codg", JsonHelper.getDestValue(jofsi_encounter_dtos, "dr_codg"));  //医师标识
-                joInpar.Add("adm_dept_codg", JsonHelper.getDestValue(jofsi_encounter_dtos, "adm_dept_codg"));  //入院科室标识
-                joInpar.Add("adm_dept_name", JsonHelper.getDestValue(jofsi_encounter_dtos, "adm_dept_name"));  //入院科室名称
-                joInpar.Add("dscg_dept_codg", JsonHelper.getDestValue(jofsi_encounter_dtos, "dscg_dept_codg"));  //出院科室标识
-                joInpar.Add("dscg_dept_name", JsonHelper.getDestValue(jofsi_encounter_dtos, "dscg_dept_name"));  //出院科室名称
-                joInpar.Add("med_mdtrt_type", JsonHelper.getDestValue(jofsi_encounter_dtos, "med_mdtrt_type"));  //就诊类型
+                joInpar.Add("admDate", JsonHelper.getDestValue(jofsi_encounter_dtos, "adm_date"));  //入院日期
+                joInpar.Add("dscgDate", JsonHelper.getDestValue(jofsi_encounter_dtos, "dscg_date"));  //出院日期
+                joInpar.Add("dscgMainDiseCodg", JsonHelper.getDestValue(jofsi_encounter_dtos, "dscg_main_dise_codg"));  //主诊断编码
+                joInpar.Add("dscgMainDiseName", JsonHelper.getDestValue(jofsi_encounter_dtos, "dscg_main_dise_name"));  //主诊断名称
+                joInpar.Add("diagnoseDtos", GetFsi_diagnose__dtos(trig_scen, p));  //诊断信息DTO
+                joInpar.Add("drCodg", JsonHelper.getDestValue(jofsi_encounter_dtos, "dr_codg"));  //医师标识
+                joInpar.Add("admDeptCodg", JsonHelper.getDestValue(jofsi_encounter_dtos, "adm_dept_codg"));  //入院科室标识
+                joInpar.Add("admDeptName", JsonHelper.getDestValue(jofsi_encounter_dtos, "adm_dept_name"));  //入院科室名称
+                joInpar.Add("dscgDeptCodg", JsonHelper.getDestValue(jofsi_encounter_dtos, "dscg_dept_codg"));  //出院科室标识
+                joInpar.Add("dscgDeptName", JsonHelper.getDestValue(jofsi_encounter_dtos, "dscg_dept_name"));  //出院科室名称
+                joInpar.Add("medMdtrtType", JsonHelper.getDestValue(jofsi_encounter_dtos, "med_mdtrt_type"));  //就诊类型
                 string med_type = JsonHelper.getDestValue(jofsi_encounter_dtos, "med_type");
-                joInpar.Add("med_type", med_type);  //医疗类别
-                joInpar.Add("fsi_order_dtos", GetFsi__order_dtos(trig_scen,p));  //处方(医嘱)信息
+                med_type = "21";
+                joInpar.Add("medType", med_type);  //医疗类别
+                joInpar.Add("orderDtos", GetFsi__order_dtos(trig_scen,p));  //处方(医嘱)信息
                 string matn_stas = JsonHelper.getDestValue(jofsi_encounter_dtos, "matn_stas");
                 if (string.IsNullOrEmpty(matn_stas)) matn_stas = "0";
-                joInpar.Add("matn_stas",matn_stas );  //生育状态
-                joInpar.Add("medfee_sumamt", JsonHelper.getDestValue(jofsi_encounter_dtos, "medfee_sumamt"));  //总费用
-                joInpar.Add("ownpay_amt", JsonHelper.getDestValue(jofsi_encounter_dtos, "ownpay_amt"));  //自费金额
-                joInpar.Add("selfpay_amt", JsonHelper.getDestValue(jofsi_encounter_dtos, "selfpay_amt"));  //自付金额
-                joInpar.Add("acct_payamt", JsonHelper.getDestValue(jofsi_encounter_dtos, "acct_payamt"));  //个人账户支付金额
-                joInpar.Add("ma_amt", JsonHelper.getDestValue(jofsi_encounter_dtos, "ma_amt"));  //救助金支付金额
-                joInpar.Add("hifp_payamt", JsonHelper.getDestValue(jofsi_encounter_dtos, "hifp_payamt"));  //统筹金支付金额
-                joInpar.Add("setl_totlnum", JsonHelper.getDestValue(jofsi_encounter_dtos, "setl_totlnum"));  //结算总次数
+                joInpar.Add("matnStas", matn_stas );  //生育状态
+                joInpar.Add("medfeeSumamt", JsonHelper.getDestValue(jofsi_encounter_dtos, "medfee_sumamt"));  //总费用
+                joInpar.Add("ownpayAmt", JsonHelper.getDestValue(jofsi_encounter_dtos, "ownpay_amt"));  //自费金额
+                joInpar.Add("selfpayAmt", JsonHelper.getDestValue(jofsi_encounter_dtos, "selfpay_amt"));  //自付金额
+                joInpar.Add("acctPayamt", JsonHelper.getDestValue(jofsi_encounter_dtos, "acct_payamt"));  //个人账户支付金额
+                joInpar.Add("maAmt", JsonHelper.getDestValue(jofsi_encounter_dtos, "ma_amt"));  //救助金支付金额
+                joInpar.Add("hifpPayamt", JsonHelper.getDestValue(jofsi_encounter_dtos, "hifp_payamt"));  //统筹金支付金额
+                joInpar.Add("setlTotlnum", JsonHelper.getDestValue(jofsi_encounter_dtos, "setl_totlnum"));  //结算总次数
                 string insutype = JsonHelper.getDestValue(jofsi_encounter_dtos, "insutype");
                 if (insutype =="") insutype = Global.pat.insuType;
+                insutype = "310";
                 joInpar.Add("insutype", insutype);  //险种
                 string reimFlag = JsonHelper.getDestValue(jofsi_encounter_dtos, "reim_flag");
                 // 报销标志(必填）
@@ -181,15 +183,20 @@ namespace PTMedicalInsurance.Business
                 {
                     reimFlag = "1";
                 }
-                joInpar.Add("reim_flag", reimFlag);
+                joInpar.Add("reimFlag", reimFlag);
                 // 异地结算标志(必填）
                 string outSetlFlag = JsonHelper.getDestValue(jofsi_encounter_dtos, "out_setl_flag");
                 if (string.IsNullOrEmpty(outSetlFlag))
                 {
                     outSetlFlag = Utils.isOtherCity()?"1":"0";
                 }
-                joInpar.Add("out_setl_flag", outSetlFlag);
-                joInpar.Add("fsi_operation_dtos", GetFsi__operation__dtos(trig_scen,p));  //手术操作集合
+                joInpar.Add("outSetlFlag", outSetlFlag);
+                joInpar.Add("operationDtos", GetFsi__operation__dtos(trig_scen,p));  //手术操作集合
+                //济南新增
+                joInpar.Add("diseNo", ""); //病种编号
+                joInpar.Add("diseName", ""); //病种名称
+                joInpar.Add("sincHealLv", ""); //手术切口愈合等级
+                joInpar.Add("hisMdCnt", "");//历史就诊次数
 
                 JArray ja = new JArray();
                 ja.Add(joInpar);
@@ -205,7 +212,21 @@ namespace PTMedicalInsurance.Business
         {
             try
             {
-                return fsi_diagnose_dtos;
+                JArray jaNew = new JArray();
+                foreach (var jo in fsi_diagnose_dtos)
+                {
+                    JObject joTmp = new JObject();
+                    joTmp.Add("diseId", JsonHelper.getDestValue((JObject)jo, "dise_id"));
+                    joTmp.Add("inoutDiseType", JsonHelper.getDestValue((JObject)jo, "inout_dise_type"));
+                    joTmp.Add("maindiseFlag", JsonHelper.getDestValue((JObject)jo, "maindise_flag"));
+                    joTmp.Add("diasSrtNo", JsonHelper.getDestValue((JObject)jo, "dias_srt_no"));
+                    joTmp.Add("diseCodg", JsonHelper.getDestValue((JObject)jo, "dise_codg"));
+                    joTmp.Add("diseName", JsonHelper.getDestValue((JObject)jo, "dise_name"));
+                    joTmp.Add("diseDate", JsonHelper.getDestValue((JObject)jo, "dise_date"));
+
+                    jaNew.Add(jo);
+                }
+                return jaNew;
             }
             catch (Exception ex)
             {
@@ -219,7 +240,25 @@ namespace PTMedicalInsurance.Business
         {
             try
             {
-                return fsi_operation_dtos;
+
+                JArray jaNew = new JArray();
+                foreach (var jo in fsi_operation_dtos)
+                {
+                    JObject joTmp = new JObject();
+                    joTmp.Add("setlListOprnId", JsonHelper.getDestValue((JObject)jo, "setl_list_oprn_id"));
+                    joTmp.Add("oprnCode", JsonHelper.getDestValue((JObject)jo, "oprn_code"));
+                    joTmp.Add("oprnName", JsonHelper.getDestValue((JObject)jo, "oprn_name"));
+                    joTmp.Add("mainOprnFlag", JsonHelper.getDestValue((JObject)jo, "main_oprn_flag"));
+                    joTmp.Add("oprnDate", JsonHelper.getDestValue((JObject)jo, "oprn_date"));
+                    joTmp.Add("anstWay", JsonHelper.getDestValue((JObject)jo, "anst_way"));
+                    joTmp.Add("operDrName", JsonHelper.getDestValue((JObject)jo, "oper_dr_name"));
+                    joTmp.Add("operDrCode", JsonHelper.getDestValue((JObject)jo, "oper_dr_code"));
+                    joTmp.Add("anstDrName", JsonHelper.getDestValue((JObject)jo, "anst_dr_name"));
+                    joTmp.Add("anstDrCode", JsonHelper.getDestValue((JObject)jo, "anst_dr_code"));
+
+                    jaNew.Add(jo);
+                }
+                return jaNew;
             }
             catch (Exception ex)
             {
@@ -240,15 +279,67 @@ namespace PTMedicalInsurance.Business
                     fsi_order_dtos[i]["pric"] = pric.ToString("#0.00");
                     fsi_order_dtos[i]["hilist_pric"] = pric.ToString("#0.00");
                 }
+
+                
                 //调用医保平台进行转换
                 if (mis.convertFsiOrderDtos(fsi_order_dtos, out errMsg) != 0)
                 {
-                    return null;
+                    throw new Exception("转换FsiOrderDtos异常：" + errMsg);
                 }
                 else
                 {
                     JObject joRtn = JObject.Parse(errMsg);
-                    return JArray.FromObject(joRtn["data"]);
+                    JArray jaFsiOrderDtos = JArray.FromObject(joRtn["data"]);
+
+                    JArray jaNew = new JArray();
+                    foreach (var jo in jaFsiOrderDtos)
+                    {
+                        JObject joTmp = new JObject();
+                        joTmp.Add("rxId", JsonHelper.getDestValue((JObject)jo, "rx_id"));
+                        joTmp.Add("rxno", JsonHelper.getDestValue((JObject)jo, "rxno"));
+                        joTmp.Add("grpno", JsonHelper.getDestValue((JObject)jo, "grpno"));
+                        joTmp.Add("longDrordFlag", JsonHelper.getDestValue((JObject)jo, "long_drord_flag"));
+                        joTmp.Add("hilistType", JsonHelper.getDestValue((JObject)jo, "hilist_type"));
+                        joTmp.Add("chrgType", JsonHelper.getDestValue((JObject)jo, "chrg_type"));
+                        joTmp.Add("drordBhvr", JsonHelper.getDestValue((JObject)jo, "drord_bhvr"));
+                        joTmp.Add("hilistCode", JsonHelper.getDestValue((JObject)jo, "hilist_code"));
+                        joTmp.Add("hilistName", JsonHelper.getDestValue((JObject)jo, "hilist_name"));
+                        joTmp.Add("hilistDosform", JsonHelper.getDestValue((JObject)jo, "hilist_dosform"));
+                        string hilistLv = JsonHelper.getDestValue((JObject)jo, "hilist_lv");
+                        joTmp.Add("hilistLv", int.Parse(hilistLv));
+                        joTmp.Add("hilistPric", JsonHelper.getDestValue((JObject)jo, "hilist_pric"));
+                        joTmp.Add("lv1HospItemPric", JsonHelper.getDestValue((JObject)jo, "lv1_hosp_item_pric"));
+                        joTmp.Add("lv2HospItemPric", JsonHelper.getDestValue((JObject)jo, "lv2_hosp_item_pric"));
+                        joTmp.Add("lv3HospItemPric", JsonHelper.getDestValue((JObject)jo, "lv3_hosp_item_pric"));
+                        joTmp.Add("hilistMemo", JsonHelper.getDestValue((JObject)jo, "hilist_memo"));
+                        joTmp.Add("hosplistCode", JsonHelper.getDestValue((JObject)jo, "hosplist_code"));
+                        joTmp.Add("hosplistName", JsonHelper.getDestValue((JObject)jo, "hosplist_name"));
+                        joTmp.Add("hosplistDosform", JsonHelper.getDestValue((JObject)jo, "hosplist_dosform"));
+                        joTmp.Add("cnt", JsonHelper.getDestValue((JObject)jo, "cnt"));
+                        joTmp.Add("pric", JsonHelper.getDestValue((JObject)jo, "pric"));
+                        joTmp.Add("sumamt", JsonHelper.getDestValue((JObject)jo, "sumamt"));
+                        joTmp.Add("ownpayAmt", JsonHelper.getDestValue((JObject)jo, "ownpay_amt"));
+                        joTmp.Add("selfpayAmt", JsonHelper.getDestValue((JObject)jo, "selfpay_amt"));
+                        string spec = JsonHelper.getDestValue((JObject)jo, "spec");
+                        if (string.IsNullOrEmpty(spec))
+                        {
+                            spec = "-";
+                        }
+                        joTmp.Add("spec", spec);
+                        joTmp.Add("specUnt", JsonHelper.getDestValue((JObject)jo, "spec_unt"));
+                        joTmp.Add("drordBegnDate", JsonHelper.getDestValue((JObject)jo, "drord_begn_date"));
+                        joTmp.Add("drordStopDate", JsonHelper.getDestValue((JObject)jo, "drord_stop_date"));
+                        joTmp.Add("drordDeptCodg", JsonHelper.getDestValue((JObject)jo, "drord_dept_codg"));
+                        joTmp.Add("drordDeptName", JsonHelper.getDestValue((JObject)jo, "drord_dept_name"));
+                        joTmp.Add("drordDrCodg", JsonHelper.getDestValue((JObject)jo, "drord_dr_codg"));
+                        joTmp.Add("drordDrName", JsonHelper.getDestValue((JObject)jo, "drord_dr_name"));
+                        joTmp.Add("drordDrProfttl", JsonHelper.getDestValue((JObject)jo, "drord_dr_profttl"));
+                        joTmp.Add("currDrordFlag", JsonHelper.getDestValue((JObject)jo, "curr_drord_flag"));
+                        joTmp.Add("extendOrderMap", JsonHelper.getDestValue((JObject)jo, "extend_order_map"));
+
+                        jaNew.Add(joTmp);
+                    }
+                    return jaNew;
                 }
 
             }

FormSetter/GridViewSetter.cs

@@ -900,7 +900,8 @@ namespace PTMedicalInsurance.FormSetter
             dgv.AutoGenerateColumns = false;
             dgv.Columns.Clear();
 
-            AddDGVColumn(dgv, "规则名称", "rule_name", 500);
+            AddDGVColumn(dgv, "规则名称", "ruleName", 200);
+            AddDGVColumn(dgv, "规则ID", "ruleId", 300);
             dgv.ColumnHeadersVisible = false;
             dgv.RowHeadersVisible = false;
         }
@@ -910,12 +911,12 @@ namespace PTMedicalInsurance.FormSetter
             dgv.AutoGenerateColumns = false;
             dgv.Columns.Clear();
 
-            AddDGVColumn(dgv, "医保就诊号", "mdtrt_id", 200);
-            AddDGVColumn(dgv, "违规明细标识", "jrd_id", 300);
-            AddDGVColumn(dgv, "处方(医嘱)标识", "rx_id", 120);
-            AddDGVColumn(dgv, "参保人标识", "patn_id", 200);
-            AddDGVColumn(dgv, "违规金额", "vola_amt", 200);
-            AddDGVColumn(dgv, "违规明细类型", "vola_item_type", 120);
+            AddDGVColumn(dgv, "医保就诊号", "mdtrtId", 200);
+            AddDGVColumn(dgv, "违规明细标识", "jrdId", 300);
+            AddDGVColumn(dgv, "处方(医嘱)标识", "rxId", 120);
+            AddDGVColumn(dgv, "参保人标识", "patnId", 200);
+            AddDGVColumn(dgv, "违规金额", "volaAmt", 200);
+            AddDGVColumn(dgv, "违规明细类型", "volaItemType", 120);
 
             dgv.RowHeadersVisible = false;
         }

Forms/AddSignleDirectory.cs

@@ -1,4 +1,6 @@
 using Newtonsoft.Json.Linq;
+using PTMedicalInsurance.Common;
+using PTMedicalInsurance.Variables;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -20,6 +22,8 @@ namespace PTMedicalInsurance
         public AddSingleDirectory()
         {
             InitializeComponent();
+            this.cbChargeItemType.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
+            this.cbChargeItemType.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
         }
 
         public AddSingleDirectory(int direcType)
@@ -115,7 +119,7 @@ namespace PTMedicalInsurance
                 tbSafetyCode.Text = dr["DrugSafetyStandardCode"].ToString();
                 tbDosageName.Text = dr["DosageFormName"].ToString();
                 tbDosageCode.Text = dr["DosageFormCode"].ToString();
-                tbCategory.Text = dr["CategoryName"].ToString();
+                if (dr["CategoryCode"].ToString()!="") cbCategoryCode.Text = $"{dr["CategoryCode"].ToString()}.{dr["CategoryName"].ToString()}";
                 tbSpecification.Text = dr["Specification"].ToString();
                 tbUnitOfPackag.Text = dr["UnitOfPackag"].ToString();
                 tbUnitOfValuation.Text = dr["UnitOfValuation"].ToString();
@@ -138,16 +142,32 @@ namespace PTMedicalInsurance
                 tbNationalCode.Text = dr["NationalCode"].ToString();
                 tbNationalName.Text = dr["NationalName"].ToString();
                 tbManufacturers.Text = dr["Manufacturers"].ToString();
-                if (dr["ChargeItemLevel"].ToString() != "")
+                tbSelfPercent.Text = dr["SelfPercent"].ToString();
+                tbChargeStandards.Text = dr["ChargeStandards"].ToString();
+                tbCeilingPrice.Text = dr["CeilingPrice"].ToString();
+                tbDirectoryPayPercent.Text = dr["DirectoryPayPercent"].ToString();
+                tbMinPackagingQuantity.Text = dr["MinPackagingQuantity"].ToString();
+                if (dr["ChargeItemLevel"].ToString() != "")  cbxChargeItemLevel.Text = $"{dr["ChargeItemLevel"].ToString()}.{dr["ChargeItemLevelName"].ToString()}";
+                string ChargeItemType = dr["ChargeItemTypeCode"].ToString();
+                string ChargeItemTypeText = "";
+                foreach (var item in cbChargeItemType.Items)
                 {
-                    cbxChargeItemLevel.SelectedIndex = int.Parse(dr["ChargeItemLevel"].ToString()) - 1;
+                    if (ChargeItemType == tools.getDestPosStrBySpliter(item.ToString(), 1, "."))
+                    {
+                        ChargeItemTypeText = item.ToString();
+                        break;
+                    }
+                }
+
+                if (ChargeItemTypeText != "")
+                {
+                    cbChargeItemType.Text = ChargeItemTypeText;
                 }
                 else
                 {
-                    cbxChargeItemLevel.Text = dr["ChargeItemLevel"].ToString();
+                    cbChargeItemType.Text = ChargeItemType;
                 }
-                
-                tbCompany.Text = dr["Company"].ToString();
+                //tbCompany.Text = dr["Company"].ToString();
             }
             catch (Exception ex)
             {
@@ -164,12 +184,6 @@ namespace PTMedicalInsurance
                 pym = "";
             }
 
-            string ChargeItemLevel = cbxChargeItemLevel.Text;
-            if (ChargeItemLevel != "")
-            {
-                ChargeItemLevel = "0" + (cbxChargeItemLevel.SelectedIndex + 1).ToString();
-            }
-
             joPamam.Add("Code",tbCode.Text);
             joPamam.Add("Name", tbName.Text);
             joPamam.Add("HisType",direcType + 1);
@@ -179,8 +193,8 @@ namespace PTMedicalInsurance
             joPamam.Add("DrugSafetyStandardCode", tbSafetyCode.Text);
             joPamam.Add("DosageFormCode", tbDosageCode.Text);
             joPamam.Add("DosageFormName", tbDosageName.Text);
-            joPamam.Add("CategoryCode", tbCategory.Text);
-            joPamam.Add("CategoryName", "");
+            joPamam.Add("CategoryCode", tools.getDestPosStrBySpliter(cbCategoryCode.Text,1,"."));
+            joPamam.Add("CategoryName", tools.getDestPosStrBySpliter(cbCategoryCode.Text, 2, "."));
             joPamam.Add("Specification", tbSpecification.Text);
             joPamam.Add("SpecificationCode", "");
             joPamam.Add("UnitOfPackag", tbUnitOfPackag.Text);
@@ -205,8 +219,15 @@ namespace PTMedicalInsurance
             joPamam.Add("NationalName", tbNationalName.Text);
             joPamam.Add("Manufacturers", tbManufacturers.Text);
             joPamam.Add("UpdateTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
-            joPamam.Add("ChargeItemLevel", ChargeItemLevel);
-            joPamam.Add("Company", tbCompany.Text);
+            joPamam.Add("ChargeItemLevel", tools.getDestPosStrBySpliter(cbxChargeItemLevel.Text,1,"."));
+            //joPamam.Add("Company", tbCompany.Text);
+            joPamam.Add("ChargeItemType", tools.getDestPosStrBySpliter(cbChargeItemType.Text, 1, "."));
+            joPamam.Add("CeilingPrice", tbCeilingPrice.Text);
+            joPamam.Add("DirectoryPayPercent", tbDirectoryPayPercent.Text);
+            joPamam.Add("ChargeStandards", tbChargeStandards.Text);
+            joPamam.Add("SelfPercent", tbSelfPercent.Text);
+            joPamam.Add("MinPackagingQuantity", tbMinPackagingQuantity.Text);
+
         }
 
         private void initDrugForm()
@@ -218,44 +239,19 @@ namespace PTMedicalInsurance
             lbCompany.ForeColor = Color.Red;
         }
 
-        private void initMedicalServiceForm()
-        {
-
-           
-        }
-        private void initMaterialsForm()
-        {
-
-        }
-
-        private void initDiagnoseForm()
-        {
+       
 
-        }
-        private void initDictionaryForm()
+        private void btnYes_Click(object sender, EventArgs e)
         {
-
+            AssignToJoParam();
+            DialogResult = DialogResult.OK;
         }
 
-        private void textBox23_TextChanged(object sender, EventArgs e)
+        private void cbChargeItemType_TextUpdate(object sender, EventArgs e)
         {
 
         }
 
-        private void lbUniqueRecordNO_Click(object sender, EventArgs e)
-        {
-
-        }
 
-        private void tbUniqueRecordNO_TextChanged(object sender, EventArgs e)
-        {
-
-        }
-
-        private void btnYes_Click(object sender, EventArgs e)
-        {
-            AssignToJoParam();
-            DialogResult = DialogResult.OK;
-        }
     }
 }

Forms/AddSignleDirectory.designer.cs

@@ -47,7 +47,6 @@
             this.lbDosageName = new System.Windows.Forms.Label();
             this.tbDosageName = new System.Windows.Forms.TextBox();
             this.lbCategory = new System.Windows.Forms.Label();
-            this.tbCategory = new System.Windows.Forms.TextBox();
             this.lbSpecification = new System.Windows.Forms.Label();
             this.tbSpecification = new System.Windows.Forms.TextBox();
             this.lbEndDate = new System.Windows.Forms.Label();
@@ -82,6 +81,19 @@
             this.lbStartDate = new System.Windows.Forms.Label();
             this.tbStartDate = new System.Windows.Forms.TextBox();
             this.pnlClient = new System.Windows.Forms.Panel();
+            this.cbCategoryCode = new System.Windows.Forms.ComboBox();
+            this.cbChargeItemType = new System.Windows.Forms.ComboBox();
+            this.label6 = new System.Windows.Forms.Label();
+            this.tbMinPackagingQuantity = new System.Windows.Forms.TextBox();
+            this.label5 = new System.Windows.Forms.Label();
+            this.tbChargeStandards = new System.Windows.Forms.TextBox();
+            this.label4 = new System.Windows.Forms.Label();
+            this.tbCeilingPrice = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.tbDirectoryPayPercent = new System.Windows.Forms.TextBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.tbSelfPercent = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
             this.cbxChargeItemLevel = new System.Windows.Forms.ComboBox();
             this.tbCompany = new System.Windows.Forms.TextBox();
             this.lbCompany = new System.Windows.Forms.Label();
@@ -121,7 +133,7 @@
             this.pnlTop.Location = new System.Drawing.Point(0, 0);
             this.pnlTop.Margin = new System.Windows.Forms.Padding(4);
             this.pnlTop.Name = "pnlTop";
-            this.pnlTop.Size = new System.Drawing.Size(1424, 51);
+            this.pnlTop.Size = new System.Drawing.Size(1442, 51);
             this.pnlTop.TabIndex = 0;
             // 
             // cbValidFlag
@@ -206,16 +218,16 @@
             this.pnlBottom.Controls.Add(this.btnNo);
             this.pnlBottom.Controls.Add(this.btnYes);
             this.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pnlBottom.Location = new System.Drawing.Point(0, 604);
+            this.pnlBottom.Location = new System.Drawing.Point(0, 641);
             this.pnlBottom.Margin = new System.Windows.Forms.Padding(4);
             this.pnlBottom.Name = "pnlBottom";
-            this.pnlBottom.Size = new System.Drawing.Size(1424, 63);
+            this.pnlBottom.Size = new System.Drawing.Size(1442, 63);
             this.pnlBottom.TabIndex = 2;
             // 
             // btnNo
             // 
             this.btnNo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnNo.Location = new System.Drawing.Point(1254, 21);
+            this.btnNo.Location = new System.Drawing.Point(1272, 21);
             this.btnNo.Margin = new System.Windows.Forms.Padding(4);
             this.btnNo.Name = "btnNo";
             this.btnNo.Size = new System.Drawing.Size(127, 29);
@@ -227,7 +239,7 @@
             // btnYes
             // 
             this.btnYes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnYes.Location = new System.Drawing.Point(1099, 21);
+            this.btnYes.Location = new System.Drawing.Point(1117, 21);
             this.btnYes.Margin = new System.Windows.Forms.Padding(4);
             this.btnYes.Name = "btnYes";
             this.btnYes.Size = new System.Drawing.Size(127, 29);
@@ -316,17 +328,9 @@
             this.lbCategory.Location = new System.Drawing.Point(1042, 61);
             this.lbCategory.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbCategory.Name = "lbCategory";
-            this.lbCategory.Size = new System.Drawing.Size(37, 15);
+            this.lbCategory.Size = new System.Drawing.Size(67, 15);
             this.lbCategory.TabIndex = 8;
-            this.lbCategory.Text = "类别";
-            // 
-            // tbCategory
-            // 
-            this.tbCategory.Location = new System.Drawing.Point(1150, 61);
-            this.tbCategory.Margin = new System.Windows.Forms.Padding(4);
-            this.tbCategory.Name = "tbCategory";
-            this.tbCategory.Size = new System.Drawing.Size(248, 25);
-            this.tbCategory.TabIndex = 9;
+            this.lbCategory.Text = "目录类别";
             // 
             // lbSpecification
             // 
@@ -446,7 +450,6 @@
             this.lbUniqueRecordNO.Size = new System.Drawing.Size(82, 15);
             this.lbUniqueRecordNO.TabIndex = 40;
             this.lbUniqueRecordNO.Text = "唯一记录号";
-            this.lbUniqueRecordNO.Click += new System.EventHandler(this.lbUniqueRecordNO_Click);
             // 
             // tbUniqueRecordNO
             // 
@@ -455,7 +458,6 @@
             this.tbUniqueRecordNO.Name = "tbUniqueRecordNO";
             this.tbUniqueRecordNO.Size = new System.Drawing.Size(225, 25);
             this.tbUniqueRecordNO.TabIndex = 41;
-            this.tbUniqueRecordNO.TextChanged += new System.EventHandler(this.tbUniqueRecordNO_TextChanged);
             // 
             // lbManufacturers
             // 
@@ -631,6 +633,19 @@
             // 
             // pnlClient
             // 
+            this.pnlClient.Controls.Add(this.cbCategoryCode);
+            this.pnlClient.Controls.Add(this.cbChargeItemType);
+            this.pnlClient.Controls.Add(this.label6);
+            this.pnlClient.Controls.Add(this.tbMinPackagingQuantity);
+            this.pnlClient.Controls.Add(this.label5);
+            this.pnlClient.Controls.Add(this.tbChargeStandards);
+            this.pnlClient.Controls.Add(this.label4);
+            this.pnlClient.Controls.Add(this.tbCeilingPrice);
+            this.pnlClient.Controls.Add(this.label3);
+            this.pnlClient.Controls.Add(this.tbDirectoryPayPercent);
+            this.pnlClient.Controls.Add(this.label2);
+            this.pnlClient.Controls.Add(this.tbSelfPercent);
+            this.pnlClient.Controls.Add(this.label1);
             this.pnlClient.Controls.Add(this.cbxChargeItemLevel);
             this.pnlClient.Controls.Add(this.tbCompany);
             this.pnlClient.Controls.Add(this.lbCompany);
@@ -670,7 +685,6 @@
             this.pnlClient.Controls.Add(this.lbEndDate);
             this.pnlClient.Controls.Add(this.tbSpecification);
             this.pnlClient.Controls.Add(this.lbSpecification);
-            this.pnlClient.Controls.Add(this.tbCategory);
             this.pnlClient.Controls.Add(this.lbCategory);
             this.pnlClient.Controls.Add(this.tbDosageName);
             this.pnlClient.Controls.Add(this.lbDosageName);
@@ -686,17 +700,309 @@
             this.pnlClient.Location = new System.Drawing.Point(0, 51);
             this.pnlClient.Margin = new System.Windows.Forms.Padding(4);
             this.pnlClient.Name = "pnlClient";
-            this.pnlClient.Size = new System.Drawing.Size(1424, 553);
+            this.pnlClient.Size = new System.Drawing.Size(1442, 590);
             this.pnlClient.TabIndex = 1;
             this.pnlClient.Paint += new System.Windows.Forms.PaintEventHandler(this.pnlClient_Paint);
             // 
+            // cbCategoryCode
+            // 
+            this.cbCategoryCode.AutoCompleteCustomSource.AddRange(new string[] {
+            "101.西药中成药",
+            "102.重要饮片",
+            "103.自制剂",
+            "104.民族药",
+            "201.医疗服务项目",
+            "301.医用耗材"});
+            this.cbCategoryCode.FormattingEnabled = true;
+            this.cbCategoryCode.Items.AddRange(new object[] {
+            "101.西药中成药",
+            "102.重要饮片",
+            "103.自制剂",
+            "104.民族药",
+            "201.医疗服务项目",
+            "301.医用耗材"});
+            this.cbCategoryCode.Location = new System.Drawing.Point(1151, 61);
+            this.cbCategoryCode.Name = "cbCategoryCode";
+            this.cbCategoryCode.Size = new System.Drawing.Size(248, 23);
+            this.cbCategoryCode.TabIndex = 105;
+            // 
+            // cbChargeItemType
+            // 
+            this.cbChargeItemType.FormattingEnabled = true;
+            this.cbChargeItemType.Items.AddRange(new object[] {
+            "01.床位费",
+            "0101.普通病房床位费",
+            "0102.急诊观察床床位费",
+            "0103.干部病房床位费",
+            "0104.监护病房床位费",
+            "0105.抢救病房床位费",
+            "0106.母婴同室床位费",
+            "0107.血液病房床位费",
+            "0108.等级医院住院床位费加收",
+            "0109.建床费",
+            "0110.三人间床位费",
+            "0111.双人间床位费",
+            "0112.单人间床位费",
+            "0113.特殊防护病房床位费",
+            "02.诊察费",
+            "0201.门（急）诊诊疗费（门诊医事服务费）",
+            "0202.住院诊疗费（住院医事服务费）",
+            "0203.门诊常规输液观察费",
+            "0204.门诊急诊加收",
+            "0205.留观费",
+            "0206.出诊费",
+            "03.检查费",
+            "0300.放射检查",
+            "0301.一般检查",
+            "0302.透视",
+            "0303.照像",
+            "0304.造影",
+            "0305.CT检查",
+            "0306.磁共振检查",
+            "0307.超声波检查",
+            "0308.普通B型(黑白)超声检查",
+            "0309.彩色多普勒超声检查",
+            "0310.超声心动图",
+            "0311.其它超声波检查",
+            "0312.核医学检查",
+            "0313.内镜检查",
+            "0314.电生理动态心电图",
+            "0315.检查用一次材料",
+            "0316.特检特治",
+            "04.化验费",
+            "0401.临床化验费",
+            "0402.普通化验费",
+            "0403.特殊化验费",
+            "0404.临床病理费",
+            "0405.普通病理费",
+            "0406.特殊病理费",
+            "05.治疗费",
+            "0501.一般治疗费",
+            "0502.会诊费",
+            "0503.抢救费",
+            "0504.理疗费",
+            "0505.康复治疗费",
+            "0508.其它一般治疗费",
+            "0509.高压氧治疗费",
+            "0510.激光治疗费",
+            "0511.血液透析治疗费",
+            "0512.放射治疗费",
+            "0513.介入治疗",
+            "0514.导管治疗",
+            "0515.射频治疗",
+            "0516.核素治疗",
+            "0517.口腔修复及正畸",
+            "0518.治疗用一次性医用材料",
+            "0519.进口贵重一次性材料",
+            "0520.一般一次性医用材料",
+            "06.手术费",
+            "0601.其它手术费",
+            "0602.心血管手术",
+            "0603.呼吸系手术",
+            "0604.消化系手术",
+            "0605.骨髓肌肉手术",
+            "0606.泌尿生殖系手术",
+            "0607.神经内分泌手术",
+            "0608.妇科计划生育类手术",
+            "0609.产科手术",
+            "0610.矫形手术",
+            "0611.接生费",
+            "0613.术中一次性材料费",
+            "0614.人工器官",
+            "0615.器官移植",
+            "07.护理费",
+            "0701.心脏体外循环直视术后护理费",
+            "0702.重伤烧伤护理费",
+            "0703.特级护理费",
+            "0704.一级护理费",
+            "0705.二级护理费",
+            "0706.三级护理费",
+            "0707.等级医院住院护理费加收",
+            "0708.专项护理",
+            "08.卫生材料费",
+            "0801.材料费",
+            "0802.内置材料",
+            "09.西药费",
+            "0901.甲类西药",
+            "0902.乙类西药",
+            "0903.其它类西药",
+            "10.中药饮片费",
+            "1001.复方可报",
+            "1002.单方可报",
+            "1003.其它类草药",
+            "11.中成药费",
+            "1101.甲类中成药",
+            "1102.乙类中成药",
+            "1103.其它类中成药",
+            "1104.民族药",
+            "12.一般诊疗费",
+            "13.挂号费",
+            "1301.普通门诊",
+            "1302.急诊",
+            "1303.假日门诊",
+            "1304.特约门诊",
+            "14.其他费",
+            "1401.特殊材料费",
+            "14011.血液及血液制品",
+            "14012.单病种除外内容",
+            "14013.单病种超标准床位费",
+            "14014.单病种定额标准费",
+            "1402.国产材料",
+            "14021.集中带量",
+            "1403.进口材料",
+            "14031.康复项目",
+            "1404.国谈药品",
+            "1405.手术材料费",
+            "1406.中草药及中医适宜技术",
+            "1407.救护车费",
+            "1408.MRI费",
+            "1409.CT费",
+            "1410.彩超费",
+            "1411.输氧费",
+            "1412.输血费",
+            "1413.麻醉费",
+            "1414.麻醉相关项目费",
+            "1415.其他医疗费",
+            "1416.取暖费",
+            "1417.陪住费",
+            "1418.婴幼儿住院材料费",
+            "1419.空调费",
+            "1420.尸体残肢",
+            "1421.伙食费",
+            "1422.住宿费",
+            "1423.交通费",
+            "145301.放射费",
+            "145303.特殊治疗费",
+            "145305.进口特殊材料",
+            "145306.进口人工器官",
+            "145307.国产特殊材料",
+            "145308.国产人工器官",
+            "145309.进口或合资材料",
+            "145310.普通材料费",
+            "145311.辅助器具",
+            "145312.特殊检查费",
+            "145314.诊疗费",
+            "15.氧费",
+            "16.血制品",
+            "17.人工晶体",
+            "18.医事服务费",
+            "19.药品",
+            "20.基本药物",
+            "21.服务及设施",
+            "22.医疗减免项目"});
+            this.cbChargeItemType.Location = new System.Drawing.Point(452, 275);
+            this.cbChargeItemType.Name = "cbChargeItemType";
+            this.cbChargeItemType.Size = new System.Drawing.Size(228, 23);
+            this.cbChargeItemType.TabIndex = 104;
+            this.cbChargeItemType.TextUpdate += new System.EventHandler(this.cbChargeItemType_TextUpdate);
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Location = new System.Drawing.Point(351, 276);
+            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(67, 15);
+            this.label6.TabIndex = 103;
+            this.label6.Text = "收费类别";
+            // 
+            // tbMinPackagingQuantity
+            // 
+            this.tbMinPackagingQuantity.Location = new System.Drawing.Point(134, 273);
+            this.tbMinPackagingQuantity.Margin = new System.Windows.Forms.Padding(4);
+            this.tbMinPackagingQuantity.Name = "tbMinPackagingQuantity";
+            this.tbMinPackagingQuantity.Size = new System.Drawing.Size(194, 25);
+            this.tbMinPackagingQuantity.TabIndex = 102;
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(29, 276);
+            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(97, 15);
+            this.label5.TabIndex = 101;
+            this.label5.Text = "最小包装数量";
+            // 
+            // tbChargeStandards
+            // 
+            this.tbChargeStandards.Location = new System.Drawing.Point(1150, 230);
+            this.tbChargeStandards.Margin = new System.Windows.Forms.Padding(4);
+            this.tbChargeStandards.Name = "tbChargeStandards";
+            this.tbChargeStandards.Size = new System.Drawing.Size(245, 25);
+            this.tbChargeStandards.TabIndex = 100;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(1045, 237);
+            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(67, 15);
+            this.label4.TabIndex = 99;
+            this.label4.Text = "收费标准";
+            // 
+            // tbCeilingPrice
+            // 
+            this.tbCeilingPrice.Location = new System.Drawing.Point(794, 237);
+            this.tbCeilingPrice.Margin = new System.Windows.Forms.Padding(4);
+            this.tbCeilingPrice.Name = "tbCeilingPrice";
+            this.tbCeilingPrice.Size = new System.Drawing.Size(228, 25);
+            this.tbCeilingPrice.TabIndex = 98;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(700, 240);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(67, 15);
+            this.label3.TabIndex = 97;
+            this.label3.Text = "最高限价";
+            // 
+            // tbDirectoryPayPercent
+            // 
+            this.tbDirectoryPayPercent.Location = new System.Drawing.Point(452, 237);
+            this.tbDirectoryPayPercent.Margin = new System.Windows.Forms.Padding(4);
+            this.tbDirectoryPayPercent.Name = "tbDirectoryPayPercent";
+            this.tbDirectoryPayPercent.Size = new System.Drawing.Size(228, 25);
+            this.tbDirectoryPayPercent.TabIndex = 96;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(351, 240);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(97, 15);
+            this.label2.TabIndex = 95;
+            this.label2.Text = "目录支付比例";
+            // 
+            // tbSelfPercent
+            // 
+            this.tbSelfPercent.Location = new System.Drawing.Point(100, 237);
+            this.tbSelfPercent.Margin = new System.Windows.Forms.Padding(4);
+            this.tbSelfPercent.Name = "tbSelfPercent";
+            this.tbSelfPercent.Size = new System.Drawing.Size(228, 25);
+            this.tbSelfPercent.TabIndex = 94;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(29, 240);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(67, 15);
+            this.label1.TabIndex = 93;
+            this.label1.Text = "自付比例";
+            // 
             // cbxChargeItemLevel
             // 
             this.cbxChargeItemLevel.FormattingEnabled = true;
             this.cbxChargeItemLevel.Items.AddRange(new object[] {
-            "甲类",
-            "乙类",
-            "丙类"});
+            "01.甲类",
+            "02.乙类",
+            "03.自费"});
             this.cbxChargeItemLevel.Location = new System.Drawing.Point(1150, 131);
             this.cbxChargeItemLevel.Name = "cbxChargeItemLevel";
             this.cbxChargeItemLevel.Size = new System.Drawing.Size(248, 23);
@@ -743,16 +1049,16 @@
             this.panel2.Controls.Add(this.gbExceptContent);
             this.panel2.Controls.Add(this.gbInstructions);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panel2.Location = new System.Drawing.Point(0, 293);
+            this.panel2.Location = new System.Drawing.Point(0, 330);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1424, 125);
+            this.panel2.Size = new System.Drawing.Size(1442, 125);
             this.panel2.TabIndex = 77;
             // 
             // gbExceptContent
             // 
             this.gbExceptContent.Controls.Add(this.rtbExceptContent);
             this.gbExceptContent.Dock = System.Windows.Forms.DockStyle.Right;
-            this.gbExceptContent.Location = new System.Drawing.Point(752, 0);
+            this.gbExceptContent.Location = new System.Drawing.Point(770, 0);
             this.gbExceptContent.Name = "gbExceptContent";
             this.gbExceptContent.Size = new System.Drawing.Size(672, 125);
             this.gbExceptContent.TabIndex = 78;
@@ -774,7 +1080,7 @@
             this.gbInstructions.Dock = System.Windows.Forms.DockStyle.Fill;
             this.gbInstructions.Location = new System.Drawing.Point(0, 0);
             this.gbInstructions.Name = "gbInstructions";
-            this.gbInstructions.Size = new System.Drawing.Size(1424, 125);
+            this.gbInstructions.Size = new System.Drawing.Size(1442, 125);
             this.gbInstructions.TabIndex = 77;
             this.gbInstructions.TabStop = false;
             this.gbInstructions.Text = "说明Instructions";
@@ -784,7 +1090,7 @@
             this.rtbInstructions.Dock = System.Windows.Forms.DockStyle.Fill;
             this.rtbInstructions.Location = new System.Drawing.Point(3, 21);
             this.rtbInstructions.Name = "rtbInstructions";
-            this.rtbInstructions.Size = new System.Drawing.Size(1418, 101);
+            this.rtbInstructions.Size = new System.Drawing.Size(1436, 101);
             this.rtbInstructions.TabIndex = 0;
             this.rtbInstructions.Text = "";
             // 
@@ -793,16 +1099,16 @@
             this.panel1.Controls.Add(this.groupBox3);
             this.panel1.Controls.Add(this.gbConnotation);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panel1.Location = new System.Drawing.Point(0, 418);
+            this.panel1.Location = new System.Drawing.Point(0, 455);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1424, 135);
+            this.panel1.Size = new System.Drawing.Size(1442, 135);
             this.panel1.TabIndex = 76;
             // 
             // groupBox3
             // 
             this.groupBox3.Controls.Add(this.rtbLimitRange);
             this.groupBox3.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBox3.Location = new System.Drawing.Point(752, 0);
+            this.groupBox3.Location = new System.Drawing.Point(770, 0);
             this.groupBox3.Name = "groupBox3";
             this.groupBox3.Size = new System.Drawing.Size(672, 135);
             this.groupBox3.TabIndex = 78;
@@ -824,7 +1130,7 @@
             this.gbConnotation.Dock = System.Windows.Forms.DockStyle.Fill;
             this.gbConnotation.Location = new System.Drawing.Point(0, 0);
             this.gbConnotation.Name = "gbConnotation";
-            this.gbConnotation.Size = new System.Drawing.Size(1424, 135);
+            this.gbConnotation.Size = new System.Drawing.Size(1442, 135);
             this.gbConnotation.TabIndex = 77;
             this.gbConnotation.TabStop = false;
             this.gbConnotation.Text = "项目内涵";
@@ -834,7 +1140,7 @@
             this.rtbConnotation.Dock = System.Windows.Forms.DockStyle.Fill;
             this.rtbConnotation.Location = new System.Drawing.Point(3, 21);
             this.rtbConnotation.Name = "rtbConnotation";
-            this.rtbConnotation.Size = new System.Drawing.Size(1418, 111);
+            this.rtbConnotation.Size = new System.Drawing.Size(1436, 111);
             this.rtbConnotation.TabIndex = 0;
             this.rtbConnotation.Text = "";
             // 
@@ -843,7 +1149,7 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoValidate = System.Windows.Forms.AutoValidate.EnableAllowFocusChange;
-            this.ClientSize = new System.Drawing.Size(1424, 667);
+            this.ClientSize = new System.Drawing.Size(1442, 704);
             this.Controls.Add(this.pnlClient);
             this.Controls.Add(this.pnlBottom);
             this.Controls.Add(this.pnlTop);
@@ -881,7 +1187,6 @@
         private System.Windows.Forms.Label lbDosageName;
         private System.Windows.Forms.TextBox tbDosageName;
         private System.Windows.Forms.Label lbCategory;
-        private System.Windows.Forms.TextBox tbCategory;
         private System.Windows.Forms.Label lbSpecification;
         private System.Windows.Forms.TextBox tbSpecification;
         private System.Windows.Forms.Label lbEndDate;
@@ -938,5 +1243,18 @@
         private System.Windows.Forms.TextBox tbCompany;
         private System.Windows.Forms.Label lbCompany;
         private System.Windows.Forms.ComboBox cbxChargeItemLevel;
+        private System.Windows.Forms.ComboBox cbCategoryCode;
+        private System.Windows.Forms.ComboBox cbChargeItemType;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.TextBox tbMinPackagingQuantity;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.TextBox tbChargeStandards;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.TextBox tbCeilingPrice;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.TextBox tbDirectoryPayPercent;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.TextBox tbSelfPercent;
+        private System.Windows.Forms.Label label1;
     }
 }

Forms/PreAndInProcessAnalysisForm.Designer.cs

@@ -44,6 +44,7 @@
             this.uiGroupBox3 = new Sunny.UI.UIGroupBox();
             this.dgvVolaItems = new Sunny.UI.UIDataGridView();
             this.uiGroupBox1 = new Sunny.UI.UIGroupBox();
+            this.rbtVolaContent = new Sunny.UI.UIRichTextBox();
             this.uiLabel1 = new Sunny.UI.UILabel();
             this.uiLabel2 = new Sunny.UI.UILabel();
             this.uiLabel3 = new Sunny.UI.UILabel();
@@ -57,22 +58,21 @@
             this.uiGroupBox2 = new Sunny.UI.UIGroupBox();
             this.dgvVolaDetailDtos = new Sunny.UI.UIDataGridView();
             this.uiPanel2 = new Sunny.UI.UIPanel();
-            this.rbtVolaContent = new Sunny.UI.UIRichTextBox();
-            this.tbJrID = new Sunny.UI.UITextBox();
-            this.tbRuleID = new Sunny.UI.UITextBox();
-            this.tbPatID = new Sunny.UI.UITextBox();
-            this.tbMdtrdID = new Sunny.UI.UITextBox();
-            this.tbVolaAmt = new Sunny.UI.UITextBox();
-            this.tbVolaAmtStas = new Sunny.UI.UITextBox();
-            this.tbSevDeg = new Sunny.UI.UITextBox();
-            this.tbVolaBhvrType = new Sunny.UI.UITextBox();
-            this.tbVolaEvid = new Sunny.UI.UITextBox();
             this.tbRuleName = new Sunny.UI.UITextBox();
+            this.tbVolaEvid = new Sunny.UI.UITextBox();
+            this.tbVolaBhvrType = new Sunny.UI.UITextBox();
+            this.tbSevDeg = new Sunny.UI.UITextBox();
+            this.tbVolaAmtStas = new Sunny.UI.UITextBox();
+            this.tbVolaAmt = new Sunny.UI.UITextBox();
+            this.tbMdtrdID = new Sunny.UI.UITextBox();
+            this.tbPatID = new Sunny.UI.UITextBox();
+            this.tbRuleID = new Sunny.UI.UITextBox();
+            this.tbJrID = new Sunny.UI.UITextBox();
             this.uiGroupBox4 = new Sunny.UI.UIGroupBox();
+            this.btnSave = new Sunny.UI.UIButton();
+            this.cbxDspoWay = new Sunny.UI.UIComboBox();
             this.uiGroupBox5 = new Sunny.UI.UIGroupBox();
             this.rtbDspoWayRea = new Sunny.UI.UIRichTextBox();
-            this.cbxDspoWay = new Sunny.UI.UIComboBox();
-            this.btnSave = new Sunny.UI.UIButton();
             this.uiPanel1.SuspendLayout();
             this.uiGroupBox3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvVolaItems)).BeginInit();
@@ -199,7 +199,6 @@
             this.dgvVolaItems.Size = new System.Drawing.Size(405, 780);
             this.dgvVolaItems.TabIndex = 0;
             this.dgvVolaItems.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            this.dgvVolaItems.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvVolaItems_CellContentClick);
             this.dgvVolaItems.SelectionChanged += new System.EventHandler(this.dgvVolaItems_SelectionChanged);
             // 
             // uiGroupBox1
@@ -219,6 +218,22 @@
             this.uiGroupBox1.TitleTop = 8;
             this.uiGroupBox1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
+            // rbtVolaContent
+            // 
+            this.rbtVolaContent.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.rbtVolaContent.FillColor = System.Drawing.Color.White;
+            this.rbtVolaContent.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.rbtVolaContent.Location = new System.Drawing.Point(0, 24);
+            this.rbtVolaContent.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.rbtVolaContent.MinimumSize = new System.Drawing.Size(1, 1);
+            this.rbtVolaContent.Name = "rbtVolaContent";
+            this.rbtVolaContent.Padding = new System.Windows.Forms.Padding(2);
+            this.rbtVolaContent.ShowText = false;
+            this.rbtVolaContent.Size = new System.Drawing.Size(763, 249);
+            this.rbtVolaContent.TabIndex = 0;
+            this.rbtVolaContent.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+            this.rbtVolaContent.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
             // uiLabel1
             // 
             this.uiLabel1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -435,77 +450,75 @@
             this.uiPanel2.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             this.uiPanel2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
-            // rbtVolaContent
+            // tbRuleName
             // 
-            this.rbtVolaContent.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.rbtVolaContent.FillColor = System.Drawing.Color.White;
-            this.rbtVolaContent.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rbtVolaContent.Location = new System.Drawing.Point(0, 24);
-            this.rbtVolaContent.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.rbtVolaContent.MinimumSize = new System.Drawing.Size(1, 1);
-            this.rbtVolaContent.Name = "rbtVolaContent";
-            this.rbtVolaContent.Padding = new System.Windows.Forms.Padding(2);
-            this.rbtVolaContent.ShowText = false;
-            this.rbtVolaContent.Size = new System.Drawing.Size(763, 249);
-            this.rbtVolaContent.TabIndex = 0;
-            this.rbtVolaContent.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
-            this.rbtVolaContent.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.tbRuleName.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.tbRuleName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tbRuleName.Location = new System.Drawing.Point(166, 324);
+            this.tbRuleName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tbRuleName.MinimumSize = new System.Drawing.Size(1, 16);
+            this.tbRuleName.Name = "tbRuleName";
+            this.tbRuleName.ShowText = false;
+            this.tbRuleName.Size = new System.Drawing.Size(1123, 24);
+            this.tbRuleName.TabIndex = 20;
+            this.tbRuleName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.tbRuleName.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
-            // tbJrID
+            // tbVolaEvid
             // 
-            this.tbJrID.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.tbJrID.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbJrID.Location = new System.Drawing.Point(166, 9);
-            this.tbJrID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.tbJrID.MinimumSize = new System.Drawing.Size(1, 16);
-            this.tbJrID.Name = "tbJrID";
-            this.tbJrID.ShowText = false;
-            this.tbJrID.Size = new System.Drawing.Size(321, 24);
-            this.tbJrID.TabIndex = 12;
-            this.tbJrID.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            this.tbJrID.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.tbVolaEvid.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.tbVolaEvid.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tbVolaEvid.Location = new System.Drawing.Point(166, 289);
+            this.tbVolaEvid.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tbVolaEvid.MinimumSize = new System.Drawing.Size(1, 16);
+            this.tbVolaEvid.Name = "tbVolaEvid";
+            this.tbVolaEvid.ShowText = false;
+            this.tbVolaEvid.Size = new System.Drawing.Size(1123, 24);
+            this.tbVolaEvid.TabIndex = 17;
+            this.tbVolaEvid.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.tbVolaEvid.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
-            // tbRuleID
+            // tbVolaBhvrType
             // 
-            this.tbRuleID.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.tbRuleID.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbRuleID.Location = new System.Drawing.Point(166, 44);
-            this.tbRuleID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.tbRuleID.MinimumSize = new System.Drawing.Size(1, 16);
-            this.tbRuleID.Name = "tbRuleID";
-            this.tbRuleID.ShowText = false;
-            this.tbRuleID.Size = new System.Drawing.Size(321, 24);
-            this.tbRuleID.TabIndex = 13;
-            this.tbRuleID.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            this.tbRuleID.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.tbVolaBhvrType.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.tbVolaBhvrType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tbVolaBhvrType.Location = new System.Drawing.Point(166, 254);
+            this.tbVolaBhvrType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tbVolaBhvrType.MinimumSize = new System.Drawing.Size(1, 16);
+            this.tbVolaBhvrType.Name = "tbVolaBhvrType";
+            this.tbVolaBhvrType.ShowText = false;
+            this.tbVolaBhvrType.Size = new System.Drawing.Size(321, 24);
+            this.tbVolaBhvrType.TabIndex = 19;
+            this.tbVolaBhvrType.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.tbVolaBhvrType.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
-            // tbPatID
+            // tbSevDeg
             // 
-            this.tbPatID.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.tbPatID.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbPatID.Location = new System.Drawing.Point(166, 79);
-            this.tbPatID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.tbPatID.MinimumSize = new System.Drawing.Size(1, 16);
-            this.tbPatID.Name = "tbPatID";
-            this.tbPatID.ShowText = false;
-            this.tbPatID.Size = new System.Drawing.Size(321, 24);
-            this.tbPatID.TabIndex = 14;
-            this.tbPatID.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            this.tbPatID.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.tbSevDeg.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.tbSevDeg.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tbSevDeg.Location = new System.Drawing.Point(166, 219);
+            this.tbSevDeg.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tbSevDeg.MinimumSize = new System.Drawing.Size(1, 16);
+            this.tbSevDeg.Name = "tbSevDeg";
+            this.tbSevDeg.ShowText = false;
+            this.tbSevDeg.Size = new System.Drawing.Size(321, 24);
+            this.tbSevDeg.TabIndex = 18;
+            this.tbSevDeg.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.tbSevDeg.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
-            // tbMdtrdID
+            // tbVolaAmtStas
             // 
-            this.tbMdtrdID.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.tbMdtrdID.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbMdtrdID.Location = new System.Drawing.Point(166, 114);
-            this.tbMdtrdID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.tbMdtrdID.MinimumSize = new System.Drawing.Size(1, 16);
-            this.tbMdtrdID.Name = "tbMdtrdID";
-            this.tbMdtrdID.ShowText = false;
-            this.tbMdtrdID.Size = new System.Drawing.Size(321, 24);
-            this.tbMdtrdID.TabIndex = 13;
-            this.tbMdtrdID.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            this.tbMdtrdID.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.tbVolaAmtStas.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.tbVolaAmtStas.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tbVolaAmtStas.Location = new System.Drawing.Point(166, 184);
+            this.tbVolaAmtStas.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tbVolaAmtStas.MinimumSize = new System.Drawing.Size(1, 16);
+            this.tbVolaAmtStas.Name = "tbVolaAmtStas";
+            this.tbVolaAmtStas.ShowText = false;
+            this.tbVolaAmtStas.Size = new System.Drawing.Size(321, 24);
+            this.tbVolaAmtStas.TabIndex = 16;
+            this.tbVolaAmtStas.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.tbVolaAmtStas.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // tbVolaAmt
             // 
@@ -521,75 +534,61 @@
             this.tbVolaAmt.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.tbVolaAmt.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
-            // tbVolaAmtStas
-            // 
-            this.tbVolaAmtStas.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.tbVolaAmtStas.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbVolaAmtStas.Location = new System.Drawing.Point(166, 184);
-            this.tbVolaAmtStas.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.tbVolaAmtStas.MinimumSize = new System.Drawing.Size(1, 16);
-            this.tbVolaAmtStas.Name = "tbVolaAmtStas";
-            this.tbVolaAmtStas.ShowText = false;
-            this.tbVolaAmtStas.Size = new System.Drawing.Size(321, 24);
-            this.tbVolaAmtStas.TabIndex = 16;
-            this.tbVolaAmtStas.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            this.tbVolaAmtStas.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            // 
-            // tbSevDeg
+            // tbMdtrdID
             // 
-            this.tbSevDeg.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.tbSevDeg.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbSevDeg.Location = new System.Drawing.Point(166, 219);
-            this.tbSevDeg.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.tbSevDeg.MinimumSize = new System.Drawing.Size(1, 16);
-            this.tbSevDeg.Name = "tbSevDeg";
-            this.tbSevDeg.ShowText = false;
-            this.tbSevDeg.Size = new System.Drawing.Size(321, 24);
-            this.tbSevDeg.TabIndex = 18;
-            this.tbSevDeg.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            this.tbSevDeg.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.tbMdtrdID.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.tbMdtrdID.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tbMdtrdID.Location = new System.Drawing.Point(166, 114);
+            this.tbMdtrdID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tbMdtrdID.MinimumSize = new System.Drawing.Size(1, 16);
+            this.tbMdtrdID.Name = "tbMdtrdID";
+            this.tbMdtrdID.ShowText = false;
+            this.tbMdtrdID.Size = new System.Drawing.Size(321, 24);
+            this.tbMdtrdID.TabIndex = 13;
+            this.tbMdtrdID.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.tbMdtrdID.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
-            // tbVolaBhvrType
+            // tbPatID
             // 
-            this.tbVolaBhvrType.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.tbVolaBhvrType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbVolaBhvrType.Location = new System.Drawing.Point(166, 254);
-            this.tbVolaBhvrType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.tbVolaBhvrType.MinimumSize = new System.Drawing.Size(1, 16);
-            this.tbVolaBhvrType.Name = "tbVolaBhvrType";
-            this.tbVolaBhvrType.ShowText = false;
-            this.tbVolaBhvrType.Size = new System.Drawing.Size(321, 24);
-            this.tbVolaBhvrType.TabIndex = 19;
-            this.tbVolaBhvrType.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            this.tbVolaBhvrType.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.tbPatID.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.tbPatID.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tbPatID.Location = new System.Drawing.Point(166, 79);
+            this.tbPatID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tbPatID.MinimumSize = new System.Drawing.Size(1, 16);
+            this.tbPatID.Name = "tbPatID";
+            this.tbPatID.ShowText = false;
+            this.tbPatID.Size = new System.Drawing.Size(321, 24);
+            this.tbPatID.TabIndex = 14;
+            this.tbPatID.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.tbPatID.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
-            // tbVolaEvid
+            // tbRuleID
             // 
-            this.tbVolaEvid.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.tbVolaEvid.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbVolaEvid.Location = new System.Drawing.Point(166, 289);
-            this.tbVolaEvid.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.tbVolaEvid.MinimumSize = new System.Drawing.Size(1, 16);
-            this.tbVolaEvid.Name = "tbVolaEvid";
-            this.tbVolaEvid.ShowText = false;
-            this.tbVolaEvid.Size = new System.Drawing.Size(1123, 24);
-            this.tbVolaEvid.TabIndex = 17;
-            this.tbVolaEvid.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            this.tbVolaEvid.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.tbRuleID.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.tbRuleID.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tbRuleID.Location = new System.Drawing.Point(166, 44);
+            this.tbRuleID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tbRuleID.MinimumSize = new System.Drawing.Size(1, 16);
+            this.tbRuleID.Name = "tbRuleID";
+            this.tbRuleID.ShowText = false;
+            this.tbRuleID.Size = new System.Drawing.Size(321, 24);
+            this.tbRuleID.TabIndex = 13;
+            this.tbRuleID.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.tbRuleID.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
-            // tbRuleName
+            // tbJrID
             // 
-            this.tbRuleName.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.tbRuleName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbRuleName.Location = new System.Drawing.Point(166, 324);
-            this.tbRuleName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.tbRuleName.MinimumSize = new System.Drawing.Size(1, 16);
-            this.tbRuleName.Name = "tbRuleName";
-            this.tbRuleName.ShowText = false;
-            this.tbRuleName.Size = new System.Drawing.Size(1123, 24);
-            this.tbRuleName.TabIndex = 20;
-            this.tbRuleName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            this.tbRuleName.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.tbJrID.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.tbJrID.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tbJrID.Location = new System.Drawing.Point(166, 9);
+            this.tbJrID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tbJrID.MinimumSize = new System.Drawing.Size(1, 16);
+            this.tbJrID.Name = "tbJrID";
+            this.tbJrID.ShowText = false;
+            this.tbJrID.Size = new System.Drawing.Size(321, 24);
+            this.tbJrID.TabIndex = 12;
+            this.tbJrID.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.tbJrID.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // uiGroupBox4
             // 
@@ -611,6 +610,41 @@
             this.uiGroupBox4.TitleTop = 8;
             this.uiGroupBox4.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
+            // btnSave
+            // 
+            this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnSave.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnSave.Location = new System.Drawing.Point(278, 19);
+            this.btnSave.MinimumSize = new System.Drawing.Size(1, 1);
+            this.btnSave.Name = "btnSave";
+            this.btnSave.Size = new System.Drawing.Size(100, 29);
+            this.btnSave.TabIndex = 7;
+            this.btnSave.Text = "保存";
+            this.btnSave.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnSave.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
+            // 
+            // cbxDspoWay
+            // 
+            this.cbxDspoWay.DataSource = null;
+            this.cbxDspoWay.FillColor = System.Drawing.Color.White;
+            this.cbxDspoWay.FilterMaxCount = 50;
+            this.cbxDspoWay.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cbxDspoWay.Items.AddRange(new object[] {
+            "",
+            "1.继续执行医嘱",
+            "2.返回修改医嘱"});
+            this.cbxDspoWay.Location = new System.Drawing.Point(10, 19);
+            this.cbxDspoWay.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.cbxDspoWay.MinimumSize = new System.Drawing.Size(63, 0);
+            this.cbxDspoWay.Name = "cbxDspoWay";
+            this.cbxDspoWay.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
+            this.cbxDspoWay.Size = new System.Drawing.Size(244, 29);
+            this.cbxDspoWay.TabIndex = 6;
+            this.cbxDspoWay.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.cbxDspoWay.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
             // uiGroupBox5
             // 
             this.uiGroupBox5.Controls.Add(this.rtbDspoWayRea);
@@ -645,40 +679,6 @@
             this.rtbDspoWayRea.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             this.rtbDspoWayRea.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
-            // cbxDspoWay
-            // 
-            this.cbxDspoWay.DataSource = null;
-            this.cbxDspoWay.FillColor = System.Drawing.Color.White;
-            this.cbxDspoWay.FilterMaxCount = 50;
-            this.cbxDspoWay.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cbxDspoWay.Items.AddRange(new object[] {
-            "1.继续执行医嘱",
-            "2.返回修改医嘱"});
-            this.cbxDspoWay.Location = new System.Drawing.Point(10, 19);
-            this.cbxDspoWay.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.cbxDspoWay.MinimumSize = new System.Drawing.Size(63, 0);
-            this.cbxDspoWay.Name = "cbxDspoWay";
-            this.cbxDspoWay.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
-            this.cbxDspoWay.Size = new System.Drawing.Size(244, 29);
-            this.cbxDspoWay.TabIndex = 6;
-            this.cbxDspoWay.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            this.cbxDspoWay.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            // 
-            // btnSave
-            // 
-            this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btnSave.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSave.Location = new System.Drawing.Point(288, 15);
-            this.btnSave.MinimumSize = new System.Drawing.Size(1, 1);
-            this.btnSave.Name = "btnSave";
-            this.btnSave.Size = new System.Drawing.Size(100, 35);
-            this.btnSave.TabIndex = 7;
-            this.btnSave.Text = "保存";
-            this.btnSave.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSave.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
-            // 
             // PreAndInProcessAnalysisForm
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;

Forms/PreAndInProcessAnalysisForm.cs

@@ -24,6 +24,7 @@ namespace PTMedicalInsurance.Forms
         public PreAndInProcessAnalysisForm()
         {
             InitializeComponent();
+            cbxDspoWay.SelectedIndex = 1;
         }
 
         public PreAndInProcessAnalysisForm(JObject jo)
@@ -49,18 +50,18 @@ namespace PTMedicalInsurance.Forms
 
         private void showVolaItemContent(JObject jo)
         {
-            tbJrID.Text = JsonHelper.getDestValue(jo, "jr_id");
-            tbRuleID.Text = JsonHelper.getDestValue(jo, "rule_id");
-            tbPatID.Text = JsonHelper.getDestValue(jo, "patn_id");
-            tbMdtrdID.Text = JsonHelper.getDestValue(jo, "mdtrt_id");
-            tbVolaAmt.Text = JsonHelper.getDestValue(jo, "vola_amt");
-            tbVolaAmtStas.Text = JsonHelper.getDestValue(jo, "vola_amt_stas");
-            tbSevDeg.Text = JsonHelper.getDestValue(jo, "sev_deg");
-            tbVolaBhvrType.Text = JsonHelper.getDestValue(jo, "vola_bhvr_type");
-            tbVolaEvid.Text = JsonHelper.getDestValue(jo, "vola_evid");
-            tbRuleName.Text = JsonHelper.getDestValue(jo, "rule_name");
-            rbtVolaContent.Text = JsonHelper.getDestValue(jo, "vola_cont");
-            dtVolaDetail = (DataTable)jo["judge_result_detail_dtos"].ToObject(typeof(DataTable));
+            tbJrID.Text = JsonHelper.getDestValue(jo, "jrId");
+            tbRuleID.Text = JsonHelper.getDestValue(jo, "ruleId");
+            tbPatID.Text = JsonHelper.getDestValue(jo, "patnId");
+            tbMdtrdID.Text = JsonHelper.getDestValue(jo, "mdtrtId");
+            tbVolaAmt.Text = JsonHelper.getDestValue(jo, "volaAmt");
+            tbVolaAmtStas.Text = JsonHelper.getDestValue(jo, "volaAmtStas");
+            tbSevDeg.Text = JsonHelper.getDestValue(jo, "sevDeg");
+            tbVolaBhvrType.Text = JsonHelper.getDestValue(jo, "volaBhvrType");
+            tbVolaEvid.Text = JsonHelper.getDestValue(jo, "volaEvid");
+            tbRuleName.Text = JsonHelper.getDestValue(jo, "ruleName");
+            rbtVolaContent.Text = JsonHelper.getDestValue(jo, "volaCont");
+            dtVolaDetail = (DataTable)jo["judgeResultDetailDtos"].ToObject(typeof(DataTable));
             dgvVolaDetailDtos.DataSource = dtVolaDetail;
             grdSetter.SetHeaderTextOfPAIPAVolaDetailDtos(dgvVolaDetailDtos);
         }
@@ -81,20 +82,6 @@ namespace PTMedicalInsurance.Forms
             showVolaItemContent((JObject)jaVolaItems[i]);
         }
 
-        private void dgvVolaItems_CellContentClick(object sender, DataGridViewCellEventArgs e)
-        {
-
-        }
-
-        private void uiRichTextBox1_TextChanged(object sender, EventArgs e)
-        {
-
-        }
-
-        private void uiDataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e)
-        {
-
-        }
 
         private void btnSave_Click(object sender, EventArgs e)
         {
@@ -110,8 +97,8 @@ namespace PTMedicalInsurance.Forms
             int i = dgvVolaItems.CurrentRow.Index;
             JObject jo= (JObject)jaVolaItems[i];
             JObject joTmp = new JObject();
-            joTmp.Add("warnRsltId", JsonHelper.getDestValue(jo, "jr_id"));
-            joTmp.Add("dspoWay", cbxDspoWay.SelectedIndex);
+            joTmp.Add("warnRsltId", JsonHelper.getDestValue(jo, "jrId"));
+            joTmp.Add("dspoWay", cbxDspoWay.SelectedIndex );
             joTmp.Add("dspoWayRea", rtbDspoWayRea.Text);
 
             jaWarns.Add(joTmp);

Helper/InvokeHelper.cs

@@ -252,8 +252,13 @@ namespace PTMedicalInsurance.Helper
                 case TradeEnum.FileDownload:
                     prefix = Global.inf.downURL;
                     break;
+                case TradeEnum.PreAnalysis:
+                    //prefix = @"http://10.153.50.218:8001/hsu/mihs/MihsServlet"; //正式
+                    prefix = @"http://10.153.50.179:8001/hsu/mihs/MihsServlet"; //测试
+                    break;
                 default:
                     prefix = Global.inf.centerURL;
+                    //prefix = @"http://10.153.50.179:8001/hsu/mihs/MihsServlet"; //测试
                     break;
             }
             // 根据情况确实是否需要加funNo

Helper/JsonHelper.cs

@@ -443,6 +443,14 @@ namespace PTMedicalInsurance.Helper
                 // 去掉包装
                 JObject joInput = Utils.removeWrapper(joParam);
                 jaParam.Add(joInput);
+                if (!joInparam.ContainsKey("HospitalDr"))
+                {
+                    joInparam.Add("HospitalDr", Global.inf.hospitalDr);
+                }
+                if (!joInparam.ContainsKey("InterfaceDr"))
+                {
+                    joInparam.Add("InterfaceDr", Global.inf.interfaceDr);
+                }
 
                 joInparam.Add("params", JArray.FromObject(jaParam));
                 joInparam.Add("session", Global.curEvt.jaSession);
@@ -469,7 +477,14 @@ namespace PTMedicalInsurance.Helper
                 joInparam.code = code;
                 dynamic joTmp = new JObject();
                 joInparam.Add("params", jaParams);
-                joInparam.Add("session", Global.curEvt.jaSession);
+                if (joInparam["InterfaceDr"] == null)
+                {
+                    joInparam.Add("InterfaceDr", Global.inf.interfaceDr);
+                }
+                if (joInparam["HospitalDr"] == null)
+                {
+                    joInparam.Add("HospitalDr", Global.inf.hospitalDr);
+                }
                 return joInparam;
             }
             catch (Exception ex)

InsuBusiness.cs

@@ -349,6 +349,7 @@ namespace PTMedicalInsurance
                         }
                     case "Z3"://入院费用上传
                         {
+                           
                             rtnResult = new InpatientFeeUploadProcess().Process(joParam).Data;
                             break;
                         }