Merge branch 'dev' of chaoren1/wlyy2.0 into medicare

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicinedeviceService.java

@@ -2094,6 +2094,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                    "\t\t\t\t\tt_medicine_drug_inventory_record\n" +
                    "\t\t\t\tWHERE\n" +
                    "\t\t\t\t\tdevice_id = '"+stringObjectMap.get("id").toString()+"'\n" +
                    "\t\t\t\t\tand type = '1'\n" +
                    "\t\t\t),\n" +
                    "\t\t\t0\n" +
                    "\t\t)\n" +