|
@@ -28,6 +28,7 @@ import cn.hnthyy.thmz.mapper.his.ResponceTypeMapper;
|
|
|
import cn.hnthyy.thmz.mapper.his.mz.EmployeeMapper;
|
|
|
import cn.hnthyy.thmz.mapper.his.mz.MzPharmacyMapper;
|
|
|
import cn.hnthyy.thmz.mapper.his.yp.YpBaseYfMapper;
|
|
|
+import cn.hnthyy.thmz.mapper.his.yp.YpInDetlMapper;
|
|
|
import cn.hnthyy.thmz.mapper.his.yp.YpMzFytjMapper;
|
|
|
import cn.hnthyy.thmz.mapper.his.yp.YpYzSendRecordMapper;
|
|
|
import cn.hnthyy.thmz.mapper.his.yp.YpZdDictMapper;
|
|
@@ -164,6 +165,9 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
|
|
|
@SuppressWarnings("all")
|
|
|
@Autowired
|
|
|
private YpYzSendRecordMapper ypYzSendRecordMapper;
|
|
|
+ @SuppressWarnings("all")
|
|
|
+ @Autowired
|
|
|
+ private YpInDetlMapper ypInDetlMapper;
|
|
|
|
|
|
@Override
|
|
|
public List<YzYpPageNoVo> queryYzYpPageNo(YzYpPageNoVo yzYpPageNoVo) {
|
|
@@ -1036,6 +1040,12 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
|
|
|
yfWardVo.setName(aPatientMi.getName());
|
|
|
yfWardVo.setDrugName(ypZdDict.getName());
|
|
|
yfWardVo.setSpecification(ypZdDict.getSpecification());
|
|
|
+ // 查询最近有效期
|
|
|
+ String effDate = ypInDetlMapper.selectEffDateByCode(ypZdDict.getCode());
|
|
|
+ if(null == effDate){
|
|
|
+ effDate = ypInDetlMapper.selectEffDateZeroByCode(ypZdDict.getCode());
|
|
|
+ }
|
|
|
+ yfWardVo.setEffDate(effDate);
|
|
|
} else {
|
|
|
yfWardVos.remove(i);
|
|
|
i--;
|