|
|
@ -2356,8 +2356,6 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
|
|
|
Mediicineorderdetail waitForTaking= new Mediicineorderdetail();
|
|
|
BeanUtils.copyProperties(mediicineorderdetail,waitForTaking);
|
|
|
waitForTaking.setQuantity(weiquyaoTotal+"");
|
|
|
weiQuYaolist.add(waitForTaking);
|
|
|
|
|
|
String secondSql = "SELECT\n" +
|
|
|
"\tifnull(\n" +
|
|
|
"\t\t(\n" +
|
|
|
@ -2366,7 +2364,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
|
|
|
"\t\t\tFROM\n" +
|
|
|
"\t\t\t\tt_mediicinecabinet_inventory t WHERE t.drug_code = '" + mediicineorderdetail.getDrugCode() + "'\n" +
|
|
|
"\t\t\tAND t.org_code = '" + mediicineorderdetail.getOrgCode() + "'\n" +
|
|
|
"\t\t\tAND t.cargo_state = '1'\n" +
|
|
|
"\t\t\tAND t.cargo_state = '1' and t.fault_state=1 " +
|
|
|
"\t\t\tAND CONCAT(IFNULL(t.`id_device`,''), IFNULL(t.`equ_num`,'')) like '%" + deviceId + "%'\n" +
|
|
|
"\t\t\tGROUP BY\n" +
|
|
|
"\t\t\t\tt.drug_code,\n" +
|
|
|
@ -2383,7 +2381,9 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
|
|
|
//详情无药
|
|
|
mediicineorderdetail.setOrderState("0");
|
|
|
map.put("orderStatus", "0");
|
|
|
waitForTaking.setOrderState("0");
|
|
|
}
|
|
|
weiQuYaolist.add(waitForTaking);
|
|
|
}
|
|
|
}
|
|
|
|
wangzhinan