|
@ -165,7 +165,7 @@ function getExpressName(type){
|
|
|
|
|
|
function getDrugs(prescriptionInfo) {
|
|
|
return _.map(prescriptionInfo,function(v) {
|
|
|
return v.drugName + ' ' + (v.num || '') + (v.drugNumUnit || '')+' '
|
|
|
return v.drugName + ' ' + (v.num || '') + (v.drugNumUnitName || '')+' '
|
|
|
})
|
|
|
}
|
|
|
|
|
@ -176,7 +176,11 @@ function getDaysRemaining(item) {
|
|
|
curTime = new Date().getTime();
|
|
|
if(minDrugDay && presCreateTime) {
|
|
|
var preTime = new Date(presCreateTime.replace(/-/g,'/')).getTime()
|
|
|
return minDrugDay - ((curTime - preTime)/(24 * 3600 * 1000)).toFixed(1)
|
|
|
var remain = minDrugDay - ((curTime - preTime)/(24 * 3600 * 1000)).toFixed(1)
|
|
|
if(remain < 0) {
|
|
|
return "药品已用完"
|
|
|
}
|
|
|
return remain
|
|
|
} else {
|
|
|
return ""
|
|
|
}
|