Merge branch 'master' of http://192.168.1.220:10080/raolu/PC-application

app/jbsc/html/questionnaire.html

@@ -924,7 +924,7 @@
                                vm.changeContent(vm.questions[i].question, ckd34)
                              } else {
                                vm.selectItem(vm.questions[i - 1].question, vm.questions[i - 1].option[1])
                                vm.questions[i].question.content = '1'
                                // vm.questions[i].question.content = '1'
                                vm.changeContent(vm.questions[i].question, '1')
                                vm.questions[i].question.content = ''
                              }

app/statistics/html/comprehensive-query.html

@@ -821,10 +821,13 @@
                      <el-table-column prop="ssc" label="医保卡" align="center"></el-table-column>
                      <el-table-column prop="idcard" label="身份证" align="center"></el-table-column>
                      <el-table-column prop="mobile" label="手机号" align="center"></el-table-column>
                      <el-table-column prop="address" label="地址" align="center"></el-table-column>
                      <el-table-column prop="address" label="地址" align="center" width="170"></el-table-column>
                      <el-table-column prop="doctorName" label="签约医生" align="center"></el-table-column>
                      <el-table-column prop="feeTotal" label="累计红包金额" align="center"></el-table-column>
                      <el-table-column prop="rewardTimes" label="累计领取次数" align="center"></el-table-column>
                      <el-table-column prop="feeTotal" label="该居民已领取活动奖励的次数" align="center"></el-table-column>
                      <el-table-column prop="rewardTimes" label="该居民已领取奖励的总金额" align="center" width="170"></el-table-column>
                      <!-- <el-table-column prop="feeTotal" label="累计红包金额" align="center"></el-table-column>
                      <el-table-column prop="rewardTimes" label="累计领取次数" align="center"></el-table-column> -->
                    </template>
                  </el-table>
                  <mzf-worksheet v-if="handleNodeId==46"></mzf-worksheet>