称重条件判断异常

apps/drug/views.py

@@ -60,9 +60,8 @@ def drug_collect():
         data = Utils.false_return(msg="药剂已为空瓶")
     elif str(drug_entity.func_type) != str(func_type):
         data = Utils.false_return(msg="试剂不属于这里当前管理")
-    elif drug_entity.remain == '' or drug_entity.remain == None or not drug_entity:
-        if str(func_type) != "3":
-            data = Utils.false_return(msg="试剂未称重,请先称重！")
+    elif str(func_type) != "3" and (drug_entity.remain == '' or drug_entity.remain == None or not drug_entity):
+        data = Utils.false_return(msg="试剂未称重,请先称重！")
     else:
         customer_id = drug_entity.customer_id
         client_id = drug_entity.client_id