|
@@ -1252,7 +1252,6 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
|
|
|
throw new MzException("请完善既往史内容!");
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
setFullMzPrescriptionVo(mzPrescriptionVo, true, true);
|
|
|
MzPatientMi mzPatientMi = mzPatientMiMapper.selectByPatientId(mzPrescriptionVo.getPatientId());
|
|
|
if (mzPatientMi == null) {
|
|
@@ -2439,6 +2438,12 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
|
|
|
}
|
|
|
mzYjReq.setReqComment(mzPrescriptionVo.getMzBlRecord().getEmrChiefComplaint());
|
|
|
mzYjReq.setReqTzComment(reqTzComment);
|
|
|
+ if(needVerify){
|
|
|
+ List<String> errList = jcJyItemChargeService.checkJyJcGenderAndAge(2, mzYjReq.getOrderCode(), mzPrescriptionVo.getPatientId());
|
|
|
+ if(CollUtil.isNotEmpty(errList)){
|
|
|
+ throw new MzException(CollUtil.join(errList,";"));
|
|
|
+ }
|
|
|
+ }
|
|
|
} else {
|
|
|
JyZdItem jyZdItem = jyZdItemService.queryJyZdItemByCode(mzYjReq.getOrderCode());
|
|
|
if (jyZdItem == null) {
|
|
@@ -2447,6 +2452,12 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
|
|
|
if (YesNoEnum.YES.code.equals(jyZdItem.getDelFlag()) || YesNoEnum.YES.code.equals(jyZdItem.getMzFlag())) {
|
|
|
throw new MzException("保存处方失败,检验项目【" + jyZdItem.getName() + "】已经停用,无法继续使用!");
|
|
|
}
|
|
|
+ if(needVerify){
|
|
|
+ List<String> errList = jcJyItemChargeService.checkJyJcGenderAndAge(1, mzYjReq.getOrderCode(), mzPrescriptionVo.getPatientId());
|
|
|
+ if(CollUtil.isNotEmpty(errList)){
|
|
|
+ throw new MzException(CollUtil.join(errList,";"));
|
|
|
+ }
|
|
|
+ }
|
|
|
mzYjReq.setOrderName(jyZdItem.getName());
|
|
|
mzYjReq.setGroupName(jyZdItem.getName());
|
|
|
mzYjReq.setReqType(ReqTypeEnum.JIAN_YAN.code);
|