Commit 179ea63b by ruyun.zhang@suvalue.com

Merge remote-tracking branch 'origin/develop' into develop

parents d3babb6f 89d5c7c1
...@@ -232,7 +232,7 @@ private void HisData(per_allot allot, sys_hospitalconfig config, his_script scri ...@@ -232,7 +232,7 @@ private void HisData(per_allot allot, sys_hospitalconfig config, his_script scri
var data = queryService.QueryData<HisData>(config, script.ExecScript, allot, isSingle); var data = queryService.QueryData<HisData>(config, script.ExecScript, allot, isSingle);
if (data == null || !data.Any()) return; if (data == null || !data.Any()) return;
var hisdata = hisdataRepository.GetEntities(t => t.HospitalId == allot.HospitalId && t.Year == allot.Year && t.Month == allot.Month var hisdata = hisdataRepository.GetEntities(t => t.HospitalId == allot.HospitalId && t.Year == allot.Year && t.Month == allot.Month
&& t.SourceType == script.SourceType && t.Category == script.Category); && t.SourceType == script.SourceType && t.Category == script.Category);
if (hisdata != null && hisdata.Any()) if (hisdata != null && hisdata.Any())
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment