feat: 增加进销存相关接口

Business/HisMainBusiness.cs

@@ -1457,7 +1457,10 @@ namespace PTMedicalInsurance.Business
                             pat.insuType = JsonHelper.getDestValue(joInparam, "params[0].patientInfo.selectedInsuInfo.insutype");
                             pat.insuplc_admdvs = JsonHelper.getDestValue(joInparam, "params[0].patientInfo.selectedInsuInfo.insuplc_admdvs");
                             pat.insuplc_name = JsonHelper.getDestValue(joInparam, "params[0].patientInfo.selectedInsuInfo.insuplc_name");
-
+                            if (string.IsNullOrEmpty(pat.insuplc_admdvs))
+                            {
+                                pat.insuplc_admdvs = JsonHelper.getDestValue(joInparam, "params[0].patientInfo.selectedInsuInfo.insu_orgCode");
+                            }
                             pat.mdtrtcertType = JsonHelper.getDestValue(joInparam, "params[0].patientInfo.selectedInsuInfo.mdtrt_cert_type");
                             pat.mdtrtcertNO = JsonHelper.getDestValue(joInparam, "params[0].patientInfo.selectedInsuInfo.mdtrt_cert_no");
                             pat.name = JsonHelper.getDestValue(joInparam, "params[0].patientInfo.output.baseinfo.psn_name");

Business/IrisServices.cs

@@ -508,35 +508,41 @@ namespace PTMedicalInsurance.Business
             joSumFee = new JObject();
 
             errMsg = "";
-            decimal ybAmt, psnAcctAmt, hospAmt, psnPartAmt, psnCashAmt, medFee,otherAmt;
+            decimal ybAmt, psnAcctAmt, hospAmt, psnPartAmt, psnCashAmt, medFee,otherAmt, mafPay, medisPay, fundAmt;
             try
             {
                 //getFee(jo, "hifp_pay") //基本医保统筹基金支出
                 //+ getFee(jo, "hifes_pay") //企业补充医疗保险基金支出（民政补助）
                 //+ getFee(jo, "hifmi_pay") //居民大病保险
-                //+ getFee(jo, "cvlserv_pay") //公务员医疗补助
-                //+ getFee(jo, "oth_pay"); //其他支出
-                otherAmt = getFee(jo, "hifob_pay") //职工大额医疗费用补助(民政补助）
-                      + getFee(jo, "maf_pay") //医疗救助基金支出（医疗补助）
-                      + getFee(jo, "poor_pay") //贫困人口再补助
-                      + getFee(jo, "medis_pay"); //医疗减免金额
-                      
-                ybAmt = getFee(jo, "insu_part_amt");  //ybfdje(医保负担金额)
+                //+ getFee(jo, "cvlserv_pay") //公务员医疗补助                
+                //mafPay = getFee(jo, "maf_pay"); //医疗救助基金支出（医疗补助\优抚补助）; //ylbzje
+                //medisPay = +getFee(jo, "medis_pay"); //医疗减免金额  //jmje
+
+                //otherAmt = getFee(jo, "oth_pay"); //其他支出
+                
+                ////基金支付总额
+                //fundAmt = getFee(jo, "hifob_pay") //职工大额医疗费用补助  //dezf
+                //      + mafPay + medisPay + otherAmt
+                //      + getFee(jo, "poor_pay"); //贫困人口再补助
+
                 psnAcctAmt = getFee(jo, "acct_pay");     //账户支付金额
                 psnCashAmt = getFee(jo, "psn_cash_pay"); //现金支付金额
                 psnPartAmt = getFee(jo, "psn_part_amt");
                 hospAmt = getFee(jo, "hosp_part_amt");   //医院承担金额
+
                 medFee = getFee(jo, "medfee_sumamt");    //总费用
+                ybAmt = medFee - psnAcctAmt - psnCashAmt - hospAmt;  //(医保支付金额)
+
                 joSumFee.Add("ybAmt", ybAmt);
                 joSumFee.Add("psnAcctAmt", psnAcctAmt);
                 joSumFee.Add("hospAmt", hospAmt);
                 joSumFee.Add("psnCashAmt", psnCashAmt);
                 //zje(medfee_sumamt) = ybfdje(fund_pay_sumamt) + brfdje(psn_part_amt) + ylbzje(maf_pay) + yyfdje(hosp_part_amt) + yljmje(medis_pay) + pkryzjzje(poor_pay) + mzbzje(hifob_pay)
 
-                decimal total = (ybAmt + psnAcctAmt  + psnCashAmt + hospAmt + otherAmt);
+                decimal total = (ybAmt + psnAcctAmt  + psnCashAmt + hospAmt);
                 if (medFee != total)
                 {
-                    Global.writeLog("ybAmt:"+ybAmt+ ",psnAcctAmt:" + psnAcctAmt + "psnCashAmt:"+ psnCashAmt + ",hospAmt:" + hospAmt+",otherAmt:"+otherAmt);
+                    Global.writeLog("ybAmt:"+ybAmt+ ",psnAcctAmt:" + psnAcctAmt + "psnCashAmt:"+ psnCashAmt + ",hospAmt:" + hospAmt);
                     errMsg = "总费用:" + medFee + "!= 医保费用:" + total;
                     return -1;
                 }
@@ -1087,6 +1093,7 @@ namespace PTMedicalInsurance.Business
                 JObject joTmp = JsonHelper.setIrisInpar("09010045", jaFee);
                 joTmp.Add("mdtrt_id", Global.pat.mdtrtID);
                 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);

Common/Utils.cs

@@ -299,7 +299,7 @@ namespace PTMedicalInsurance.Common
                 joOutput = mapper.MapRequest<JObject, T>(request);
             }
             // 日志
-            //Global.writeLog("ConvertRequest", request.ToString(),joOutput.ToString());
+            Global.writeLog("ConvertRequest", request.ToString(),joOutput.ToString());
             return joOutput;
         }
 

Variables/TradeEnum.cs

@@ -403,6 +403,35 @@ namespace PTMedicalInsurance
         [Trade("4101","结算清单上传")]
         SettlementBillUpload,
 
+        [Trade("3501", "商品盘存上传")]
+        StockUpload,
+
+        [Trade("3568", "商品库存信息")]
+        StockInfo,
+
+        [Trade("3502", "商品库存变更")]
+        StockChange,
+
+        [Trade("3503", "商品采购")]
+        CommodityPurchase,
+
+        [Trade("3504","商品采购退货")]
+        CommodityReturn,
+
+        [Trade("3505", "商品销售")]
+        CommoditySale,
+
+        [Trade("3506", "商品销售退货")]
+        CommoditySaleReturn,
+
+        [Trade("3507", "商品信息删除")]
+        CommodityRemove,
+
+        [Trade("3569", "商品企业信息")]
+        CommodityCorp,
+
+        [Trade("3570", "商品领用信息")]
+        CommodityReceive,
 
         #endregion