diff --git a/pages/followUp/index.js b/pages/followUp/index.js
index 74d03b3..52b6a9a 100644
--- a/pages/followUp/index.js
+++ b/pages/followUp/index.js
@@ -370,6 +370,11 @@ Page({
[`form.white_blood_cells`]: ocr.value
})
}
+ if (ocr.name == '红细胞' || ocr.name == '红细胞计数') {
+ this.setData({
+ [`form.red_blood_cells`]: ocr.value
+ })
+ }
}
// 凝血功能
if (mode == 'coagulation_function_image') {
diff --git a/pages/followUp/index.wxml b/pages/followUp/index.wxml
index f2bd5b7..4fcf711 100644
--- a/pages/followUp/index.wxml
+++ b/pages/followUp/index.wxml
@@ -320,6 +320,14 @@
+
+
+
+ 红细胞(10^9/L)
+
+
+
+
diff --git a/pages/therapeuticRegimen/index.js b/pages/therapeuticRegimen/index.js
index 6d08147..756be68 100644
--- a/pages/therapeuticRegimen/index.js
+++ b/pages/therapeuticRegimen/index.js
@@ -38,17 +38,15 @@ Page({
const list = res.list.map(item => {
const startDate = new Date(item.start_date)
const endDate = new Date(item.end_date)
- if (startDate == endDate && today == startDate){
- item.status = '进行中'
- }
+
if (today > endDate) {
item.status = '已结束'
} else if (today < startDate) {
item.status = '未开始'
- } else {
+ } else if (today >= startDate && today <= endDate) {
item.status = '进行中'
}
- item.detail = JSON.parse(item.detail)
+ item.detail = JSON.parse(item.detail)
return item
})
this.setData({