Merge branch 'develop' into lmm

src/app/components/configurationCenter/configuration-drug/configuration-drug.component.ts

@@ -175,12 +175,12 @@ export class ConfigurationDrugComponent implements OnInit {
       return;
     }
 
-    if(this.activeDictionary.postData.drugsStartCheck[0].checked && !this.activeDictionary.postData.drugsStartCheckScanIds.length){
+    if(this.activeDictionary.postData.drugsStartCheck[0].checked && !this.activeDictionary.postData.drugsStartCheckScanIds.filter(v => v.checked).length){
       this.msg.create("warning", "请选择起点科室的核对方式！");
       return;
     }
 
-    if(this.activeDictionary.postData.drugsEndCheck[0].checked && !this.activeDictionary.postData.drugsEndCheckScanIds.length){
+    if(this.activeDictionary.postData.drugsEndCheck[0].checked && !this.activeDictionary.postData.drugsEndCheckScanIds.filter(v => v.checked).length){
       this.msg.create("warning", "请选择终点科室的核对方式！");
       return;
     }