1550076451 %!s(int64=3) %!d(string=hace) años
padre
commit
461ab840fd

+ 34 - 9
RMYY_CallCenter_Api.Dal/T_Sys_DictDrug.cs

47
         {
47
         {
48
             StringBuilder strSql = new StringBuilder();
48
             StringBuilder strSql = new StringBuilder();
49
             strSql.Append("insert into T_Sys_DictDrug(");
49
             strSql.Append("insert into T_Sys_DictDrug(");
50
-            strSql.Append("F_DictDrugid,cDgDispCode,cDgName,cDgNameCode,cDgGeneralName,cDgSpecification,iDgMaxstock,iDgMinstock,cDgDescription,iDgStdPrice,iDgLocalStdPrice,F_CreateTime,F_IsDelete)");
50
+            strSql.Append("F_DictDrugid,cDgDispCode,cDgName,cDgNameCode,cDgGeneralName,cDgSpecification,iDgMaxstock,iDgMinstock,cDgDescription,iDgStdPrice,iDgLocalStdPrice,F_CreateTime,F_IsDelete,cManufacturer,iRetail)");
51
             strSql.Append(" values (");
51
             strSql.Append(" values (");
52
-            strSql.Append("@F_DictDrugid,@cDgDispCode,@cDgName,@cDgNameCode,@cDgGeneralName,@cDgSpecification,@iDgMaxstock,@iDgMinstock,@cDgDescription,@iDgStdPrice,@iDgLocalStdPrice,@F_CreateTime,@F_IsDelete)");
52
+            strSql.Append("@F_DictDrugid,@cDgDispCode,@cDgName,@cDgNameCode,@cDgGeneralName,@cDgSpecification,@iDgMaxstock,@iDgMinstock,@cDgDescription,@iDgStdPrice,@iDgLocalStdPrice,@F_CreateTime,@F_IsDelete,@cManufacturer,@iRetail)");
53
             strSql.Append(";select @@IDENTITY");
53
             strSql.Append(";select @@IDENTITY");
54
             SqlParameter[] parameters = {
54
             SqlParameter[] parameters = {
55
                     new SqlParameter("@F_DictDrugid", SqlDbType.Int,4),
55
                     new SqlParameter("@F_DictDrugid", SqlDbType.Int,4),
64
                     new SqlParameter("@iDgStdPrice", SqlDbType.Decimal,9),
64
                     new SqlParameter("@iDgStdPrice", SqlDbType.Decimal,9),
65
                     new SqlParameter("@iDgLocalStdPrice", SqlDbType.Decimal,9),
65
                     new SqlParameter("@iDgLocalStdPrice", SqlDbType.Decimal,9),
66
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
66
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
67
-                    new SqlParameter("@F_IsDelete", SqlDbType.Int,4)};
67
+                    new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
68
+                   new SqlParameter("@cManufacturer", SqlDbType.VarChar,200),
69
+                    new SqlParameter("@iRetail", SqlDbType.Decimal ,9)};
70
+
71
+          
68
             parameters[0].Value = model.F_DictDrugid;
72
             parameters[0].Value = model.F_DictDrugid;
69
             parameters[1].Value = model.cDgDispCode;
73
             parameters[1].Value = model.cDgDispCode;
70
             parameters[2].Value = model.cDgName;
74
             parameters[2].Value = model.cDgName;
78
             parameters[10].Value = model.iDgLocalStdPrice;
82
             parameters[10].Value = model.iDgLocalStdPrice;
79
             parameters[11].Value = model.F_CreateTime;
83
             parameters[11].Value = model.F_CreateTime;
80
             parameters[12].Value = model.F_IsDelete;
84
             parameters[12].Value = model.F_IsDelete;
81
-
85
+            parameters[13].Value = model.cManufacturer;
86
+            parameters[14].Value = model.iRetail;
87
+             
82
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
88
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
83
             if (obj == null)
89
             if (obj == null)
84
             {
90
             {
108
             strSql.Append("iDgStdPrice=@iDgStdPrice,");
114
             strSql.Append("iDgStdPrice=@iDgStdPrice,");
109
             strSql.Append("iDgLocalStdPrice=@iDgLocalStdPrice,");
115
             strSql.Append("iDgLocalStdPrice=@iDgLocalStdPrice,");
110
             strSql.Append("F_CreateTime=@F_CreateTime,");
116
             strSql.Append("F_CreateTime=@F_CreateTime,");
111
-            strSql.Append("F_IsDelete=@F_IsDelete");
117
+            strSql.Append("F_IsDelete=@F_IsDelete,");
118
+            strSql.Append("cManufacturer=@cManufacturer,");
119
+            strSql.Append("iRetail=@iRetail");
120
+            
112
             strSql.Append(" where F_ID=@F_ID");
121
             strSql.Append(" where F_ID=@F_ID");
113
             SqlParameter[] parameters = {
122
             SqlParameter[] parameters = {
114
                     new SqlParameter("@F_DictDrugid", SqlDbType.Int,4),
123
                     new SqlParameter("@F_DictDrugid", SqlDbType.Int,4),
124
                     new SqlParameter("@iDgLocalStdPrice", SqlDbType.Decimal,9),
133
                     new SqlParameter("@iDgLocalStdPrice", SqlDbType.Decimal,9),
125
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
134
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
126
                     new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
135
                     new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
136
+                     new SqlParameter("@cManufacturer", SqlDbType.VarChar,200),
137
+                    new SqlParameter("@iRetail", SqlDbType.Decimal ,9),
138
+                    
127
                     new SqlParameter("@F_ID", SqlDbType.Int,4)};
139
                     new SqlParameter("@F_ID", SqlDbType.Int,4)};
128
             parameters[0].Value = model.F_DictDrugid;
140
             parameters[0].Value = model.F_DictDrugid;
129
             parameters[1].Value = model.cDgDispCode;
141
             parameters[1].Value = model.cDgDispCode;
138
             parameters[10].Value = model.iDgLocalStdPrice;
150
             parameters[10].Value = model.iDgLocalStdPrice;
139
             parameters[11].Value = model.F_CreateTime;
151
             parameters[11].Value = model.F_CreateTime;
140
             parameters[12].Value = model.F_IsDelete;
152
             parameters[12].Value = model.F_IsDelete;
141
-            parameters[13].Value = model.F_ID;
153
+            parameters[13].Value = model.cManufacturer;
154
+            parameters[14].Value = model.iRetail;
155
+            
156
+            parameters[15].Value = model.F_ID;
142
 
157
 
143
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
158
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
144
             if (rows > 0)
159
             if (rows > 0)
202
         {
217
         {
203
 
218
 
204
             StringBuilder strSql = new StringBuilder();
219
             StringBuilder strSql = new StringBuilder();
205
-            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 ");
220
+            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 ");
206
             strSql.Append(" where F_ID=@F_ID");
221
             strSql.Append(" where F_ID=@F_ID");
207
             SqlParameter[] parameters = {
222
             SqlParameter[] parameters = {
208
                     new SqlParameter("@F_ID", SqlDbType.Int,4)
223
                     new SqlParameter("@F_ID", SqlDbType.Int,4)
286
                 {
301
                 {
287
                     model.F_IsDelete = int.Parse(row["F_IsDelete"].ToString());
302
                     model.F_IsDelete = int.Parse(row["F_IsDelete"].ToString());
288
                 }
303
                 }
304
+                if (row["iRetail"] != null && row["iRetail"].ToString() != "")
305
+                {
306
+                    model.iRetail = decimal.Parse(row["iRetail"].ToString());
307
+                }
308
+                if (row["cManufacturer"] != null)
309
+                {
310
+                    model.cManufacturer = row["cManufacturer"].ToString();
311
+                }
312
+
313
+                 
289
             }
314
             }
290
             return model;
315
             return model;
291
         }
316
         }
296
         public DataSet GetList(string strWhere)
321
         public DataSet GetList(string strWhere)
297
         {
322
         {
298
             StringBuilder strSql = new StringBuilder();
323
             StringBuilder strSql = new StringBuilder();
299
-            strSql.Append("select F_ID,F_DictDrugid,cDgDispCode,cDgName,cDgNameCode,cDgGeneralName,cDgSpecification,iDgMaxstock,iDgMinstock,cDgDescription,iDgStdPrice,iDgLocalStdPrice,F_CreateTime,F_IsDelete ");
324
+            strSql.Append("select F_ID,F_DictDrugid,cManufacturer,iRetail,cDgDispCode,cDgName,cDgNameCode,cDgGeneralName,cDgSpecification,iDgMaxstock,iDgMinstock,cDgDescription,iDgStdPrice,iDgLocalStdPrice,F_CreateTime,F_IsDelete ");
300
             strSql.Append(" FROM T_Sys_DictDrug ");
325
             strSql.Append(" FROM T_Sys_DictDrug ");
301
             if (strWhere.Trim() != "")
326
             if (strWhere.Trim() != "")
302
             {
327
             {
316
             {
341
             {
317
                 strSql.Append(" top " + Top.ToString());
342
                 strSql.Append(" top " + Top.ToString());
318
             }
343
             }
319
-            strSql.Append(" F_ID,F_DictDrugid,cDgDispCode,cDgName,cDgNameCode,cDgGeneralName,cDgSpecification,iDgMaxstock,iDgMinstock,cDgDescription,iDgStdPrice,iDgLocalStdPrice,F_CreateTime,F_IsDelete ");
344
+            strSql.Append(" F_ID,F_DictDrugid,cManufacturer,iRetail,cDgDispCode,cDgName,cDgNameCode,cDgGeneralName,cDgSpecification,iDgMaxstock,iDgMinstock,cDgDescription,iDgStdPrice,iDgLocalStdPrice,F_CreateTime,F_IsDelete ");
320
             strSql.Append(" FROM T_Sys_DictDrug ");
345
             strSql.Append(" FROM T_Sys_DictDrug ");
321
             if (strWhere.Trim() != "")
346
             if (strWhere.Trim() != "")
322
             {
347
             {

+ 7 - 0
RMYY_CallCenter_Api.Model/T_Sys_DictDrug.cs

143
         {
143
         {
144
             set;get;
144
             set;get;
145
         }
145
         }
146
+        /// <summary>
147
+        /// 单价
148
+        /// </summary>
149
+        public decimal? iRetail
150
+        {
151
+            set; get;
152
+        }
146
         #endregion Model
153
         #endregion Model
147
 
154
 
148
     }
155
     }

+ 27 - 10
RMYY_CallCenter_Api/Controllers/HospitalUserController.cs

202
 
202
 
203
         #region 获取药品
203
         #region 获取药品
204
         /// <summary>
204
         /// <summary>
205
-        /// 院区
205
+        /// 药品
206
         /// </summary>
206
         /// </summary>
207
         public class DictDrug
207
         public class DictDrug
208
         {
208
         {
209
-            public int id { set; get; }//主键id
209
+            public int noDictdrug { set; get; }//主键id
210
             public string cDgDispCode { set; get; }//药品编码
210
             public string cDgDispCode { set; get; }//药品编码
211
             public string cDgName { set; get; }//通用名
211
             public string cDgName { set; get; }//通用名
212
             public string cDgNameCode { set; get; }//拼音码
212
             public string cDgNameCode { set; get; }//拼音码
219
             public decimal iDgLocalStdPrice { set; get; }//地区限价
219
             public decimal iDgLocalStdPrice { set; get; }//地区限价
220
 
220
 
221
         }
221
         }
222
+
223
+        public class DictDrugact
224
+        {
225
+            public int NO_DrugAct { set; get; }//药品明细id
226
+            public int NO_DictDrug { set; get; }//药品id
227
+            public string cManufacturer { set; get; }//生产厂家
228
+            public decimal iRetail { set; get; }//单价
229
+          
230
+
231
+        }
222
         public ActionResult  DictDrugs()
232
         public ActionResult  DictDrugs()
223
         {
233
         {
224
             //  Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
234
             //  Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
228
             WebClient web = new WebClient();
238
             WebClient web = new WebClient();
229
             web.Encoding = Encoding.UTF8;
239
             web.Encoding = Encoding.UTF8;
230
             var responseString = web.DownloadString($"http://{ip}:{port}/{master}/webApi/DictDrug");
240
             var responseString = web.DownloadString($"http://{ip}:{port}/{master}/webApi/DictDrug");
231
-            LogHelper.Warn("DictDrugs-responseString:" + responseString);
232
             List<DictDrug> jo = JsonConvert.DeserializeObject<List<DictDrug>>(responseString);
241
             List<DictDrug> jo = JsonConvert.DeserializeObject<List<DictDrug>>(responseString);
233
-            LogHelper.Warn("DictDrugs-jo:" + jo.ToJson ());
242
+
243
+
244
+            var DictDrugactString = web.DownloadString($"http://{ip}:{port}/{master}/webApi/DictDrugact");
245
+            List<DictDrugact> DrugactString = JsonConvert.DeserializeObject<List<DictDrugact>>(DictDrugactString);
234
             if (jo != null && jo.Count() > 0)
246
             if (jo != null && jo.Count() > 0)
235
             {
247
             {
236
                 foreach (var it in jo)
248
                 foreach (var it in jo)
237
                 {
249
                 {
238
                     Model.T_Sys_DictDrug dictDrug = new T_Sys_DictDrug();
250
                     Model.T_Sys_DictDrug dictDrug = new T_Sys_DictDrug();
239
-                    dictDrug.F_DictDrugid  = it.id ;
251
+                    dictDrug.F_DictDrugid  = it.noDictdrug;
240
                     dictDrug.cDgDispCode = it.cDgDispCode;
252
                     dictDrug.cDgDispCode = it.cDgDispCode;
241
                     dictDrug.cDgName = it.cDgName;
253
                     dictDrug.cDgName = it.cDgName;
242
                     dictDrug.cDgNameCode = it.cDgNameCode;
254
                     dictDrug.cDgNameCode = it.cDgNameCode;
249
                     dictDrug.iDgLocalStdPrice = it.iDgLocalStdPrice;
261
                     dictDrug.iDgLocalStdPrice = it.iDgLocalStdPrice;
250
                     dictDrug.F_IsDelete = 0;
262
                     dictDrug.F_IsDelete = 0;
251
                     dictDrug.F_CreateTime = DateTime.Now;
263
                     dictDrug.F_CreateTime = DateTime.Now;
264
+                    if(DrugactString.Where (x=>x.NO_DictDrug ==it .noDictdrug).Count() >0)
265
+                    {
266
+                        dictDrug.cManufacturer = DrugactString.Where(x => x.NO_DictDrug == it.noDictdrug).FirstOrDefault().cManufacturer;
267
+                        dictDrug.iRetail = DrugactString.Where(x => x.NO_DictDrug == it.noDictdrug).FirstOrDefault().iRetail;
268
+                    }
252
                     new BLL.T_Sys_DictDrug().Add(dictDrug);
269
                     new BLL.T_Sys_DictDrug().Add(dictDrug);
253
                 }
270
                 }
254
             }
271
             }
1135
                 DictDrug it = JsonConvert.DeserializeObject<DictDrug>(RecordInfo);
1152
                 DictDrug it = JsonConvert.DeserializeObject<DictDrug>(RecordInfo);
1136
                 if (RecordChangeType == "Add")
1153
                 if (RecordChangeType == "Add")
1137
                 {
1154
                 {
1138
-                    if (list.Where(x => x.F_DictDrugid == it.id ).Count() <= 0)
1155
+                    if (list.Where(x => x.F_DictDrugid == it.noDictdrug).Count() <= 0)
1139
                     {
1156
                     {
1140
                         Model.T_Sys_DictDrug dictDrug = new T_Sys_DictDrug();
1157
                         Model.T_Sys_DictDrug dictDrug = new T_Sys_DictDrug();
1141
-                        dictDrug.F_DictDrugid = it.id;
1158
+                        dictDrug.F_DictDrugid = it.noDictdrug;
1142
                         dictDrug.cDgDispCode = it.cDgDispCode;
1159
                         dictDrug.cDgDispCode = it.cDgDispCode;
1143
                         dictDrug.cDgName = it.cDgName;
1160
                         dictDrug.cDgName = it.cDgName;
1144
                         dictDrug.cDgNameCode = it.cDgNameCode;
1161
                         dictDrug.cDgNameCode = it.cDgNameCode;
1186
                 }
1203
                 }
1187
                 else if (RecordChangeType == "Modify")
1204
                 else if (RecordChangeType == "Modify")
1188
                 {
1205
                 {
1189
-                    var model = list.Where(x => x.F_DictDrugid == it .id );
1206
+                    var model = list.Where(x => x.F_DictDrugid == it .noDictdrug);
1190
                     if (model != null && model.Count() >= 0)
1207
                     if (model != null && model.Count() >= 0)
1191
                     {
1208
                     {
1192
                         var dictDrug = model.FirstOrDefault();
1209
                         var dictDrug = model.FirstOrDefault();
1193
-                        dictDrug.F_DictDrugid = it.id;
1210
+                        dictDrug.F_DictDrugid = it.noDictdrug;
1194
                         dictDrug.cDgDispCode = it.cDgDispCode;
1211
                         dictDrug.cDgDispCode = it.cDgDispCode;
1195
                         dictDrug.cDgName = it.cDgName;
1212
                         dictDrug.cDgName = it.cDgName;
1196
                         dictDrug.cDgNameCode = it.cDgNameCode;
1213
                         dictDrug.cDgNameCode = it.cDgNameCode;
1236
                 }
1253
                 }
1237
                 else if (RecordChangeType == "Delete")
1254
                 else if (RecordChangeType == "Delete")
1238
                 {
1255
                 {
1239
-                    var model = list.Where(x => x.F_DictDrugid == it.id);
1256
+                    var model = list.Where(x => x.F_DictDrugid == it.noDictdrug);
1240
                     if (model != null && model.Count() >= 0)
1257
                     if (model != null && model.Count() >= 0)
1241
                     {
1258
                     {
1242
                         var dictDrug = model.FirstOrDefault();
1259
                         var dictDrug = model.FirstOrDefault();

+ 4 - 5
RMYY_CallCenter_Api/Controllers/SMSController.cs

22
         [AllowAnonymous]
22
         [AllowAnonymous]
23
         public ActionResult SendSms()
23
         public ActionResult SendSms()
24
         {
24
         {
25
-            var ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0);
26
-            return Success(Convert.ToInt64(ts.TotalSeconds).ToString(), Convert.ToInt64(ts.TotalMilliseconds ).ToString());
25
+            
27
             var obj = AddSmS(0, "12346", "17839539537", "");
26
             var obj = AddSmS(0, "12346", "17839539537", "");
28
             return Success("", obj);
27
             return Success("", obj);
29
         }
28
         }
57
                 var currentTime = Convert.ToInt64(ts.TotalSeconds).ToString();
56
                 var currentTime = Convert.ToInt64(ts.TotalSeconds).ToString();
58
                 Dictionary<string, string> values = new Dictionary<string, string>();
57
                 Dictionary<string, string> values = new Dictionary<string, string>();
59
                 values.Add("userid", Smsuserid);
58
                 values.Add("userid", Smsuserid);
60
-                values.Add("pwd", Smspwd);
59
+                values.Add("pwd", Md5(Smsuserid+ "00000000" + Smspwd+ currentTime) );
61
                 values.Add("mobile", mobiles);
60
                 values.Add("mobile", mobiles);
62
                 values.Add("content", Content);
61
                 values.Add("content", Content);
63
-                values.Add("content", Content);
64
-                values.Add("content", Content);
62
+                values.Add("timestamp", currentTime);
63
+                
65
                 string responseString = HttpMethods .HttpPost (Smsurl, values.ToJson (), "application/json;charset=UTF-8");
64
                 string responseString = HttpMethods .HttpPost (Smsurl, values.ToJson (), "application/json;charset=UTF-8");
66
                 JObject jo = (JObject)JsonConvert.DeserializeObject(responseString);
65
                 JObject jo = (JObject)JsonConvert.DeserializeObject(responseString);
67
                 if (jo["result"].ToString() == "0")
66
                 if (jo["result"].ToString() == "0")