短信药品

RMYY_CallCenter_Api.Dal/T_Sys_DictDrug.cs

@@ -47,9 +47,9 @@ namespace RMYY_CallCenter_Api.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Sys_DictDrug(");
-            strSql.Append("F_DictDrugid,cDgDispCode,cDgName,cDgNameCode,cDgGeneralName,cDgSpecification,iDgMaxstock,iDgMinstock,cDgDescription,iDgStdPrice,iDgLocalStdPrice,F_CreateTime,F_IsDelete)");
+            strSql.Append("F_DictDrugid,cDgDispCode,cDgName,cDgNameCode,cDgGeneralName,cDgSpecification,iDgMaxstock,iDgMinstock,cDgDescription,iDgStdPrice,iDgLocalStdPrice,F_CreateTime,F_IsDelete,cManufacturer,iRetail)");
             strSql.Append(" values (");
-            strSql.Append("@F_DictDrugid,@cDgDispCode,@cDgName,@cDgNameCode,@cDgGeneralName,@cDgSpecification,@iDgMaxstock,@iDgMinstock,@cDgDescription,@iDgStdPrice,@iDgLocalStdPrice,@F_CreateTime,@F_IsDelete)");
+            strSql.Append("@F_DictDrugid,@cDgDispCode,@cDgName,@cDgNameCode,@cDgGeneralName,@cDgSpecification,@iDgMaxstock,@iDgMinstock,@cDgDescription,@iDgStdPrice,@iDgLocalStdPrice,@F_CreateTime,@F_IsDelete,@cManufacturer,@iRetail)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_DictDrugid", SqlDbType.Int,4),
@@ -64,7 +64,11 @@ namespace RMYY_CallCenter_Api.DAL
                     new SqlParameter("@iDgStdPrice", SqlDbType.Decimal,9),
                     new SqlParameter("@iDgLocalStdPrice", SqlDbType.Decimal,9),
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
-                    new SqlParameter("@F_IsDelete", SqlDbType.Int,4)};
+                    new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
+                   new SqlParameter("@cManufacturer", SqlDbType.VarChar,200),
+                    new SqlParameter("@iRetail", SqlDbType.Decimal ,9)};
+
+          
             parameters[0].Value = model.F_DictDrugid;
             parameters[1].Value = model.cDgDispCode;
             parameters[2].Value = model.cDgName;
@@ -78,7 +82,9 @@ namespace RMYY_CallCenter_Api.DAL
             parameters[10].Value = model.iDgLocalStdPrice;
             parameters[11].Value = model.F_CreateTime;
             parameters[12].Value = model.F_IsDelete;
-
+            parameters[13].Value = model.cManufacturer;
+            parameters[14].Value = model.iRetail;
+             
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
@@ -108,7 +114,10 @@ namespace RMYY_CallCenter_Api.DAL
             strSql.Append("iDgStdPrice=@iDgStdPrice,");
             strSql.Append("iDgLocalStdPrice=@iDgLocalStdPrice,");
             strSql.Append("F_CreateTime=@F_CreateTime,");
-            strSql.Append("F_IsDelete=@F_IsDelete");
+            strSql.Append("F_IsDelete=@F_IsDelete,");
+            strSql.Append("cManufacturer=@cManufacturer,");
+            strSql.Append("iRetail=@iRetail");
+            
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_DictDrugid", SqlDbType.Int,4),
@@ -124,6 +133,9 @@ namespace RMYY_CallCenter_Api.DAL
                     new SqlParameter("@iDgLocalStdPrice", SqlDbType.Decimal,9),
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
                     new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
+                     new SqlParameter("@cManufacturer", SqlDbType.VarChar,200),
+                    new SqlParameter("@iRetail", SqlDbType.Decimal ,9),
+                    
                     new SqlParameter("@F_ID", SqlDbType.Int,4)};
             parameters[0].Value = model.F_DictDrugid;
             parameters[1].Value = model.cDgDispCode;
@@ -138,7 +150,10 @@ namespace RMYY_CallCenter_Api.DAL
             parameters[10].Value = model.iDgLocalStdPrice;
             parameters[11].Value = model.F_CreateTime;
             parameters[12].Value = model.F_IsDelete;
-            parameters[13].Value = model.F_ID;
+            parameters[13].Value = model.cManufacturer;
+            parameters[14].Value = model.iRetail;
+            
+            parameters[15].Value = model.F_ID;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -202,7 +217,7 @@ namespace RMYY_CallCenter_Api.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_ID,F_DictDrugid,cDgDispCode,cDgName,cDgNameCode,cDgGeneralName,cDgSpecification,iDgMaxstock,iDgMinstock,cDgDescription,iDgStdPrice,iDgLocalStdPrice,F_CreateTime,F_IsDelete from T_Sys_DictDrug ");
+            strSql.Append("select  top 1 F_ID,F_DictDrugid ,cManufacturer,iRetail,cDgDispCode,cDgName,cDgNameCode,cDgGeneralName,cDgSpecification,iDgMaxstock,iDgMinstock,cDgDescription,iDgStdPrice,iDgLocalStdPrice,F_CreateTime,F_IsDelete from T_Sys_DictDrug ");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_ID", SqlDbType.Int,4)
@@ -286,6 +301,16 @@ namespace RMYY_CallCenter_Api.DAL
                 {
                     model.F_IsDelete = int.Parse(row["F_IsDelete"].ToString());
                 }
+                if (row["iRetail"] != null && row["iRetail"].ToString() != "")
+                {
+                    model.iRetail = decimal.Parse(row["iRetail"].ToString());
+                }
+                if (row["cManufacturer"] != null)
+                {
+                    model.cManufacturer = row["cManufacturer"].ToString();
+                }
+
+                 
             }
             return model;
         }
@@ -296,7 +321,7 @@ namespace RMYY_CallCenter_Api.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_ID,F_DictDrugid,cDgDispCode,cDgName,cDgNameCode,cDgGeneralName,cDgSpecification,iDgMaxstock,iDgMinstock,cDgDescription,iDgStdPrice,iDgLocalStdPrice,F_CreateTime,F_IsDelete ");
+            strSql.Append("select F_ID,F_DictDrugid,cManufacturer,iRetail,cDgDispCode,cDgName,cDgNameCode,cDgGeneralName,cDgSpecification,iDgMaxstock,iDgMinstock,cDgDescription,iDgStdPrice,iDgLocalStdPrice,F_CreateTime,F_IsDelete ");
             strSql.Append(" FROM T_Sys_DictDrug ");
             if (strWhere.Trim() != "")
             {
@@ -316,7 +341,7 @@ namespace RMYY_CallCenter_Api.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_ID,F_DictDrugid,cDgDispCode,cDgName,cDgNameCode,cDgGeneralName,cDgSpecification,iDgMaxstock,iDgMinstock,cDgDescription,iDgStdPrice,iDgLocalStdPrice,F_CreateTime,F_IsDelete ");
+            strSql.Append(" F_ID,F_DictDrugid,cManufacturer,iRetail,cDgDispCode,cDgName,cDgNameCode,cDgGeneralName,cDgSpecification,iDgMaxstock,iDgMinstock,cDgDescription,iDgStdPrice,iDgLocalStdPrice,F_CreateTime,F_IsDelete ");
             strSql.Append(" FROM T_Sys_DictDrug ");
             if (strWhere.Trim() != "")
             {

RMYY_CallCenter_Api.Model/T_Sys_DictDrug.cs

@@ -143,6 +143,13 @@ namespace RMYY_CallCenter_Api.Model
         {
             set;get;
         }
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal? iRetail
+        {
+            set; get;
+        }
         #endregion Model
 
     }

RMYY_CallCenter_Api/Controllers/HospitalUserController.cs

@@ -202,11 +202,11 @@ namespace RMYY_CallCenter_Api.Controllers
 
         #region 获取药品
         /// <summary>
-        /// 院区
+        /// 药品
         /// </summary>
         public class DictDrug
         {
-            public int id { set; get; }//主键id
+            public int noDictdrug { set; get; }//主键id
             public string cDgDispCode { set; get; }//药品编码
             public string cDgName { set; get; }//通用名
             public string cDgNameCode { set; get; }//拼音码
@@ -219,6 +219,16 @@ namespace RMYY_CallCenter_Api.Controllers
             public decimal iDgLocalStdPrice { set; get; }//地区限价
 
         }
+
+        public class DictDrugact
+        {
+            public int NO_DrugAct { set; get; }//药品明细id
+            public int NO_DictDrug { set; get; }//药品id
+            public string cManufacturer { set; get; }//生产厂家
+            public decimal iRetail { set; get; }//单价
+          
+
+        }
         public ActionResult  DictDrugs()
         {
             //  Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
@@ -228,15 +238,17 @@ namespace RMYY_CallCenter_Api.Controllers
             WebClient web = new WebClient();
             web.Encoding = Encoding.UTF8;
             var responseString = web.DownloadString($"http://{ip}:{port}/{master}/webApi/DictDrug");
-            LogHelper.Warn("DictDrugs-responseString:" + responseString);
             List<DictDrug> jo = JsonConvert.DeserializeObject<List<DictDrug>>(responseString);
-            LogHelper.Warn("DictDrugs-jo:" + jo.ToJson ());
+
+
+            var DictDrugactString = web.DownloadString($"http://{ip}:{port}/{master}/webApi/DictDrugact");
+            List<DictDrugact> DrugactString = JsonConvert.DeserializeObject<List<DictDrugact>>(DictDrugactString);
             if (jo != null && jo.Count() > 0)
             {
                 foreach (var it in jo)
                 {
                     Model.T_Sys_DictDrug dictDrug = new T_Sys_DictDrug();
-                    dictDrug.F_DictDrugid  = it.id ;
+                    dictDrug.F_DictDrugid  = it.noDictdrug;
                     dictDrug.cDgDispCode = it.cDgDispCode;
                     dictDrug.cDgName = it.cDgName;
                     dictDrug.cDgNameCode = it.cDgNameCode;
@@ -249,6 +261,11 @@ namespace RMYY_CallCenter_Api.Controllers
                     dictDrug.iDgLocalStdPrice = it.iDgLocalStdPrice;
                     dictDrug.F_IsDelete = 0;
                     dictDrug.F_CreateTime = DateTime.Now;
+                    if(DrugactString.Where (x=>x.NO_DictDrug ==it .noDictdrug).Count() >0)
+                    {
+                        dictDrug.cManufacturer = DrugactString.Where(x => x.NO_DictDrug == it.noDictdrug).FirstOrDefault().cManufacturer;
+                        dictDrug.iRetail = DrugactString.Where(x => x.NO_DictDrug == it.noDictdrug).FirstOrDefault().iRetail;
+                    }
                     new BLL.T_Sys_DictDrug().Add(dictDrug);
                 }
             }
@@ -1135,10 +1152,10 @@ namespace RMYY_CallCenter_Api.Controllers
                 DictDrug it = JsonConvert.DeserializeObject<DictDrug>(RecordInfo);
                 if (RecordChangeType == "Add")
                 {
-                    if (list.Where(x => x.F_DictDrugid == it.id ).Count() <= 0)
+                    if (list.Where(x => x.F_DictDrugid == it.noDictdrug).Count() <= 0)
                     {
                         Model.T_Sys_DictDrug dictDrug = new T_Sys_DictDrug();
-                        dictDrug.F_DictDrugid = it.id;
+                        dictDrug.F_DictDrugid = it.noDictdrug;
                         dictDrug.cDgDispCode = it.cDgDispCode;
                         dictDrug.cDgName = it.cDgName;
                         dictDrug.cDgNameCode = it.cDgNameCode;
@@ -1186,11 +1203,11 @@ namespace RMYY_CallCenter_Api.Controllers
                 }
                 else if (RecordChangeType == "Modify")
                 {
-                    var model = list.Where(x => x.F_DictDrugid == it .id );
+                    var model = list.Where(x => x.F_DictDrugid == it .noDictdrug);
                     if (model != null && model.Count() >= 0)
                     {
                         var dictDrug = model.FirstOrDefault();
-                        dictDrug.F_DictDrugid = it.id;
+                        dictDrug.F_DictDrugid = it.noDictdrug;
                         dictDrug.cDgDispCode = it.cDgDispCode;
                         dictDrug.cDgName = it.cDgName;
                         dictDrug.cDgNameCode = it.cDgNameCode;
@@ -1236,7 +1253,7 @@ namespace RMYY_CallCenter_Api.Controllers
                 }
                 else if (RecordChangeType == "Delete")
                 {
-                    var model = list.Where(x => x.F_DictDrugid == it.id);
+                    var model = list.Where(x => x.F_DictDrugid == it.noDictdrug);
                     if (model != null && model.Count() >= 0)
                     {
                         var dictDrug = model.FirstOrDefault();

RMYY_CallCenter_Api/Controllers/SMSController.cs

@@ -22,8 +22,7 @@ namespace RMYY_CallCenter_Api.Controllers
         [AllowAnonymous]
         public ActionResult SendSms()
         {
-            var ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0);
-            return Success(Convert.ToInt64(ts.TotalSeconds).ToString(), Convert.ToInt64(ts.TotalMilliseconds ).ToString());
+            
             var obj = AddSmS(0, "12346", "17839539537", "");
             return Success("", obj);
         }
@@ -57,11 +56,11 @@ namespace RMYY_CallCenter_Api.Controllers
                 var currentTime = Convert.ToInt64(ts.TotalSeconds).ToString();
                 Dictionary<string, string> values = new Dictionary<string, string>();
                 values.Add("userid", Smsuserid);
-                values.Add("pwd", Smspwd);
+                values.Add("pwd", Md5(Smsuserid+ "00000000" + Smspwd+ currentTime) );
                 values.Add("mobile", mobiles);
                 values.Add("content", Content);
-                values.Add("content", Content);
-                values.Add("content", Content);
+                values.Add("timestamp", currentTime);
+                
                 string responseString = HttpMethods .HttpPost (Smsurl, values.ToJson (), "application/json;charset=UTF-8");
                 JObject jo = (JObject)JsonConvert.DeserializeObject(responseString);
                 if (jo["result"].ToString() == "0")