Browse Source

服药说明null处理,增加库存更新日志

WANGJIALIANG 2 năm trước cách đây
mục cha
commit
0f9ddca6dd

+ 6 - 2
src/main/java/cn/hnthyy/thmz/service/impl/his/yf/YfWardPrescriptionServiceImpl.java

@@ -246,8 +246,10 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
                 }
                 vo.setName(zyActpatient.getName());
                 vo.setBedNo(zyActpatient.getBedNo());
-                ZdCommon zdCommon = mzYshZdFysmMapper.selectMzYshZdFysmByCode(yzActOrderCy.getCyFysm());
-                vo.setFysmContent(zdCommon.getName());
+                if(null != yzActOrderCy.getCyFysm()){
+                    ZdCommon zdCommon = mzYshZdFysmMapper.selectMzYshZdFysmByCode(yzActOrderCy.getCyFysm());
+                    vo.setFysmContent(zdCommon.getName());
+                }
                 if (StringUtils.isNotBlank(yzActOrderCy.getDoctorCode())) {
                     vo.setDoctorName(employeeMapper.selectByUserCode(yzActOrderCy.getDoctorCode()).getEmployeeName());
                 }
@@ -577,6 +579,8 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
                         -yzActOrderCyDetail.getQuantity() * yzActOrderCy.getQuantity(), BigDecimal.valueOf(-quantity * yzActOrderCyDetail.getUnitPrice()));
                 if (j == 0) {
                     throw new MzException("确认发药失败,更新药房库存异常");
+                }else{
+                    log.info("确认药单,更新库存成功[{}]", JSONObject.valueToString(yzActOrderCyDetail));
                 }
                 supplyCode = "Z";
             }