|
@@ -428,7 +428,7 @@ public class YiZhuLuRuServer {
|
|
|
* @param param 参数
|
|
|
* @return 返回提示
|
|
|
*/
|
|
|
- public ResultVo<Map<BigDecimal, String>> deleteMultipleOrders(XinZhenYiZhu param) {
|
|
|
+ public ResultVo<Map<String, String>> deleteMultipleOrders(XinZhenYiZhu param) {
|
|
|
QueryWrapper<?> qw = new QueryWrapper<>();
|
|
|
qw.eq("inpatient_no", param.getInpatientNo());
|
|
|
qw.eq("admiss_times", param.getAdmissTimes());
|
|
@@ -441,11 +441,11 @@ public class YiZhuLuRuServer {
|
|
|
if (ListUtil.isBlank(deleteOrderList)) {
|
|
|
return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有找到原医嘱可能已经被删除了");
|
|
|
}
|
|
|
- Map<BigDecimal, String> map = new HashMap<>();
|
|
|
+ Map<String, String> map = new HashMap<>();
|
|
|
deleteOrderList.forEach(item -> {
|
|
|
String error = judgeWhetherItCanBeDeleted(item);
|
|
|
if (StringUtil.notBlank(error)) {
|
|
|
- map.put(item.getActOrderNo(), error);
|
|
|
+ map.put(item.getActOrderNo().stripTrailingZeros().toPlainString(), error);
|
|
|
}
|
|
|
});
|
|
|
|