页面数据核对，修改

src/components/userJoin/screenTwoPag2.vue

@@ -212,7 +212,7 @@
         g_personAutoNumTbl: [], //在管数据 -- 去年 人群自动上传血压血糖合格人数
         q_personAutoNum: [], // 签 数据 -- 今年  签约 同上
         q_personAutoNumTbl: [], // 签数据  -- 去年 同上
-        themeId: 30,
+        themeId: 28,
         agestructId: 34,
         bleedtype: '血压',
         selectID: 1, // 用于切换 规范管理
@@ -266,7 +266,7 @@
         // 人群自动随访人数
         g_normal_list: [],
         q_normal_list: [],
-        ageId: 35, // 用于入参时的地区区分
+        ageId: 36, // 用于入参时的地区区分
         age_index: 1, // 用于结合点击事件来判断显示的是哪一部分的数据
         data_x: [],
         data_gl_cyrs: [],
@@ -889,6 +889,7 @@
           this.pageLevel = 'sj'
           // 此时 处于第一次点击下的状态
           this._xzqh = ''
+          this._yljgdm = ''
           this._group = 'XZQH'
           this.areaname = ''
           this.tablename = "各区"
@@ -898,6 +899,7 @@
           console.log("现在处于一级状态");
         }
         else if (this.pageLevel === 'sq') {
+          this._yljgdm = ''
           this.pageLevel = 'qj'
           this._group = 'YLJGDM'
           this.tablename = "社区"
@@ -917,12 +919,13 @@
 
         if ('city' === this.userRole) {//市角色
           this._xzqh = ""
+          this._yljgdm = ''
           this._group = "XZQH"
           this.pageLevel = 'sj'
 
           this.areaname = ''
           this.tablename = '各区'
-          this.themeId = 30
+          this.themeId = 28
           this.thname = '各区'
           this.arname = '各区'
           this.homeinit(this.themeId)
@@ -931,6 +934,7 @@
 
           //  点击区 -- 展示城镇信息
           this._xzqh = sessionStorage.getItem("organizcode")
+          this._yljgdm = ''
           this._group = "YLJGDM"
           this.pageLevel = 'qj'
 
@@ -1039,6 +1043,10 @@
             "name": "XZQH",
             "value": this._xzqh,
             "type": "1"
+          }, {
+            "name": "YLJGDM",
+            "value": this._yljgdm,
+            "type": "1"
           }
         ]
         // 签数据  入参
@@ -1058,6 +1066,10 @@
             "name": "QYBZ",
             "value": "1",
             "type": "1"
+          }, {
+            "name": "YLJGDM",
+            "value": this._yljgdm,
+            "type": "1"
           }
         ]
         //var zbcode="MBZFX_016";单独读取
@@ -1160,7 +1172,7 @@
         // 1115 在管的糖尿病患者死亡人数 FWZL_015
         //  管  此处只请求 高血压 住院人数 --- 管  高糖并用
         commonMethod({
-          "themeId": 13,
+          "themeId": 15,
           "wd": JSON.stringify(wd)
         }).then(res => {
 
@@ -1177,7 +1189,7 @@
 
         // 管 此处只请求 在管的死亡人数 --- 管  高糖并用
         commonMethod({
-          "themeId": 35,
+          "themeId": 36,
           "wd": JSON.stringify(wd)
         }).then(res => {
 
@@ -1233,7 +1245,7 @@
         // 1115 在签的糖尿病患者死亡人数 FWZL_015
         //  签  此处只请求 高血压 住院人数 --- 签  高糖并用
         commonMethod({
-          "themeId": 13,
+          "themeId": 15,
           "wd": JSON.stringify(wd2)
         }).then(res => {
           res.data.zbdic.forEach((item, index) => {
@@ -1250,7 +1262,7 @@
 
         // 签签 此处只请求 在签签的死亡人数 --- 签签  高糖并用
         commonMethod({
-          "themeId": 35,
+          "themeId": 36,
           "wd": JSON.stringify(wd2)
         }).then(res => {
           res.data.content[0].zbxx.forEach((item, index) => {
@@ -1268,7 +1280,7 @@
 
         // 各类疾病病种请求  ===== 管
         commonMethod({
-          "themeId": 35,
+          "themeId": 36,
           "wd": JSON.stringify(wd)
         }).then(res => {
 
@@ -1356,6 +1368,10 @@
             "name": "XZQH",
             "value": this._xzqh,
             "type": "1"
+          }, {
+            "name": "YLJGDM",
+            "value": this._yljgdm,
+            "type": "1"
           }]
 
           //  签约数据 入参
@@ -1374,6 +1390,10 @@
               "name": "QYBZ",
               "value": "1",
               "type": "1"
+            }, {
+              "name": "YLJGDM",
+              "value": this._yljgdm,
+              "type": "1"
             }
           ]
           placeparam = {
@@ -1400,6 +1420,10 @@
             "name": "XZQH",
             "value": this._xzqh,
             "type": "1"
+          }, {
+            "name": "YLJGDM",
+            "value": this._yljgdm,
+            "type": "1"
           }]
 
           //  签约数据 入参
@@ -1418,6 +1442,10 @@
               "name": "QYBZ",
               "value": "1",
               "type": "1"
+            }, {
+              "name": "YLJGDM",
+              "value": this._yljgdm,
+              "type": "1"
             }
           ]
           placeparam = {
@@ -1451,14 +1479,17 @@
             } else {
               if (item.XZQH_TEXT) {
                 obj.name = item.XZQH_TEXT
+                obj.AreaCode = item.XZQH ? item.XZQH : ''
               } else if (item.YLJGDM_EX2) {
                 obj.name = item.YLJGDM_EX2
+                obj.AreaCode = item.YLJGDM ? item.YLJGDM : ''
               } else {
                 obj.name = "地名缺失"
+                return false
               }
             }
 
-            obj.AreaCode = item.XZQH ? item.XZQH : ''
+
 
             item.zbxx.forEach((item2, index2) => {
               if (this.selectID == 1) {
@@ -2844,7 +2875,7 @@
 
         this.DieaNo = Num
         if (Num == 1) {
-          this.themeId = 30
+          this.themeId = 28
           this.homeinit(this.themeId)
           this.bleedtype = "血压"
           this.pagedisname = '高血压'
@@ -2869,6 +2900,10 @@
           "name": "XZQH",
           "value": this._xzqh,
           "type": "1"
+        }, {
+          "name": "YLJGDM",
+          "value": this._yljgdm,
+          "type": "1"
         }]
         let paramnl = {
           "themeId": this.agestructId,
@@ -2995,6 +3030,10 @@
             "name": "XZQH",
             "value": this._xzqh,
             "type": "1"
+          }, {
+            "name": "YLJGDM",
+            "value": this._yljgdm,
+            "type": "1"
           }]
           let paramnl2 = {
             "themeId": this.agestructId,