修复可销毁空安瓿

jmai-physic/src/main/java/com/jmai/physic/entity/PhysicAmpoule.java

@@ -37,7 +37,9 @@ public class PhysicAmpoule extends BaseVersionEntity {
     @ApiModelProperty(value = "订单号")
     private String orderNo;
 
+    @ApiModelProperty(value = "批次结存")
     private Integer batchBalance;
+    @ApiModelProperty(value = "药品总结存")
     private Integer physicBalance;
 
     @ApiModelProperty(value = "状态：0-待接受退回、1-待退回复核、100-已完成（0-99审核中）")

jmai-physic/src/main/java/com/jmai/physic/service/impl/PhysicAmpouleServiceImpl.java

@@ -66,6 +66,8 @@ public class PhysicAmpouleServiceImpl extends AbstractService implements PhysicA
             ampoule.setPhysicNum(physic.getPhysicNum());
             ampoule.setType(req.getType());
             ampoule.setOrderNo(orderNo);
+            ampoule.setBatchBalance(null);
+            ampoule.setPhysicBalance(null);
             ampoule.setStatus(0);
             ampoule.setChUser(null);
             ampoule.setFhUser(null);

jmai-physic/src/main/resources/mapper/PhysicStorageAmpouleMapper.xml

@@ -54,8 +54,8 @@
             AND a.type = 2
             -- 销毁状态：0-待销毁 1-已销毁
             AND a.destroy_status = 0
-            -- 销毁状态：0-5审批中， 6-已销毁
-            AND (d.id IS NULL OR d.status != 6)
+            -- 销毁状态：0-5审批中， 100-已销毁
+            AND (d.id IS NULL OR d.status BETWEEN 0 AND 99)
         GROUP BY a.physic_name,a.physic_spec,a.batch_no,a.factory_name,a.accept_dept_id
     </select>
 </mapper>