|
|
@@ -73,9 +73,11 @@ public class YfSpecialMarkServiceImpl implements YfSpecialMarkService {
|
|
|
}
|
|
|
Double largeStockAmount = ypBaseYfMapper.selectLargeStockAmount(ypZdDict.getCode(), groupNo);
|
|
|
ypZdBaseYfSpecialVo.setStockAmountLarge(largeStockAmount);
|
|
|
+ List<Map<String, Object>> list = new ArrayList<>();
|
|
|
List<Map<String, Object>> zyList = ypZyPatientMapper.selectLatelyYpZyPatient(ypZdDict.getCode(), ypZdDict.getSerial(), ypZdDict.getPackSize().doubleValue(), groupNo);
|
|
|
List<Map<String, Object>> ypMzFytjs = ypMzFytjMapper.selectLatelyYpMzFytj(ypZdDict.getCode(), ypZdDict.getSerial(), ypZdDict.getPackSize().doubleValue(), groupNo);
|
|
|
- zyList.addAll(ypMzFytjs);
|
|
|
+ list.addAll(zyList);
|
|
|
+ list.addAll(ypMzFytjs);
|
|
|
int threeDayDosage = 0;
|
|
|
int sevenDayDosage = 0;
|
|
|
int fourteenDayDosage = 0;
|