diff --git a/woman/app.json b/woman/app.json
index 995dbef..d53f9cb 100644
--- a/woman/app.json
+++ b/woman/app.json
@@ -13,7 +13,10 @@
"pages/cancerCheck/cancerCheck",
"pages/report_first/report_first",
"pages/premaritalCheckup/premaritalCheckup",
- "pages/premaritalReport/premaritalReport"
+ "pages/premaritalReport/premaritalReport",
+ "pages/eugenics/eugenics"
+
+
],
"window": {
diff --git a/woman/pages/eugenics/eugenics.js b/woman/pages/eugenics/eugenics.js
new file mode 100644
index 0000000..0a4083d
--- /dev/null
+++ b/woman/pages/eugenics/eugenics.js
@@ -0,0 +1,158 @@
+//articleLists.js 文章列表
+// 网络请求工具类
+var networkUtil = require('../../utils/network_util.js')
+var api = require('../../utils/apiFile.js')
+var hospital = ''
+
+Page({
+
+ data: {
+ checkList: ['白带检查','血细胞分析','尿常规检查','血型','血糖','乙肝血清学检查','肝肾功能检测','甲状腺功能检测','病毒筛查','B超'],
+ text : "qqqaaa",
+ baseCheck: [{ 'title': '首诊日期', 'word': 'checkTime', value: '' }, { 'title': '末次月经', 'word': 'lastMenses', value: '' }, { 'title': '预产期', 'word': 'dueDate', value: '' }, { 'title': '月经周期', 'word': 'mensDay', value: '' }],
+ bodyCheck: [{ title: '身高', word: 'height', value: '' }, { title: '体重', word: 'weight', value: '' }, { title: '心', word: 'heart', value: '' }, { title: '肺', word: 'lungs', value: '' }],
+
+ womenCheck: [{ title: '外阴', word: 'vulva', value: '' }, { title: '阴道', word: 'vagina', value: 'vagina' }, { title: '宫颈', word: 'cervical', value: '' }, { title: '宫体', word: 'uterus', value: '' }, { title: '附件', word: 'fujian', value: '' }],
+
+ obstetricsCheck: [{ title: '腹围', word: 'fuwei', value: '' }, { title: '宫高', word: 'gongGao', value: '' }, { title: '胎位', word: 'fetalPositionVal', value: '' }, { title: '胎心', word: 'heartRateVal', value: '' }, { title: '先露', word: 'fetalPresentationVal', value: '' }],
+
+ assistantCheck: [{ 'top_title': '血常规', content: [{ 'title': '血红蛋白', 'word': 'xhdb', value: '' }, { 'title': '血红蛋白券', 'word': '', value: '' }, { 'title': '白细胞计数', 'word': 'bxbjs', value: '' }, { 'title': '血小板计数', 'word': 'platelet', value: '' }, { 'title': '血常规其他', 'word': 'chgOther', value: '' }] },
+
+ { 'top_title': '乙肝五项', content: [{ 'title': '乙肝表面抗原', 'word': 'ygbmky', value: '' }, { 'title': '乙肝表面抗体', 'word': 'ygbmkt', value: '' }, { 'title': '乙肝e抗原', 'word': 'ygeky', value: '' }, { 'title': '乙肝e抗体', 'word': 'ygekt', value: '' }, { 'title': '乙肝核心抗体', 'word': 'yghxkt', value: '' }] },
+
+ { 'top_title': '肾功', content: [{ 'title': '血清肌酐', 'word': 'xqjq', value: '' }, { 'title': '血尿素氮', 'word': 'xnsd', value: '' }] },
+
+ { 'top_title': '血型', content: [{ 'title': '血型', 'word': 'abo', value: '' }, { 'title': 'RH血型', 'word': 'rh', value: '' }, { 'title': '血糖', 'word': 'bloodSugar', value: '' }] },
+
+ { 'top_title': '肝功能', content: [{ 'title': '血清谷丙转氨酶', 'word': 'xqgbzam', value: '' }, { 'title': '血清谷草转氨酶', 'word': 'xqgczam', value: '' }, { 'title': '白蛋白', 'word': 'albumin', value: '' }, { 'title': '总胆红素', 'word': 'totalBilirubin', value: '' }, { 'title': '结合胆红素', 'word': 'jhBilirubin', value: '' }, { 'title': '丙肝', 'word': 'bg', value: '' }] },
+
+ { 'top_title': '尿常规', content: [{ 'title': '尿蛋白', 'word': 'ndb', value: '' }, { 'title': '尿糖', 'word': 'nt', value: '' }, { 'title': '尿酮体', 'word': 'urineKetone', value: '' }, { 'title': '尿潜血', 'word': 'bld', value: '' }, { 'title': '尿其他', 'word': 'ncgOther', value: '' }] },],
+ // 孕产史
+ ycHistory:''
+ },
+ onLoad: function (options) {
+ //hospital = options.hospital
+ //this.requestData(options.id)
+ },
+ /*---------自定义函数--------*/
+ requestData(Id) {
+ var self = this
+ networkUtil.showLoading()
+ // 报告详情
+ networkUtil._get(api.pregnancyReports + '/' + Id, {}, function (res) {
+ if (res.data.list.length == 0) {
+ return
+ }
+ var data = res.data.list[0].result2
+ self.getBaseCheckWith(data)
+ self.getbodyCheck(data)
+ self.getwomenCheck(data)
+ self.getobstetricsCheck(data)
+ self.getassistantCheck(data)
+ var risk = ''
+ for (var key in res.data.list[0].result) {
+ if (res.data.list[0].result[key].k == '高危因素') {
+ risk = res.data.list[0].result[key].v
+ }
+ }
+ self.setData({
+ checkData:data,
+ risk:risk
+ })
+ }, function (res) {
+
+ })
+ },
+ // 检查基础信息
+ getBaseCheckWith(data){
+ var baseCheck = this.data.baseCheck
+ for (var index in this.data.baseCheck) {
+ var item = this.data.baseCheck[index]
+ if (data[item.word]) {
+ item.value = data[item.word]
+ }
+ }
+ this.setData({
+ baseCheck: baseCheck
+ })
+ },
+ // 检查基础信息
+ getbodyCheck(data) {
+ var bodyCheck = this.data.bodyCheck
+ for (var index in bodyCheck) {
+ var item = bodyCheck[index]
+ if (data[item.word]) {
+ item.value = data[item.word]
+ }
+ }
+ this.setData({
+ bodyCheck: bodyCheck
+ })
+ },
+ // 检查基础信息
+ getwomenCheck(data) {
+ var womenCheck = this.data.womenCheck
+ for (var index in womenCheck) {
+ var item = womenCheck[index]
+ if (data[item.word]) {
+ item.value = data[item.word]
+ }
+ }
+ this.setData({
+ womenCheck: womenCheck
+ })
+ },
+ // 检查基础信息
+ getobstetricsCheck(data) {
+ var obstetricsCheck = this.data.obstetricsCheck
+ for (var index in obstetricsCheck) {
+ var item = obstetricsCheck[index]
+ if (data[item.word]) {
+ item.value = data[item.word]
+ }
+ }
+ this.setData({
+ obstetricsCheck: obstetricsCheck
+ })
+ },
+ // 检查基础信息
+ getassistantCheck(data) {
+ var assistantCheck = this.data.assistantCheck
+ for (var index in assistantCheck) {
+ var item = assistantCheck[index]
+ for (var newItem in item.content) {
+ if (data[item.content[newItem].word]) {
+ item.content[newItem].value = data[item.content[newItem].word]
+ }
+ }
+ }
+ this.setData({
+ assistantCheck: assistantCheck
+ })
+ },
+ getycHistory(data){
+ var str = ''
+ if(data.pregnacyTimes){
+ str = '孕次：' + data.pregnacyTimes + '次'
+ }
+ if (data.prodTime) {
+ str = '产次：' + data.prodTime + '次'
+ }
+ if (data.pregnacyTimes) {
+ str = '孕次：' + data.pregnacyTimes + '次'
+ }
+ },
+ triggers(e) {
+ console.log(e.target.dataset.idtype,e); // 1
+},
+ goDetail(e) {
+ console.log("检测详情",e,e.currentTarget.dataset)
+ let item = networkUtil.urlParams("index",e)
+
+ console.log("检测",item)
+ wx.navigateTo({
+ url: '../premaritalReport/premaritalReport?index='+item,
+ })
+ },
+
+})
diff --git a/woman/pages/eugenics/eugenics.json b/woman/pages/eugenics/eugenics.json
new file mode 100644
index 0000000..0987df2
--- /dev/null
+++ b/woman/pages/eugenics/eugenics.json
@@ -0,0 +1,6 @@
+{
+ "navigationBarBackgroundColor": "#ffffff",
+ "navigationBarTitleText": "孕前优生",
+ "navigationBarTextStyle": "black"
+
+}
\ No newline at end of file
diff --git a/woman/pages/eugenics/eugenics.wxml b/woman/pages/eugenics/eugenics.wxml
new file mode 100644
index 0000000..b1ca08e
--- /dev/null
+++ b/woman/pages/eugenics/eugenics.wxml
@@ -0,0 +1,30 @@
+
+
+
+
+
+ 婚前医学检查证明
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item}}
+
+ 未见异常
+
+
+
+
+
+
+
+
diff --git a/woman/pages/eugenics/eugenics.wxss b/woman/pages/eugenics/eugenics.wxss
new file mode 100644
index 0000000..e360376
--- /dev/null
+++ b/woman/pages/eugenics/eugenics.wxss
@@ -0,0 +1,40 @@
+/* pages/cancerCheck/cancerCheck.wxss */
+/* pages/folicAcid/folicAcid.wxss */
+.menuList_title {
+ font-size: 34rpx;
+ font-weight: 600;
+ line-height: 34rpx;
+ background: linear-gradient(135deg, #FFB4B4 0%, #FF8EA9 100%);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+}
+
+.menuList_bg{
+ width: 670rpx;
+ height: 180rpx;
+ background: linear-gradient(134deg, rgba(255,150,171,0.61) 0%, rgba(255,174,178,0.07) 100%);
+ box-shadow: 0rpx 4rpx 8rpx 5rpx rgba(245,33,84,0.1);
+ border-radius: 20rpx 20rpx 20rpx 20rpx;
+ opacity: 1;
+}
+
+.menuList_text {
+ font-size: 26rpx;
+ font-weight: 500;
+ background: linear-gradient(135deg, #FFB4B4 0%, #FF8EA9 100%);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+ line-height: 26rpx;
+}
+.menuList_next{
+ width: 20rpx;
+ height: 20rpx;
+ opacity: 1;
+ border: 2rpx solid #FF8EA9;
+ display: inline-block;
+ width: 18rpx;
+ height: 18rpx;
+ border-bottom: none;
+ border-left: none;
+ transform: rotate(45deg);
+}
\ No newline at end of file
diff --git a/woman/pages/home/home.js b/woman/pages/home/home.js
index 30df4b6..f21a490 100644
--- a/woman/pages/home/home.js
+++ b/woman/pages/home/home.js
@@ -950,6 +950,11 @@ Page({
url: '../premaritalCheckup/premaritalCheckup',
})
},
+ goMenu2(e) {
+ wx.navigateTo({
+ url: '../eugenics/eugenics',
+ })
+ },
goMenu3(e) {
wx.navigateTo({
url: '../cancerCheck/cancerCheck',
diff --git a/woman/pages/home/home.wxml b/woman/pages/home/home.wxml
index 08a625b..d05f328 100644
--- a/woman/pages/home/home.wxml
+++ b/woman/pages/home/home.wxml
@@ -39,7 +39,7 @@
婚前检查
-
+
孕前优生