|
@@ -1187,7 +1187,7 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
|
|
|
}
|
|
|
ypPrint.setResult("有误差,实际发药数量: " + realAmount + ", 打印数量: " + printAmount);
|
|
|
} else {
|
|
|
- ypPrint.setResult("正常");
|
|
|
+ ypPrint.setResult("正常,实际发药数量: " + realAmount + ", 打印数量: " + printAmount);
|
|
|
}
|
|
|
ypPrint.setId(String.valueOf(System.currentTimeMillis()));
|
|
|
ypPrint.setSort(pid);
|
|
@@ -1201,13 +1201,12 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
|
|
|
pid ++;
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(msg)) {
|
|
|
+ log.info(msg);
|
|
|
vo.setMessage(msg);
|
|
|
}
|
|
|
- if(flag){
|
|
|
- List<List<YpSummaryPrint>> result = ListSizeControlUtil.splitList(summaryData, 70);
|
|
|
- for (List<YpSummaryPrint> record: result) {
|
|
|
- ypZyPatientMapper.insertSummaryData(record);
|
|
|
- }
|
|
|
+ List<List<YpSummaryPrint>> result = ListSizeControlUtil.splitList(summaryData, 70);
|
|
|
+ for (List<YpSummaryPrint> record: result) {
|
|
|
+ ypZyPatientMapper.insertSummaryData(record);
|
|
|
}
|
|
|
resultMap.put("msg", msg);
|
|
|
return resultMap;
|