|
|
@ -869,11 +869,11 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
|
|
|
//包含原来药品信息
|
|
|
// MediicinecabinetInventory inventory = inventoryDao.findOne(cargoId);
|
|
|
String sql = "SELECT\n" +
|
|
|
"\tsum(qty) AS qty,\n" +
|
|
|
"\tifnull(sum(qty), 0) AS qty,\n" +
|
|
|
"\tdrug_id AS drugId,\n" +
|
|
|
"\tdrug_code AS drugCode,\n" +
|
|
|
"\torg_code AS orgCode,\n" +
|
|
|
"\tsum(rated_inventory) AS ratedInventory\n" +
|
|
|
"\tifnull(sum(rated_inventory), 0) AS ratedInventory\n" +
|
|
|
"FROM\n" +
|
|
|
"\tt_mediicinecabinet_inventory\n" +
|
|
|
"WHERE\n" +
|
|
|
@ -892,7 +892,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
|
|
|
Map<String, Object> stringObjectMap = it.next();
|
|
|
if (String.valueOf(stringObjectMap.get("drugCode")).equals(medicineShipmentLog.getDrugCode()) &&
|
|
|
String.valueOf(stringObjectMap.get("orgCode")).equals(medicineShipmentLog.getOrgCode())) {
|
|
|
stringObjectMap.put("qty", String.valueOf(Integer.parseInt(stringObjectMap.get("qty") + "") - 1));
|
|
|
stringObjectMap.put("qty", String.valueOf((int)Double.parseDouble(stringObjectMap.get("qty") + "") - 1));
|
|
|
}
|
|
|
}
|
|
|
Mediicinedevice mediicinedevice = deviceDao.findMediicinedeviceByEquNum(medicineShipmentLog.getDeviceId());
|
|
|
@ -925,7 +925,6 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public JSONObject checkOrderComplete(String orderId) {
|
|
|
JSONObject result = new JSONObject();
|
|
|
if (orderId == null || StringUtils.isEmpty(orderId)) {
|
