diff --git a/体测单位/my_module.py b/体测单位/my_module.py
index 13f3d8a..f242340 100644
--- a/体测单位/my_module.py
+++ b/体测单位/my_module.py
@@ -70,8 +70,14 @@ def cal_bmi(data1):
             score = 1
     return score
 
-def get_wenjuan(list1,phone,dict1,dict3):
-    
+def get_wenjuan(filename,phone,dict1,dict3):
+    list1 = []
+    with open(filename,'r',newline='') as csv_file:
+        fl = csv.reader(csv_file,delimiter=',')
+        header = next(fl)    
+        for line in fl:
+            list1.append(line)
+
     nn = 0
     for item in list1:
          if item[2] in phone.keys():
diff --git a/体测单位/东营老年大学.ipynb b/体测单位/东营老年大学.ipynb
index fb64955..22d879f 100644
--- a/体测单位/东营老年大学.ipynb
+++ b/体测单位/东营老年大学.ipynb
@@ -10,15 +10,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 70,
+   "execution_count": 81,
    "id": "bbba6efc-73cd-4db6-bae7-014724fee731",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-03-14T08:07:40.941181Z",
-     "iopub.status.busy": "2025-03-14T08:07:40.940504Z",
-     "iopub.status.idle": "2025-03-14T08:07:40.971889Z",
-     "shell.execute_reply": "2025-03-14T08:07:40.971330Z",
-     "shell.execute_reply.started": "2025-03-14T08:07:40.941123Z"
+     "iopub.execute_input": "2025-03-19T11:10:38.156756Z",
+     "iopub.status.busy": "2025-03-19T11:10:38.156425Z",
+     "iopub.status.idle": "2025-03-19T11:10:38.173971Z",
+     "shell.execute_reply": "2025-03-19T11:10:38.173494Z",
+     "shell.execute_reply.started": "2025-03-19T11:10:38.156730Z"
     },
     "tags": []
    },
@@ -27,7 +27,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "96\n",
+      "37\n",
       "ok\n"
      ]
     }
@@ -37,7 +37,7 @@
     "import json\n",
     "from datetime import date\n",
     "\n",
-    "wb = openpyxl.load_workbook('data/东营市老年大学第三期体质班.xlsx')\n",
+    "wb = openpyxl.load_workbook('data/2025级油田老年大学体质康健基础班.xlsx')\n",
     "sheet = wb.active\n",
     "# sheets = wb.sheetnames\n",
     "person = {}\n",
@@ -48,15 +48,15 @@
     "    dict1 = {}\n",
     "    dict1['name'] = sheet.cell(n, 2).value\n",
     "    dict1['sex'] = sheet.cell(n, 3).value\n",
-    "    dict1['unit'] = '第三期体质班'\n",
+    "    dict1['unit'] = '2025级'\n",
     "    dict1['birth'] = str(sheet.cell(n, 4).value).replace('/','-').split(' ')[0]\n",
     "    #dict1['age'] = sheet.cell(n, 6).value\n",
-    "    if sheet.cell(n,6).value is not None:\n",
-    "        dict1['phone'] = str(sheet.cell(n,6).value) \n",
     "    if sheet.cell(n,5).value is not None:\n",
-    "        dict1['id'] = str(sheet.cell(n,5).value)\n",
+    "        dict1['phone'] = str(sheet.cell(n,5).value) \n",
+    "    if sheet.cell(n,6).value is not None:\n",
+    "        dict1['id'] = str(sheet.cell(n,6).value)\n",
     "    person[code] = dict1\n",
-    "filename = 'data/东营市老年大学第三期体质班.json'\n",
+    "filename = 'data/2025级油田老年大学体质康健基础班.json'\n",
     "with open(filename, 'w') as fl:\n",
     "    json.dump(person, fl, ensure_ascii=False)\n",
     "print(len(person))\n",
@@ -65,15 +65,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 57,
-   "id": "5a98acbe-5f00-4ee0-99b2-7ff8d0caa3bc",
+   "execution_count": 88,
+   "id": "a14eed8b-0f7f-44f6-9d99-ce7f48e0cf50",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-03-04T01:28:11.977681Z",
-     "iopub.status.busy": "2025-03-04T01:28:11.976966Z",
-     "iopub.status.idle": "2025-03-04T01:28:12.007482Z",
-     "shell.execute_reply": "2025-03-04T01:28:12.006967Z",
-     "shell.execute_reply.started": "2025-03-04T01:28:11.977599Z"
+     "iopub.execute_input": "2025-03-19T11:40:25.979499Z",
+     "iopub.status.busy": "2025-03-19T11:40:25.978815Z",
+     "iopub.status.idle": "2025-03-19T11:40:26.001966Z",
+     "shell.execute_reply": "2025-03-19T11:40:26.001013Z",
+     "shell.execute_reply.started": "2025-03-19T11:40:25.979436Z"
     }
    },
    "outputs": [
@@ -81,7 +81,62 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "125\n",
+      "13\n",
+      "ok\n"
+     ]
+    }
+   ],
+   "source": [
+    "import openpyxl\n",
+    "import json\n",
+    "from datetime import date\n",
+    "\n",
+    "wb = openpyxl.load_workbook('data/萃苑社区党群服务中心.xlsx')\n",
+    "sheet = wb.active\n",
+    "# sheets = wb.sheetnames\n",
+    "person = {}\n",
+    "\n",
+    "for n in range(2, sheet.max_row+1):\n",
+    "    if sheet.cell(n,1).value is not None:\n",
+    "        code = int(sheet.cell(n, 1).value)\n",
+    "        person.setdefault(code, {})\n",
+    "        dict1 = {}\n",
+    "        dict1['name'] = sheet.cell(n, 2).value\n",
+    "        dict1['sex'] = sheet.cell(n, 3).value\n",
+    "        dict1['unit'] = ' '\n",
+    "        dict1['birth'] = str(sheet.cell(n, 4).value).replace('/','-').split(' ')[0]\n",
+    "        #dict1['age'] = sheet.cell(n, 6).value\n",
+    "        if sheet.cell(n,5).value is not None:\n",
+    "            dict1['phone'] = str(sheet.cell(n,5).value) \n",
+    "        if sheet.cell(n,6).value is not None:\n",
+    "            dict1['id'] = str(sheet.cell(n,6).value)\n",
+    "        person[code] = dict1\n",
+    "filename = 'data/萃苑社区党群服务中心.json'\n",
+    "with open(filename, 'w') as fl:\n",
+    "    json.dump(person, fl, ensure_ascii=False)\n",
+    "print(len(person))\n",
+    "print('ok')"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 7,
+   "id": "5a98acbe-5f00-4ee0-99b2-7ff8d0caa3bc",
+   "metadata": {
+    "execution": {
+     "iopub.execute_input": "2025-04-07T09:45:18.579990Z",
+     "iopub.status.busy": "2025-04-07T09:45:18.579417Z",
+     "iopub.status.idle": "2025-04-07T09:45:18.655025Z",
+     "shell.execute_reply": "2025-04-07T09:45:18.654445Z",
+     "shell.execute_reply.started": "2025-04-07T09:45:18.579942Z"
+    }
+   },
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "492\n",
       "ok\n"
      ]
     }
@@ -130,15 +185,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 71,
+   "execution_count": 89,
    "id": "970e171e-1360-448f-a28c-520ccb8f314a",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-03-14T08:07:44.886839Z",
-     "iopub.status.busy": "2025-03-14T08:07:44.886215Z",
-     "iopub.status.idle": "2025-03-14T08:07:44.904464Z",
-     "shell.execute_reply": "2025-03-14T08:07:44.903941Z",
-     "shell.execute_reply.started": "2025-03-14T08:07:44.886779Z"
+     "iopub.execute_input": "2025-03-19T11:41:10.193763Z",
+     "iopub.status.busy": "2025-03-19T11:41:10.193066Z",
+     "iopub.status.idle": "2025-03-19T11:41:10.208195Z",
+     "shell.execute_reply": "2025-03-19T11:41:10.207239Z",
+     "shell.execute_reply.started": "2025-03-19T11:41:10.193698Z"
     },
     "tags": []
    },
@@ -147,7 +202,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "93\n"
+      "13\n"
      ]
     }
    ],
@@ -160,11 +215,11 @@
     "\n",
     "re_ta = {}\n",
     "list1 = []\n",
-    "filename = 'data/东营市老年大学第三期体质班.json'\n",
+    "filename = 'data/萃苑社区党群服务中心.json'\n",
     "with open(filename,'r') as fl:\n",
     "    dict1 = json.load(fl) \n",
     "\n",
-    "filename = 'data/marks_20250314.csv'\n",
+    "filename = 'data/marks_20250319.csv'\n",
     "with open(filename,'r',newline='') as csv_file:\n",
     "    fl = csv.reader(csv_file,delimiter=',')\n",
     "    header = next(fl)    \n",
@@ -201,7 +256,7 @@
     "            score = result[4] \n",
     "            re_ta[user][item_name]['成绩'] = score\n",
     "\n",
-    "filename = 'data/result_东营市老年大学第三期体质班.json'\n",
+    "filename = 'data/result_萃苑社区党群服务中心.json'\n",
     "with open(filename,'w') as fl:\n",
     "    json.dump(re_ta, fl, ensure_ascii=False) \n",
     "print(len(re_ta))"
@@ -209,15 +264,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 72,
+   "execution_count": 20,
    "id": "e2526429-e779-4ec5-8a0e-bea623f54f29",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-03-14T08:07:48.554811Z",
-     "iopub.status.busy": "2025-03-14T08:07:48.554094Z",
-     "iopub.status.idle": "2025-03-14T08:07:48.579590Z",
-     "shell.execute_reply": "2025-03-14T08:07:48.579110Z",
-     "shell.execute_reply.started": "2025-03-14T08:07:48.554748Z"
+     "iopub.execute_input": "2025-04-07T12:39:20.625284Z",
+     "iopub.status.busy": "2025-04-07T12:39:20.624668Z",
+     "iopub.status.idle": "2025-04-07T12:39:20.645248Z",
+     "shell.execute_reply": "2025-04-07T12:39:20.644732Z",
+     "shell.execute_reply.started": "2025-04-07T12:39:20.625230Z"
     }
    },
    "outputs": [
@@ -225,7 +280,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "115\n"
+      "57\n"
      ]
     }
    ],
@@ -242,7 +297,7 @@
     "with open(filename,'r') as fl:\n",
     "    dict1 = json.load(fl) \n",
     "\n",
-    "filename = 'data/marks_20250304.csv'\n",
+    "filename = 'data/marks_20250326.csv'\n",
     "with open(filename,'r',newline='') as csv_file:\n",
     "    fl = csv.reader(csv_file,delimiter=',')\n",
     "    header = next(fl)    \n",
@@ -254,6 +309,7 @@
     "    user = str(result[2])\n",
     "    rq = date.fromisoformat(result[5].replace('/','-'))\n",
     "    if user in dict1.keys():\n",
+    "        #print(user)\n",
     "        l_xm = []\n",
     "        m_item = str(result[3])    \n",
     "        re_ta.setdefault(user,{})    \n",
@@ -279,7 +335,7 @@
     "            score = result[4] \n",
     "            re_ta[user][item_name]['成绩'] = score\n",
     "\n",
-    "filename = 'data/result_陈庄检测人员.json'\n",
+    "filename = 'data/result_陈庄检测人员-2.json'\n",
     "with open(filename,'w') as fl:\n",
     "    json.dump(re_ta, fl, ensure_ascii=False) \n",
     "print(len(re_ta))"
@@ -295,15 +351,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 73,
+   "execution_count": 21,
    "id": "c3b99428-00d5-45ea-9803-261194525fa4",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-03-14T08:08:03.162240Z",
-     "iopub.status.busy": "2025-03-14T08:08:03.161488Z",
-     "iopub.status.idle": "2025-03-14T08:08:03.178033Z",
-     "shell.execute_reply": "2025-03-14T08:08:03.177422Z",
-     "shell.execute_reply.started": "2025-03-14T08:08:03.162173Z"
+     "iopub.execute_input": "2025-04-07T12:39:35.778154Z",
+     "iopub.status.busy": "2025-04-07T12:39:35.777362Z",
+     "iopub.status.idle": "2025-04-07T12:39:35.793555Z",
+     "shell.execute_reply": "2025-04-07T12:39:35.792548Z",
+     "shell.execute_reply.started": "2025-04-07T12:39:35.778096Z"
     }
    },
    "outputs": [
@@ -322,7 +378,7 @@
     "\n",
     "#list_item = ['lung','grip','flexion','jump','pushup','balance','reaction','step','situp','height','weight']\n",
     "list_item = ['lung','grip','flexion','jump','pushup','balance','reaction','step','situp']\n",
-    "filename = 'data/result_东营市老年大学第三期体质班.json'\n",
+    "filename = 'data/result_陈庄检测人员-2.json'\n",
     "with open(filename,'r') as fl:\n",
     "    dict2 = json.load(fl) \n",
     "for k, v in dict2.items():\n",
@@ -345,7 +401,7 @@
     "            dict2[k][item_en]['score'] = My.cal_score(data1)\n",
     "            #print(k,v[item_en]['成绩'],cal_score(data1))\n",
     "\n",
-    "filename = f'data/result_东营市老年大学第三期体质班.json'\n",
+    "filename = f'data/result_陈庄检测人员-2.json'\n",
     "with open(filename,'w') as fl:\n",
     "    json.dump(dict2,fl , ensure_ascii=False) \n",
     "print('ok!')        "
@@ -433,15 +489,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 78,
+   "execution_count": 91,
    "id": "891347c4-cd65-41f8-b5dd-b3ff3d1e249f",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-03-14T08:17:25.959454Z",
-     "iopub.status.busy": "2025-03-14T08:17:25.958763Z",
-     "iopub.status.idle": "2025-03-14T08:17:25.994196Z",
-     "shell.execute_reply": "2025-03-14T08:17:25.993587Z",
-     "shell.execute_reply.started": "2025-03-14T08:17:25.959390Z"
+     "iopub.execute_input": "2025-03-19T11:41:43.991964Z",
+     "iopub.status.busy": "2025-03-19T11:41:43.991276Z",
+     "iopub.status.idle": "2025-03-19T11:41:44.009884Z",
+     "shell.execute_reply": "2025-03-19T11:41:44.008939Z",
+     "shell.execute_reply.started": "2025-03-19T11:41:43.991901Z"
     }
    },
    "outputs": [
@@ -449,7 +505,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "87\n"
+      "7\n"
      ]
     }
    ],
@@ -462,10 +518,10 @@
     "\n",
     "dict1 = {}\n",
     "\n",
-    "filename = 'data/result_东营市老年大学第三期体质班.json'\n",
+    "filename = 'data/result_萃苑社区党群服务中心.json'\n",
     "with open(filename,'r') as fl:\n",
     "    dict1 = json.load(fl)\n",
-    "filename = 'data/东营市老年大学第三期体质班.json'\n",
+    "filename = 'data/萃苑社区党群服务中心.json'\n",
     "with open(filename,'r') as fl:\n",
     "    dict3 = json.load(fl)\n",
     "\n",
@@ -475,7 +531,7 @@
     "        phone[v['phone']] = k\n",
     "\n",
     "list1 = []\n",
-    "filename = 'data/Survey_20250314.csv'\n",
+    "filename = 'data/Survey_20250319.csv'\n",
     "with open(filename,'r',newline='') as csv_file:\n",
     "    fl = csv.reader(csv_file,delimiter=',')\n",
     "    header = next(fl)    \n",
@@ -531,7 +587,7 @@
     "        dict1[phone[item[2]]]['month'] = int(days/365*12)\n",
     "        #print(phone[item[2]])\n",
     "        nn+=1\n",
-    "filename = 'data/result_东营市老年大学第三期体质班-1.json'\n",
+    "filename = 'data/result_萃苑社区党群服务中心-1.json'\n",
     "\n",
     "with open(filename,'w') as fl:\n",
     "    json.dump(dict1, fl, ensure_ascii=False)\n",
@@ -828,15 +884,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 79,
+   "execution_count": 92,
    "id": "327c33e2-7437-4421-b70c-ec98234a5e88",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-03-14T08:19:54.589069Z",
-     "iopub.status.busy": "2025-03-14T08:19:54.588348Z",
-     "iopub.status.idle": "2025-03-14T08:20:46.467552Z",
-     "shell.execute_reply": "2025-03-14T08:20:46.466556Z",
-     "shell.execute_reply.started": "2025-03-14T08:19:54.589004Z"
+     "iopub.execute_input": "2025-03-19T11:42:35.430535Z",
+     "iopub.status.busy": "2025-03-19T11:42:35.429862Z",
+     "iopub.status.idle": "2025-03-19T11:42:43.062551Z",
+     "shell.execute_reply": "2025-03-19T11:42:43.062030Z",
+     "shell.execute_reply.started": "2025-03-19T11:42:35.430472Z"
     }
    },
    "outputs": [
@@ -844,7 +900,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "95\n"
+      "13\n"
      ]
     }
    ],
@@ -857,11 +913,11 @@
     "headers = {\n",
     "    \"Content-Type\": \"application/json; charset=UTF-8\"\n",
     "    }\n",
-    "filename = 'data/result_东营市老年大学第三期体质班-1.json'\n",
+    "filename = 'data/result_萃苑社区党群服务中心-1.json'\n",
     "with open(filename,'r') as fl:\n",
     "    dict1 = json.load(fl)\n",
     "list1 = []\n",
-    "file_path ='./东营市老年大学第三期体质班/'\n",
+    "file_path ='./萃苑社区党群服务中心/'\n",
     "list_item = ['lung','grip','flexion','jump','pushup','balance','reaction','step','situp','bmi']\n",
     "i=0\n",
     "list2 = []\n",
@@ -871,7 +927,7 @@
     "    \n",
     "    id = str(k).rjust(4,\"0\")\n",
     "    mydata['path'] = file_path+id+'-'+ v['name']+'.pdf'\n",
-    "    mydata['title'] = '东营市老年大学'\n",
+    "    mydata['title'] = '萃苑社区党群服务中心'\n",
     "    mydata['subtitle'] = v['unit']\n",
     "    mydata['id'] = id\n",
     "    mydata['name'] = v['name']\n",
@@ -913,27 +969,18 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 48,
+   "execution_count": 18,
    "id": "44a209a2-ca22-4a80-bbd9-37717347dfd5",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-03-03T06:41:43.203179Z",
-     "iopub.status.busy": "2025-03-03T06:41:43.202419Z",
-     "iopub.status.idle": "2025-03-03T06:41:43.225384Z",
-     "shell.execute_reply": "2025-03-03T06:41:43.224812Z",
-     "shell.execute_reply.started": "2025-03-03T06:41:43.203107Z"
+     "iopub.execute_input": "2025-04-07T12:35:07.556776Z",
+     "iopub.status.busy": "2025-04-07T12:35:07.556176Z",
+     "iopub.status.idle": "2025-04-07T12:35:08.133474Z",
+     "shell.execute_reply": "2025-04-07T12:35:08.132966Z",
+     "shell.execute_reply.started": "2025-04-07T12:35:07.556719Z"
     }
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "91\n",
-      "ok\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "import requests\n",
     "import json\n",
@@ -943,11 +990,11 @@
     "headers = {\n",
     "    \"Content-Type\": \"application/json; charset=UTF-8\"\n",
     "    }\n",
-    "filename = 'data/result_陈庄检测人员-1.json'\n",
+    "filename = 'data/result_陈庄检测人员-3.json'\n",
     "with open(filename,'r') as fl:\n",
     "    dict1 = json.load(fl)\n",
     "list1 = []\n",
-    "file_path ='./东营陈庄/'\n",
+    "file_path ='./东营陈庄3/'\n",
     "list_item = ['lung','grip','flexion','jump','pushup','balance','reaction','step','situp','bmi']\n",
     "i=0\n",
     "list2 = []\n",
@@ -967,15 +1014,7 @@
     "        mydata['gender'] = 'female'\n",
     "    \n",
     "    mydata['month'] = v['month']\n",
-    "    mydata['fits'] = {}\n",
-    "    survey_list = ['tcm','psy_yangmiao_old','spine']\n",
-    "    for item in survey_list:\n",
-    "        if item in  v.keys():\n",
-    "            mydata.setdefault('surveys',{})\n",
-    "            mydata['surveys'][item] = v[item]\n",
-    "            \n",
     "    \n",
-    "    #mydata['fits'] = {}\n",
     "    for item in list_item:\n",
     "        if item in v.keys():\n",
     "            mydata.setdefault('fits',{})\n",
@@ -985,20 +1024,91 @@
     "                mark = v[item]['成绩'].split()[0]\n",
     "            mydata['fits'][item] = {'mark':mark,'score':v[item]['score']}\n",
     "    #if len(mydata['fits']) >2 or len(mydata['surveys']) >0:\n",
-    "    #if len(mydata['fits']) >2 :  \n",
-    "    if len(mydata['fits']) >2 or 'surveys' in mydata.keys():\n",
+    "    if len(mydata['fits']) >2 :  \n",
+    "    #if len(mydata['fits']) >2 or 'surveys' in mydata.keys():\n",
     "        list2.append(mydata)\n",
     "        \n",
     "        i+=1\n",
-    "        #x = requests.post('http://localhost:3003', data = json.dumps(list1), headers=headers)\n",
+    "        x = requests.post('http://localhost:3003', data = json.dumps(list1), headers=headers)\n",
+    "        #print(id,v['name'],x.text)\n",
+    "        #print(mydata)\n",
+    "        #x.close()\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 22,
+   "id": "7ee80847-2bc0-4cbe-9534-c5dcf97c2833",
+   "metadata": {
+    "execution": {
+     "iopub.execute_input": "2025-04-07T12:40:25.086716Z",
+     "iopub.status.busy": "2025-04-07T12:40:25.086178Z",
+     "iopub.status.idle": "2025-04-07T12:40:51.228212Z",
+     "shell.execute_reply": "2025-04-07T12:40:51.227012Z",
+     "shell.execute_reply.started": "2025-04-07T12:40:25.086666Z"
+    }
+   },
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "56\n"
+     ]
+    }
+   ],
+   "source": [
+    "import requests\n",
+    "import json\n",
+    "import openpyxl\n",
+    "\n",
+    "\n",
+    "headers = {\n",
+    "    \"Content-Type\": \"application/json; charset=UTF-8\"\n",
+    "    }\n",
+    "filename = 'data/result_陈庄检测人员-2.json'\n",
+    "with open(filename,'r') as fl:\n",
+    "    dict1 = json.load(fl)\n",
+    "list1 = []\n",
+    "file_path ='./东营陈庄2/'\n",
+    "list_item = ['lung','grip','flexion','jump','pushup','balance','reaction','step','situp','bmi']\n",
+    "i=0\n",
+    "list2 = []\n",
+    "for  k, v in dict1.items():\n",
+    "    list1 = []\n",
+    "    mydata = {}\n",
+    "    \n",
+    "    id = str(k).rjust(4,\"0\")\n",
+    "    mydata['path'] = file_path+id+'-'+ v['name']+'.pdf'\n",
+    "    mydata['title'] = '山东东营陈庄镇'\n",
+    "    mydata['subtitle'] = v['unit']\n",
+    "    mydata['id'] = id\n",
+    "    mydata['name'] = v['name']\n",
+    "    if v['sex'] == '男':\n",
+    "        mydata['gender'] = 'male'\n",
+    "    else:\n",
+    "        mydata['gender'] = 'female'\n",
+    "    \n",
+    "    mydata['month'] = v['month']\n",
+    "    \n",
+    "    for item in list_item:\n",
+    "        if item in v.keys():\n",
+    "            mydata.setdefault('fits',{})\n",
+    "            if item in ['lung','pushup','step','situp']:\n",
+    "                mark = v[item]['成绩'].split()[0].split('.')[0]\n",
+    "            else:\n",
+    "                mark = v[item]['成绩'].split()[0]\n",
+    "            mydata['fits'][item] = {'mark':mark,'score':v[item]['score']}\n",
+    "    #if len(mydata['fits']) >2 or len(mydata['surveys']) >0:\n",
+    "    if len(mydata['fits']) >2 :    \n",
+    "        list1.append(mydata)\n",
+    "        list2.append([k,v['name']])\n",
+    "        i+=1\n",
+    "        x = requests.post('http://localhost:3003', data = json.dumps(list1), headers=headers)\n",
     "        #print(id,v['name'],x.text)\n",
     "        #print(mydata)\n",
     "        #x.close()\n",
-    "filename = 'data/data_陈庄检测人员.json'\n",
-    "with open(filename, 'w') as fl:\n",
-    "    json.dump(list2, fl, ensure_ascii=False)\n",
-    "print(len(list2))\n",
-    "print('ok')"
+    "print(i)"
    ]
   },
   {
diff --git a/体测单位/体测数据管理.ipynb b/体测单位/体测数据管理.ipynb
index 1ec3930..a2d5e67 100644
--- a/体测单位/体测数据管理.ipynb
+++ b/体测单位/体测数据管理.ipynb
@@ -10,15 +10,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 23,
    "id": "360f0a97-d73d-43f3-9f7a-0f9582103c82",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-03-04T01:13:15.511726Z",
-     "iopub.status.busy": "2025-03-04T01:13:15.510982Z",
-     "iopub.status.idle": "2025-03-04T01:13:15.594359Z",
-     "shell.execute_reply": "2025-03-04T01:13:15.593901Z",
-     "shell.execute_reply.started": "2025-03-04T01:13:15.511654Z"
+     "iopub.execute_input": "2025-03-20T09:18:01.505731Z",
+     "iopub.status.busy": "2025-03-20T09:18:01.504944Z",
+     "iopub.status.idle": "2025-03-20T09:18:01.519437Z",
+     "shell.execute_reply": "2025-03-20T09:18:01.518406Z",
+     "shell.execute_reply.started": "2025-03-20T09:18:01.505657Z"
     },
     "tags": []
    },
@@ -30,10 +30,10 @@
     "mydb = myclient[\"baogao\"]\n",
     "mycol = mydb[\"place\"]\n",
     "\n",
-    "place_id = 250226\n",
-    "place_code = \"16\"\n",
-    "dw_name =  \"山东东营陈庄镇\"\n",
-    "dw_jc = \"山东东营陈庄镇\"\n",
+    "place_id = 25032001\n",
+    "place_code = \"20\"\n",
+    "dw_name =  \"2025级油田老年大学体质康健基础班\"\n",
+    "dw_jc = \"油田老年大学体质康健基础班\"\n",
     "myquery = { \"id\": place_id }\n",
     "num = mycol.count_documents(myquery)\n",
     "if num>0:\n",
@@ -53,15 +53,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 24,
    "id": "6ce2cbc7-435a-461c-bdb8-abd9a6962fbc",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-03-04T01:47:46.378353Z",
-     "iopub.status.busy": "2025-03-04T01:47:46.377604Z",
-     "iopub.status.idle": "2025-03-04T01:47:46.556327Z",
-     "shell.execute_reply": "2025-03-04T01:47:46.555855Z",
-     "shell.execute_reply.started": "2025-03-04T01:47:46.378281Z"
+     "iopub.execute_input": "2025-03-20T09:19:55.399000Z",
+     "iopub.status.busy": "2025-03-20T09:19:55.398328Z",
+     "iopub.status.idle": "2025-03-20T09:19:55.423109Z",
+     "shell.execute_reply": "2025-03-20T09:19:55.422235Z",
+     "shell.execute_reply.started": "2025-03-20T09:19:55.398942Z"
     }
    },
    "outputs": [
@@ -69,7 +69,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "116 ok\n"
+      "31 ok\n"
      ]
     }
    ],
@@ -86,10 +86,10 @@
     "myclient = pymongo.MongoClient('mongodb://localhost:27017/')\n",
     "mydb = myclient[\"baogao\"]\n",
     "\n",
-    "place_id = 250226\n",
-    "place_code = \"16\"\n",
-    "dw_name =  \"山东东营陈庄镇\"\n",
-    "dw_jc = \"山东东营陈庄镇\"\n",
+    "place_id = 25032001\n",
+    "place_code = \"20\"\n",
+    "dw_name =  \"2025级油田老年大学体质康健基础班\"\n",
+    "dw_jc = \"油田老年大学体质康健基础班\"\n",
     "fi_path = '/home/songyi/python/mycrm/flask/pdf/files'\n",
     "fls = glob.glob(f'{fi_path}/{str(place_id)}/*.pdf')\n",
     "\n",
@@ -137,15 +137,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 25,
    "id": "5f665c0f-8d30-4759-b7f8-fb7e13b98efa",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-03-04T01:54:43.144665Z",
-     "iopub.status.busy": "2025-03-04T01:54:43.143709Z",
-     "iopub.status.idle": "2025-03-04T01:54:43.267863Z",
-     "shell.execute_reply": "2025-03-04T01:54:43.267357Z",
-     "shell.execute_reply.started": "2025-03-04T01:54:43.144573Z"
+     "iopub.execute_input": "2025-03-20T09:20:14.292047Z",
+     "iopub.status.busy": "2025-03-20T09:20:14.291517Z",
+     "iopub.status.idle": "2025-03-20T09:20:14.320715Z",
+     "shell.execute_reply": "2025-03-20T09:20:14.319854Z",
+     "shell.execute_reply.started": "2025-03-20T09:20:14.291999Z"
     },
     "tags": []
    },
@@ -154,122 +154,37 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "1 17354672396 0108-徐中华.pdf 160486\n",
-      "2 13563358955 0103-薄友梅.pdf 163176\n",
-      "3 13561096259 0095-王天成.pdf 162197\n",
-      "4 13371558516 0047-刘芳.pdf 160524\n",
-      "5 14768999777 0112-杨国良.pdf 168926\n",
-      "6 17754600886 0094-崔明波.pdf 167621\n",
-      "7 18562083357 0053-梁文硕.pdf 162163\n",
-      "8 15550539133 0097-李燕.pdf 166914\n",
-      "9 18254652100 0074-王鲁笑.pdf 160615\n",
-      "10 13625462769 0005-李卫忠.pdf 167935\n",
-      "11 15266065108 0044-纪荣平.pdf 166395\n",
-      "12 17754684486 0063-孙霞.pdf 165102\n",
-      "13 15318307578 0018-冯海华.pdf 163802\n",
-      "14 13561011787 0033-石振波.pdf 168039\n",
-      "15 13561006241 0041-薛真.pdf 167614\n",
-      "16 15965466216 0111-李培荣.pdf 167615\n",
-      "17 18562961538 0093-李乐.pdf 168561\n",
-      "18 13465269869 0015-王翠霞.pdf 163169\n",
-      "19 17754629112 0054-孟玲.pdf 162869\n",
-      "20 18554626567 0122-刘建云.pdf 161832\n",
-      "21 15318391717 0080-李小青.pdf 166590\n",
-      "22 17754629138 0067-牟艳红.pdf 166379\n",
-      "23 17754629077 0062-胡振云.pdf 162831\n",
-      "24 17754651259 0124-王学晴.pdf 169650\n",
-      "25 15254633988 0009-张伟花.pdf 164287\n",
-      "26 18562007818 0083-蔻艳.pdf 167918\n",
-      "27 18654691866 0001-陈彤彤.pdf 166271\n",
-      "28 18954628871 0100-张玉荣.pdf 167910\n",
-      "29 19854689029 0082-陈希珍.pdf 164523\n",
-      "30 15154681871 0010-王兰玉.pdf 167460\n",
-      "31 13780756776 0023-张仕荣.pdf 164763\n",
-      "32 15154622086 0077-孙义芬.pdf 164789\n",
-      "33 13455721686 0036-陈光梅.pdf 162051\n",
-      "34 13475465246 0064-李铭悦.pdf 164913\n",
-      "35 13181857658 0116-韩书贞.pdf 165482\n",
-      "36 13562298356 0084-胡冰叶.pdf 165170\n",
-      "37 18562961552 0101-王乃玲.pdf 161429\n",
-      "38 13371528169 0042-刘志芳.pdf 167682\n",
-      "39 17754629165 0048-徐雪花.pdf 165471\n",
-      "40 13256477708 0117-崔树红.pdf 161758\n",
-      "41 13356619896 0114-陈延红.pdf 167963\n",
-      "42 13287371168 0038-王守美.pdf 166920\n",
-      "43 15715468750 0006-韩小荣.pdf 168734\n",
-      "44 15154619169 0079-刘桂.pdf 164271\n",
-      "45 17754629082 0070-王芳.pdf 168370\n",
-      "46 15306476627 0055-张韶岩.pdf 166984\n",
-      "47 13705467605 0126-巴月华.pdf 160364\n",
-      "48 17754629057 0065-商孟加.pdf 161934\n",
-      "49 19963763561 0123-陈建正.pdf 160236\n",
-      "50 13325059838 0025-崔志猛.pdf 162853\n",
-      "51 15318328975 0040-王元.pdf 163259\n",
-      "52 13205471255 0029-张秀奎.pdf 165897\n",
-      "53 13361503856 0102-宋珊珊.pdf 167024\n",
-      "54 18954680512 0059-孟祥菊.pdf 162648\n",
-      "55 13465275185 0060-张春先.pdf 169518\n",
-      "56 13361522787 0069-王明杰.pdf 165038\n",
-      "57 13054610918 0057-郭立凯.pdf 168106\n",
-      "58 18506466571 0091-赵培芬.pdf 166937\n",
-      "59 13181854171 0107-董强.pdf 168902\n",
-      "60 13210388535 0071-刘俊志.pdf 161024\n",
-      "61 13306475903 0072-王芹.pdf 163160\n",
-      "62 15965465758 0043-郭振芹.pdf 165241\n",
-      "63 13355460615 0035-李跃粉.pdf 165670\n",
-      "64 18266665051 0052-王一涵.pdf 162679\n",
-      "65 13054600511 0125-季书奎.pdf 164526\n",
-      "66 15314325556 0045-张绪民.pdf 163645\n",
-      "67 13963355696 0118-王兴业.pdf 163275\n",
-      "68 13081417578 0028-李召兰.pdf 168653\n",
-      "69 15965466030 0086-陈春华.pdf 165723\n",
-      "70 15254639986 0014-陈召云.pdf 164920\n",
-      "71 13792069959 0016-崔士叶.pdf 163204\n",
-      "72 13905465022 0075-孙丽.pdf 165792\n",
-      "73 17754629228 0088-陈奎霞.pdf 164810\n",
-      "74 15154623768 0017-崔业常.pdf 166814\n",
-      "75 15965466216 0032-李培荣.pdf 164150\n",
-      "76 13864785309 0115-杨建军.pdf 162097\n",
-      "77 15990986892 0104-林燕燕.pdf 169407\n",
-      "78 18764586870 0056-曹志捷.pdf 168719\n",
-      "79 15315038808 0119-韩永强.pdf 165184\n",
-      "80 18562961530 0106-张玉军.pdf 169036\n",
-      "81 13054673678 0039-王新娥.pdf 167120\n",
-      "82 13706470006 0024-毕玉江.pdf 165769\n",
-      "83 13954696798 0008-陈振玉.pdf 163164\n",
-      "84 18766719018 0092-程艳娟.pdf 162109\n",
-      "85 17754629160 0090-徐妮.pdf 162709\n",
-      "86 15954759855 0019-陈新英.pdf 162859\n",
-      "87 13375461776 0022-盖新茂.pdf 164270\n",
-      "88 15954671399 0121-韩秀娥.pdf 168275\n",
-      "89 18954680397 0046-尚玉兰.pdf 161083\n",
-      "90 13561016489 0020-王乐花.pdf 164631\n",
-      "91 18860673506 0012-崔桂灵.pdf 163906\n",
-      "92 15665876948 0051-薄尊敏.pdf 165219\n",
-      "93 17754629197 0096-吴松.pdf 167890\n",
-      "94 18865467781 0098-徐雪梅.pdf 167148\n",
-      "95 17754629133 0068-李艳红.pdf 161483\n",
-      "96 17754600676 0066-吴根林.pdf 166370\n",
-      "97 13561086165 0004-李伟军.pdf 164165\n",
-      "98 15605469730 0089-曹莹莹.pdf 164137\n",
-      "99 17754629176 0050-徐凤霞.pdf 161527\n",
-      "100 13220505818 0026-霍卫华.pdf 160537\n",
-      "101 15154655057 0085-左连亮.pdf 168761\n",
-      "102 15275640625 0120-石东初.pdf 164391\n",
-      "103 13562257108 0081-李英霞.pdf 165483\n",
-      "104 15318382108 0087-刘肖丽.pdf 160973\n",
-      "105 13625462769 0109-李卫忠.pdf 167350\n",
-      "106 17754600760 0061-胡菲菲.pdf 169176\n",
-      "107 13006548466 0037-李振琴.pdf 162870\n",
-      "108 18954676358 0058-赵凯.pdf 167032\n",
-      "109 15552779321 0105-刘胜彩.pdf 163867\n",
-      "110 13563395385 0027-王振泉.pdf 164018\n",
-      "111 19854689027 0078-张卫卫.pdf 164520\n",
-      "112 17754629226 0049-蔡立庆.pdf 169251\n",
-      "113 13406089611 0076-王宪芳.pdf 168925\n",
-      "114 17754665865 0073-韩霞.pdf 161576\n",
-      "115 13963351053 0099-韩英.pdf 160826\n",
-      "116 17754629175 0034-段德引.pdf 162306\n"
+      "1 18654628632 0028-张红丽.pdf 206138\n",
+      "2 13589980155 0032-马建辉.pdf 208451\n",
+      "3 13963394816 0029-张凤魁.pdf 205879\n",
+      "4 13905462350 0034-张晓云.pdf 203015\n",
+      "5 13562280825 0016-李爱云.pdf 200689\n",
+      "6 15318339058 0007-韩金秀.pdf 203970\n",
+      "7 13589956960 0026-严新杰.pdf 200467\n",
+      "8 13906478916 0003-曹春梅.pdf 205019\n",
+      "9 13706476046 0023-王维卿.pdf 208975\n",
+      "10 13561090015 0022-王金文.pdf 204916\n",
+      "11 13013569039 0006-耿红霞.pdf 209158\n",
+      "12 13954622371 0019-王国臣.pdf 204637\n",
+      "13 18905466915 0017-梁秀荣.pdf 208243\n",
+      "14 13012902582 0030-张明霞.pdf 203281\n",
+      "15 13954626181 0013-李佐东.pdf 202568\n",
+      "16 13287350839 0020-王秀娟.pdf 200195\n",
+      "17 13954654611 0035-单丽荣.pdf 205740\n",
+      "18 13792079628 0031-马羚.pdf 201534\n",
+      "19 13563378335 0027-赵芳霞.pdf 205462\n",
+      "20 15105461296 0001-丛霞.pdf 203872\n",
+      "21 18653699898 0025-杨江萍.pdf 204830\n",
+      "22 13082601667 0021-王静.pdf 207801\n",
+      "23 13954606669 0033-朱莲女.pdf 207605\n",
+      "24 13864757610 0036-赵萍.pdf 208520\n",
+      "25 13287336162 0012-鲁兴湘.pdf 200654\n",
+      "26 13325052019 0010-刘敏.pdf 200635\n",
+      "27 13589965775 0011-李梅.pdf 206794\n",
+      "28 13864739068 0018-孙杰.pdf 203096\n",
+      "29 15105461298 0002-陈秀华.pdf 205248\n",
+      "30 15550503986 0005-丁元花.pdf 201624\n",
+      "31 15005463621 0037-高学晖.pdf 206374\n"
      ]
     }
    ],
@@ -287,12 +202,12 @@
     "mydb = myclient[\"baogao\"]\n",
     "mycol = mydb[\"pdf\"]\n",
     "\n",
-    "dw_jc = \"山东东营陈庄镇测试者\"\n",
-    "filename = 'data/陈庄检测人员.json'\n",
+    "dw_jc = \"2025级油田老年大学体质康健基础班\"\n",
+    "filename = 'data/2025级油田老年大学体质康健基础班.json'\n",
     "with open(filename,'r') as fl:\n",
     "    dict1 = json.load(fl) \n",
     "dict2 = {}\n",
-    "#place_id = 571315\n",
+    "place_id = 25032001\n",
     "myquery = { \"place_id\": place_id}\n",
     "for x in mycol.find(myquery,{ \"_id\": 0, \"place_id\": 0}):\n",
     "    code = int(x['fn'].split('-')[0])\n",
@@ -348,15 +263,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 26,
    "id": "4b2b5d76-665f-4dfe-bbd3-5c80abd8c3e3",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-03-04T01:57:31.101633Z",
-     "iopub.status.busy": "2025-03-04T01:57:31.100873Z",
-     "iopub.status.idle": "2025-03-04T02:07:35.250788Z",
-     "shell.execute_reply": "2025-03-04T02:07:35.248854Z",
-     "shell.execute_reply.started": "2025-03-04T01:57:31.101547Z"
+     "iopub.execute_input": "2025-03-20T09:20:55.440081Z",
+     "iopub.status.busy": "2025-03-20T09:20:55.439083Z",
+     "iopub.status.idle": "2025-03-20T09:23:36.769544Z",
+     "shell.execute_reply": "2025-03-20T09:23:36.768167Z",
+     "shell.execute_reply.started": "2025-03-20T09:20:55.440022Z"
     },
     "tags": []
    },
@@ -365,122 +280,37 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "17354672396 160486 send success\n",
-      "13563358955 163176 send success\n",
-      "13561096259 162197 send success\n",
-      "13371558516 160524 send success\n",
-      "14768999777 168926 send success\n",
-      "17754600886 167621 send success\n",
-      "18562083357 162163 send success\n",
-      "15550539133 166914 send success\n",
-      "18254652100 160615 send success\n",
-      "13625462769 167935 send success\n",
-      "15266065108 166395 send success\n",
-      "17754684486 165102 send success\n",
-      "15318307578 163802 send success\n",
-      "13561011787 168039 send success\n",
-      "13561006241 167614 send success\n",
-      "15965466216 167615 send success\n",
-      "18562961538 168561 send success\n",
-      "13465269869 163169 send success\n",
-      "17754629112 162869 send success\n",
-      "18554626567 161832 send success\n",
-      "15318391717 166590 send success\n",
-      "17754629138 166379 send success\n",
-      "17754629077 162831 send success\n",
-      "17754651259 169650 send success\n",
-      "15254633988 164287 send success\n",
-      "18562007818 167918 send success\n",
-      "18654691866 166271 send success\n",
-      "18954628871 167910 send success\n",
-      "19854689029 164523 send success\n",
-      "15154681871 167460 send success\n",
-      "13780756776 164763 send success\n",
-      "15154622086 164789 send success\n",
-      "13455721686 162051 send success\n",
-      "13475465246 164913 send success\n",
-      "13181857658 165482 send success\n",
-      "13562298356 165170 send success\n",
-      "18562961552 161429 send success\n",
-      "13371528169 167682 send success\n",
-      "17754629165 165471 send success\n",
-      "13256477708 161758 send success\n",
-      "13356619896 167963 send success\n",
-      "13287371168 166920 send success\n",
-      "15715468750 168734 send success\n",
-      "15154619169 164271 send success\n",
-      "17754629082 168370 send success\n",
-      "15306476627 166984 send success\n",
-      "13705467605 160364 send success\n",
-      "17754629057 161934 send success\n",
-      "19963763561 160236 send success\n",
-      "13325059838 162853 send success\n",
-      "15318328975 163259 send success\n",
-      "13205471255 165897 send success\n",
-      "13361503856 167024 send success\n",
-      "18954680512 162648 send success\n",
-      "13465275185 169518 send success\n",
-      "13361522787 165038 send success\n",
-      "13054610918 168106 send success\n",
-      "18506466571 166937 send success\n",
-      "13181854171 168902 send success\n",
-      "13210388535 161024 send success\n",
-      "13306475903 163160 send success\n",
-      "15965465758 165241 send success\n",
-      "13355460615 165670 send success\n",
-      "18266665051 162679 send success\n",
-      "13054600511 164526 send success\n",
-      "15314325556 163645 send success\n",
-      "13963355696 163275 send success\n",
-      "13081417578 168653 send success\n",
-      "15965466030 165723 send success\n",
-      "15254639986 164920 send success\n",
-      "13792069959 163204 send success\n",
-      "13905465022 165792 send success\n",
-      "17754629228 164810 send success\n",
-      "15154623768 166814 send success\n",
-      "15965466216 164150 send success\n",
-      "13864785309 162097 send success\n",
-      "15990986892 169407 send success\n",
-      "18764586870 168719 send success\n",
-      "15315038808 165184 send success\n",
-      "18562961530 169036 send success\n",
-      "13054673678 167120 send success\n",
-      "13706470006 165769 send success\n",
-      "13954696798 163164 send success\n",
-      "18766719018 162109 send success\n",
-      "17754629160 162709 send success\n",
-      "15954759855 162859 send success\n",
-      "13375461776 164270 send success\n",
-      "15954671399 168275 send success\n",
-      "18954680397 161083 send success\n",
-      "13561016489 164631 send success\n",
-      "18860673506 163906 send success\n",
-      "15665876948 165219 send success\n",
-      "17754629197 167890 send success\n",
-      "18865467781 167148 send success\n",
-      "17754629133 161483 send success\n",
-      "17754600676 166370 send success\n",
-      "13561086165 164165 send success\n",
-      "15605469730 164137 send success\n",
-      "17754629176 161527 send success\n",
-      "13220505818 160537 send success\n",
-      "15154655057 168761 send success\n",
-      "15275640625 164391 send success\n",
-      "13562257108 165483 send success\n",
-      "15318382108 160973 send success\n",
-      "13625462769 167350 send success\n",
-      "17754600760 169176 send success\n",
-      "13006548466 162870 send success\n",
-      "18954676358 167032 send success\n",
-      "15552779321 163867 send success\n",
-      "13563395385 164018 send success\n",
-      "19854689027 164520 send success\n",
-      "17754629226 169251 send success\n",
-      "13406089611 168925 send success\n",
-      "17754665865 161576 send success\n",
-      "13963351053 160826 send success\n",
-      "17754629175 162306 send success\n"
+      "18654628632 206138 send success\n",
+      "13589980155 208451 send success\n",
+      "13963394816 205879 send success\n",
+      "13905462350 203015 send success\n",
+      "13562280825 200689 send success\n",
+      "15318339058 203970 send success\n",
+      "13589956960 200467 send success\n",
+      "13906478916 205019 send success\n",
+      "13706476046 208975 send success\n",
+      "13561090015 204916 send success\n",
+      "13013569039 209158 send success\n",
+      "13954622371 204637 send success\n",
+      "18905466915 208243 send success\n",
+      "13012902582 203281 send success\n",
+      "13954626181 202568 send success\n",
+      "13287350839 200195 send success\n",
+      "13954654611 205740 send success\n",
+      "13792079628 201534 send success\n",
+      "13563378335 205462 send success\n",
+      "15105461296 203872 send success\n",
+      "18653699898 204830 send success\n",
+      "13082601667 207801 send success\n",
+      "13954606669 207605 send success\n",
+      "13864757610 208520 send success\n",
+      "13287336162 200654 send success\n",
+      "13325052019 200635 send success\n",
+      "13589965775 206794 send success\n",
+      "13864739068 203096 send success\n",
+      "15105461298 205248 send success\n",
+      "15550503986 201624 send success\n",
+      "15005463621 206374 send success\n"
      ]
     }
    ],
@@ -498,12 +328,12 @@
     "mydb = myclient[\"baogao\"]\n",
     "mycol = mydb[\"pdf\"]\n",
     "\n",
-    "dw_jc = \"山东东营陈庄镇测试者\"\n",
-    "filename = 'data/陈庄检测人员.json'\n",
+    "dw_jc = \"油田老年大学测试者\"\n",
+    "filename = 'data/2025级油田老年大学体质康健基础班.json'\n",
     "with open(filename,'r') as fl:\n",
     "    dict1 = json.load(fl) \n",
     "dict2 = {}\n",
-    "place_id = 250226\n",
+    "place_id = 25032001\n",
     "myquery = { \"place_id\": place_id }\n",
     "for x in mycol.find(myquery,{ \"_id\": 0, \"place_id\": 0}):\n",
     "    code = int(x['fn'].split('-')[0])\n",
@@ -568,27 +398,12 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": null,
    "id": "25a269c3-758f-4e79-ae6d-a6e6f161d64b",
    "metadata": {
-    "execution": {
-     "iopub.execute_input": "2024-12-23T05:38:55.858379Z",
-     "iopub.status.busy": "2024-12-23T05:38:55.857680Z",
-     "iopub.status.idle": "2024-12-23T05:38:56.119988Z",
-     "shell.execute_reply": "2024-12-23T05:38:56.118643Z",
-     "shell.execute_reply.started": "2024-12-23T05:38:55.858311Z"
-    },
     "tags": []
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "+8613793180751 send success\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "from tencentcloud.common import credential\n",
     "from tencentcloud.common.exception.tencent_cloud_sdk_exception import TencentCloudSDKException\n",
@@ -602,12 +417,12 @@
     "mydb = myclient[\"baogao\"]\n",
     "mycol = mydb[\"pdf\"]\n",
     "\n",
-    "dw_jc = \"北体体质康健班学员\"\n",
-    "filename = 'data/北体体质康健班202412.json'\n",
+    "dw_jc = \"海淀区老干部大学\"\n",
+    "filename = 'data/海淀区老干部大学第一期.json'\n",
     "with open(filename,'r') as fl:\n",
     "    dict1 = json.load(fl) \n",
     "dict2 = {}\n",
-    "place_id = 141002\n",
+    "place_id = 250319\n",
     "myquery = { \"place_id\": place_id }\n",
     "for x in mycol.find(myquery,{ \"_id\": 0, \"place_id\": 0}):\n",
     "    code = int(x['fn'].split('-')[0])\n",
@@ -617,7 +432,7 @@
     "        print('no phone')\n",
     "\n",
     "phone = '+86'+'13793180751'\n",
-    "yzm = '155673'\n",
+    "yzm = '185679'\n",
     "try:    \n",
     "    secretId = \"AKID22rVyvSqbikXFFvav31ykc9YmqjN6KYc\"\n",
     "    secretKey = \"51XVL1YxDKI6mJh8au6DDuTskS1RhwJX\"\n",
diff --git a/体测单位/体质检测数据处理.ipynb b/体测单位/体质检测数据处理.ipynb
index 0ce6835..7c6ba52 100644
--- a/体测单位/体质检测数据处理.ipynb
+++ b/体测单位/体质检测数据处理.ipynb
@@ -497,27 +497,12 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": null,
    "id": "141b30dc-5975-4dcb-9bc3-9b20d26a0917",
    "metadata": {
-    "execution": {
-     "iopub.execute_input": "2024-12-11T07:12:20.657211Z",
-     "iopub.status.busy": "2024-12-11T07:12:20.656910Z",
-     "iopub.status.idle": "2024-12-11T07:12:20.675619Z",
-     "shell.execute_reply": "2024-12-11T07:12:20.675056Z",
-     "shell.execute_reply.started": "2024-12-11T07:12:20.657186Z"
-    },
     "tags": []
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "ok!\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "import json\n",
     "import time\n",
@@ -652,27 +637,12 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": null,
    "id": "b123ee6b-85d2-4660-b226-321832a6b796",
    "metadata": {
-    "execution": {
-     "iopub.execute_input": "2024-12-11T07:12:25.035537Z",
-     "iopub.status.busy": "2024-12-11T07:12:25.034817Z",
-     "iopub.status.idle": "2024-12-11T07:13:06.145312Z",
-     "shell.execute_reply": "2024-12-11T07:13:06.144192Z",
-     "shell.execute_reply.started": "2024-12-11T07:12:25.035471Z"
-    },
     "tags": []
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "78\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "import requests\n",
     "import json\n",
@@ -815,341 +785,24 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 19,
+   "execution_count": null,
    "id": "d913a531-51b3-4795-adc3-f4fc858d7401",
    "metadata": {
-    "execution": {
-     "iopub.execute_input": "2024-12-12T07:37:15.387929Z",
-     "iopub.status.busy": "2024-12-12T07:37:15.387152Z",
-     "iopub.status.idle": "2024-12-12T07:37:15.525479Z",
-     "shell.execute_reply": "2024-12-12T07:37:15.524900Z",
-     "shell.execute_reply.started": "2024-12-12T07:37:15.387860Z"
-    },
     "tags": []
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "302\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0240049-陈晓辉.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001134-李和平.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526128-黎戬.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1984143-彭超.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526130-吴书鹏.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526186-周子瑄.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3498058-柳聪.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001147-黄紫暄.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3125602-王凤.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526182-李基博.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983629-黄喜阳.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983174-叶可.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001041-陈峥嵘.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983626-彭定荣.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001122-赵进.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001149-张嘉欣.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3498083-陆杨.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1989523-周松林.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983534-蔡维.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3245716-杨熙哲.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3125625-宋霰.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002091-黄琪.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526143-廖成思.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002144-乔林臻.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002035-李南烽.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983832-李刚.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1985478-刘志辉.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1985639-陈强.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3464129-谢倩.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1985328-张建.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983771-李振宇.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526134-刘晋炀.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3437585-贺常霏.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526199-徐敬.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983569-谢俊杰.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3413868-徐韩.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3464103-彭旭涛.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3464145-陈毅.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002037-饶军.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002116-胡敏.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001997-于明浩.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001145-戴玮兵.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001043-谢玉婷.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983740-万双华.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3437581-李成伟.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001076-荣贇.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3358823-黎贤贞智.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001128-欧阳雅馨.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3413865-孟繁荣.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3535865-王明珠.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3437567-朱雨晴.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001036-陈怀至.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001993-陈杰.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3464097-孙颖.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3464138-陈兰鑫.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001718-巴银花儿.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001115-吴梦瑶.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3170676-常硕.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001010-邱亮.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1989522-钟建东.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001133-彭宇博.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001096-温家祥.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983844-彭鑫.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1985485-张瑞.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983866-倪博.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1993388-蒋莉.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3170724-张翔.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001020-贾俊.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1989709-卞伟.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001092-钟兴阳.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983770-黄刚.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001114-曾子坤.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1985926-宁佐强.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3437574-胡颖.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983836-陈文辉.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526185-方劲松.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3281543-谢崴.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983837-罗文武.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1985666-李思.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526180-李今朝.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3281536-王智浩.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3498029-汤思煜.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001860-李晨阳.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983800-郭丽梅.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002023-梁军.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3437557-周念.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001053-刘志刚.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3497994-黄博轩.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002043-邓余斌.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983785-胡湘.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001144-黄英杰.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3535506-田子豪.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983775-胡向民.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1985551-吴敏.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526176-万航.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001119-汤艳.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3464081-刘权.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3358822-黎明.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1987904-李佳.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1985913-毛智勇.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3464205-胡雨丹.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001012-吴磊.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526187-夏堃喻.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3413857-仇乐.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3464122-眭永波.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526177-周晏本.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983661-李静.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3160188-冯军.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3498042-赵天宇.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983797-周辉灿.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3139284-全世夷.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3498031-吴义.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3319096-毛润政.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3358812-邵昌睿.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001130-许竹新.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1985287-陈宝林.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1985440-吴阳.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001069-李鑫.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001032-吴志祚.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3319086-唐子涵.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3503272-董晨阳.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3498000-陈旭.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3319099-肖博文.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3498059-李慧慧.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001028-李蓝蓝.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001034-严雅珂.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1989710-谭珂屿.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002056-江汇涛.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3245723-祝恒兴.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526154-陈柳.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001141-张俊凡.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983622-胡诗学.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526170-杨龙姣.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001093-李欣怡.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001078-张薇.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001058-杨红.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983830-刘军.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3245709-姚佩.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002036-胡杰.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983180-张毅.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983143-吴巍.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983100-余益波.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3245733-高帆.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1985907-毛卫群.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526135-高斯阳.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002159-丁杰涛.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983171-王复兴.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983109-谈志亮.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526127-郭倩颖.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983652-向彭.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3464069-于业晟.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526189-施陈心.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1986007-李明权.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3464134-陈亮.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002100-彭晨雨.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001072-薛苗.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001121-张蕾.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002004-刘敏明.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001040-向安平.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3503276-熊东.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001023-彭一夫.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1992225-叶忠良.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3358818-鲁轩熠.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1985356-黄超.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983119-经永华.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1985324-谢清峰.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3498065-刘雍涵.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983530-鲁世俊.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3281551-黄杰.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001070-黄辅君.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983108-张新芬.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526165-刘至清.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001073-翟秋霞.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1985891-王定鲜.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526156-袁子灿.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001074-陈佳.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3464077-冯晓阳.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983635-刘飞.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001031-高浩然.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3498028-刘明泽.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3427189-段威.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002115-张丽军.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983159-李华锐.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983759-闵敢.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001132-李颖.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001079-袁丽雯.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983322-张健.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3125613-李青.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002114-唐景柳.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001029-邓韧泰.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3498091-花慧.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1985673-刘国东.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001146-方娜.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002122-周瑜.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3245719-王宁.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001048-谢浩.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983777-谢林.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1985611-丁敏.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002176-张嫚.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1986235-郑小芳.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001120-薛美佳.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001046-汤茜.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3139304-王卓见.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983107-沈高峰.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3245735-黎金龙.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983846-廖念.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3319087-孟凡澄.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3464084-吴煜文.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983106-罗鸣.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983823-甘龙.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001057-彭菲.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001052-陈祥宇.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001059-罗嘉俊.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002039-胡荣华.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3464198-陈世博.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001098-刘夏俐.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001143-卢章凌.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001084-周博.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526193-李可.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3281545-贺凯.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526179-李博.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1989539-唐韵辅.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983557-涂彬.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001039-王鹏.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983831-黄波.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3498023-戴汉林.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983779-高建华.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001065-涂俐.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983863-张勇.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1985621-杨大为.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1985698-李开俊.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3245725-贺飞.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001044-李德文.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001870-龚斯壮.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3245717-汪洋.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002166-张梦圆.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3498020-倪炜强.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001050-马一文.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001027-向雅婷.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002126-蔡安逸.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3281530-吴征宇.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983683-李杜娟.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983630-龚付金.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3498004-江载舟.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001045-李尉铭.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001049-曾洪.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3125609-张哲.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3319101-袁楚云.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3281544-谢思遥.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1989487-彭华明.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526147-黄天舒.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3394214-唐金滔.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001001-梅小龙.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1993242-何东海.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002067-黄建生.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3498061-马璐.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3503275-邓野.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001033-邹雪平.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3464164-刘雨薇.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3498033-陈雅玲.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983595-侯代磊.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001095-江欢.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001087-阳涛.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001051-任藩韬.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1961098-武文娟.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001091-黄南.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3170725-赵雨龙.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983758-任珍琦.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3358815-陈海.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001042-杨宇凡.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983767-刘林波.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3245700-刘细.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983799-彭宇.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001038-彭健霖.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3498055-陶汝.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3464200-马婷.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983868-彭国强.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002151-李美玲.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983176-李关亮.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1993413-汤愉.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3464165-向嘉伟.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1987427-谢小飞.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3498044-张坚发.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3160187-邹尚辰.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001060-郭凌宇.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3437569-李湘川.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3498089-邹竞莹.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983965-文智.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3498080-颜艳萍.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002063-杨杰.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001148-张兰心.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3526138-于润韬.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3437554-刘毅.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1985838-郭汨.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3498063-游胜利.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1985615-喻永强.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3464148-黎泓松.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/1983262-杨淼君.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001085-刘海燕.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0001112-汤超.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/0002124-唐睿.pdf\n",
-      "/home/songyi/pdf-typescript/长炼医院2024/3437578-黄晓平.pdf\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "import os,sys,shutil\n",
     "import json\n",
     "import glob\n",
     "from pathlib import Path\n",
     "\n",
-    "fi_path = '/home/songyi/pdf-typescript/长炼医院2024'\n",
-    "new_path = 'file/长炼医院2024'\n",
+    "fi_path = '/home/songyi/pdf-typescript-old2/青海2025'\n",
+    "new_path = 'file/青海2025'\n",
     "old = []\n",
     "dict2 = {}\n",
     "\n",
-    "filename = 'data/result_长炼医院人员2024(汇总）.json'\n",
+    "filename = 'data/result_青海2025-1.json'\n",
     "with open(filename,'r') as fl:\n",
     "    dict1 = json.load(fl)\n",
     "fls = glob.glob(f'{fi_path}/*.pdf')\n",
@@ -1175,15 +828,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 21,
+   "execution_count": 2,
    "id": "02319955-7fb6-4791-ae45-55b03bdadd54",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2024-12-12T07:41:07.877091Z",
-     "iopub.status.busy": "2024-12-12T07:41:07.876276Z",
-     "iopub.status.idle": "2024-12-12T07:41:07.919596Z",
-     "shell.execute_reply": "2024-12-12T07:41:07.919038Z",
-     "shell.execute_reply.started": "2024-12-12T07:41:07.877012Z"
+     "iopub.execute_input": "2025-03-26T08:57:29.670864Z",
+     "iopub.status.busy": "2025-03-26T08:57:29.670184Z",
+     "iopub.status.idle": "2025-03-26T08:57:29.848770Z",
+     "shell.execute_reply": "2025-03-26T08:57:29.848268Z",
+     "shell.execute_reply.started": "2025-03-26T08:57:29.670807Z"
     },
     "tags": []
    },
@@ -1203,9 +856,9 @@
     "from pathlib import Path\n",
     "import openpyxl\n",
     "\n",
-    "fi_path = '/home/songyi/pdf-typescript/长炼医院2024'\n",
+    "fi_path = '/home/songyi/pdf-typescript-old2/青海2025'\n",
     "\n",
-    "filename = 'data/result_长炼医院人员2024(汇总）.json'\n",
+    "filename = 'data/result_青海2025-1.json'\n",
     "with open(filename,'r') as fl:\n",
     "    dict1 = json.load(fl)\n",
     "fls = glob.glob(f'{fi_path}/*.pdf')\n",
@@ -1221,7 +874,7 @@
     "    \n",
     "    list1.append(list2)\n",
     "\n",
-    "filename = 'data/长炼医院2024年体测报告明细表.xlsx'\n",
+    "filename = 'data/青海油田勘探事业部2025年体测报告明细表.xlsx'\n",
     "wb = openpyxl.Workbook()\n",
     "sheet = wb.active\n",
     "sheet.append(title)\n",
@@ -1876,26 +1529,10 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "id": "46aa847d-e1fe-45bd-85b6-e2d792ec8842",
-   "metadata": {
-    "execution": {
-     "iopub.execute_input": "2024-12-20T07:27:58.141604Z",
-     "iopub.status.busy": "2024-12-20T07:27:58.140897Z",
-     "iopub.status.idle": "2024-12-20T07:27:58.343114Z",
-     "shell.execute_reply": "2024-12-20T07:27:58.342694Z",
-     "shell.execute_reply.started": "2024-12-20T07:27:58.141536Z"
-    }
-   },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "301\n"
-     ]
-    }
-   ],
+   "metadata": {},
+   "outputs": [],
    "source": [
     "import json\n",
     "import openpyxl\n",
@@ -1970,29 +1607,12 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "id": "63edd636-f034-4aa6-8575-63d5cdb84adb",
    "metadata": {
-    "execution": {
-     "iopub.execute_input": "2024-12-20T07:28:13.394921Z",
-     "iopub.status.busy": "2024-12-20T07:28:13.394348Z",
-     "iopub.status.idle": "2024-12-20T07:28:13.405910Z",
-     "shell.execute_reply": "2024-12-20T07:28:13.405307Z",
-     "shell.execute_reply.started": "2024-12-20T07:28:13.394870Z"
-    },
     "tags": []
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "平均成绩：2.7497分，男性：223人\n",
-      "平均成绩：2.9819分，女性：78人\n",
-      "平均成绩：2.8099分，总体：301人\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "import json\n",
     "\n",
@@ -2031,32 +1651,12 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": null,
    "id": "1b4a3f02-9b2e-41fc-ac6c-8163907a07f1",
    "metadata": {
-    "execution": {
-     "iopub.execute_input": "2024-12-20T07:30:11.095892Z",
-     "iopub.status.busy": "2024-12-20T07:30:11.095122Z",
-     "iopub.status.idle": "2024-12-20T07:30:11.117663Z",
-     "shell.execute_reply": "2024-12-20T07:30:11.117077Z",
-     "shell.execute_reply.started": "2024-12-20T07:30:11.095822Z"
-    },
     "tags": []
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "0~255分人数：91人,男性：79人,女性:12人\n",
-      "256~332分人数：143人,男性：100人,女性:43人\n",
-      "333~367分人数：47人,男性：30人,女性:17人\n",
-      "368~500分人数：20人,男性：14人,女性:6人\n",
-      "301\n",
-      "ok\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "import json\n",
     "\n",
@@ -2102,34 +1702,12 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": null,
    "id": "2d661ca6-6129-4da1-ac25-51d0156babb2",
    "metadata": {
-    "execution": {
-     "iopub.execute_input": "2024-12-20T07:30:36.266609Z",
-     "iopub.status.busy": "2024-12-20T07:30:36.266057Z",
-     "iopub.status.idle": "2024-12-20T07:30:36.276604Z",
-     "shell.execute_reply": "2024-12-20T07:30:36.275720Z",
-     "shell.execute_reply.started": "2024-12-20T07:30:36.266557Z"
-    },
     "tags": []
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "20-24 {'不合格': 7, '良好': 4, '优秀': 2, '合格': 17}\n",
-      "25-29 {'合格': 16, '不合格': 3, '良好': 6, '优秀': 1}\n",
-      "30-34 {'合格': 1, '优秀': 1, '不合格': 1, '良好': 2}\n",
-      "35-39 {'不合格': 0, '合格': 2, '良好': 1, '优秀': 1}\n",
-      "40-44 {'合格': 1, '不合格': 1, '良好': 2, '优秀': 0}\n",
-      "45-49 {'良好': 2, '合格': 5, '不合格': 0, '优秀': 1}\n",
-      "50-54 {'良好': 0, '合格': 1, '优秀': 0, '不合格': 0}\n",
-      "55-80 {'良好': 0, '合格': 0, '不合格': 0}\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "nld = [[20,24],[25,29],[30,34],[35,39],[40,44],[45,49],[50,54],[55,80]]\n",
     "\n",
@@ -2169,34 +1747,12 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": null,
    "id": "fc97df37-34ff-4a02-9d26-b5d81b706e46",
    "metadata": {
-    "execution": {
-     "iopub.execute_input": "2024-12-20T07:30:38.696485Z",
-     "iopub.status.busy": "2024-12-20T07:30:38.695765Z",
-     "iopub.status.idle": "2024-12-20T07:30:38.711240Z",
-     "shell.execute_reply": "2024-12-20T07:30:38.710163Z",
-     "shell.execute_reply.started": "2024-12-20T07:30:38.696422Z"
-    },
     "tags": []
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "20-24 {'不合格': 28, '良好': 7, '优秀': 1, '合格': 26}\n",
-      "25-29 {'合格': 18, '不合格': 17, '良好': 1, '优秀': 0}\n",
-      "30-34 {'合格': 10, '优秀': 2, '不合格': 11, '良好': 4}\n",
-      "35-39 {'不合格': 8, '合格': 13, '良好': 7, '优秀': 5}\n",
-      "40-44 {'合格': 10, '不合格': 3, '良好': 3, '优秀': 1}\n",
-      "45-49 {'良好': 4, '合格': 12, '不合格': 8, '优秀': 1}\n",
-      "50-54 {'良好': 2, '合格': 8, '优秀': 4, '不合格': 2}\n",
-      "55-80 {'良好': 2, '合格': 3, '不合格': 2}\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "nld = [[20,24],[25,29],[30,34],[35,39],[40,44],[45,49],[50,54],[55,80]]\n",
     "\n",
@@ -2236,34 +1792,12 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": null,
    "id": "dafb86f8-5ee0-4c87-a98f-c7ff0f631fe5",
    "metadata": {
-    "execution": {
-     "iopub.execute_input": "2024-12-20T07:31:09.731948Z",
-     "iopub.status.busy": "2024-12-20T07:31:09.731194Z",
-     "iopub.status.idle": "2024-12-20T07:31:09.742741Z",
-     "shell.execute_reply": "2024-12-20T07:31:09.741604Z",
-     "shell.execute_reply.started": "2024-12-20T07:31:09.731880Z"
-    },
     "tags": []
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "16~24岁平均成绩：2.69分，人数：92人,男性：62人\n",
-      "25~29岁平均成绩：2.72分，人数：62人,男性：36人\n",
-      "30~34岁平均成绩：2.75分，人数：32人,男性：27人\n",
-      "35~39岁平均成绩：3.04分，人数：37人,男性：33人\n",
-      "40~44岁平均成绩：2.94分，人数：21人,男性：17人\n",
-      "45~49岁平均成绩：2.89分，人数：33人,男性：25人\n",
-      "50~54岁平均成绩：3.1分，人数：17人,男性：16人\n",
-      "55~69岁平均成绩：2.85分，人数：7人,男性：7人\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "nld = [[16,24],[25,29],[30,34],[35,39],[40,44],[45,49],[50,54],[55,69]]\n",
     "\n",
@@ -2298,34 +1832,12 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": null,
    "id": "347703a1-501b-4800-bd29-16e94f4a6793",
    "metadata": {
-    "execution": {
-     "iopub.execute_input": "2024-12-20T07:35:34.912029Z",
-     "iopub.status.busy": "2024-12-20T07:35:34.911266Z",
-     "iopub.status.idle": "2024-12-20T07:35:34.922511Z",
-     "shell.execute_reply": "2024-12-20T07:35:34.921440Z",
-     "shell.execute_reply.started": "2024-12-20T07:35:34.911960Z"
-    },
     "tags": []
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "20~24岁平均成绩：2.59分，人数：62人\n",
-      "25~29岁平均成绩：2.52分，人数：36人\n",
-      "30~34岁平均成绩：2.65分，人数：27人\n",
-      "35~39岁平均成绩：3.02分，人数：33人\n",
-      "40~44岁平均成绩：2.95分，人数：17人\n",
-      "45~49岁平均成绩：2.81分，人数：25人\n",
-      "50~54岁平均成绩：3.13分，人数：16人\n",
-      "55~80岁平均成绩：2.85分，人数：7人\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "import json\n",
     "\n",
@@ -2360,34 +1872,12 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 29,
+   "execution_count": null,
    "id": "5900d1c7-2f8c-4dfa-a60e-a577fb90f22d",
    "metadata": {
-    "execution": {
-     "iopub.execute_input": "2024-12-12T09:04:56.288764Z",
-     "iopub.status.busy": "2024-12-12T09:04:56.288050Z",
-     "iopub.status.idle": "2024-12-12T09:04:56.304610Z",
-     "shell.execute_reply": "2024-12-12T09:04:56.303440Z",
-     "shell.execute_reply.started": "2024-12-12T09:04:56.288700Z"
-    },
     "tags": []
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "20~24岁平均成绩：2.88分，人数：30人\n",
-      "25~29岁平均成绩：2.98分，人数：26人\n",
-      "30~34岁平均成绩：3.28分，人数：5人\n",
-      "35~39岁平均成绩：3.24分，人数：4人\n",
-      "40~44岁平均成绩：2.88分，人数：4人\n",
-      "45~49岁平均成绩：3.14分，人数：8人\n",
-      "50~54岁平均成绩：2.67分，人数：1人\n",
-      "55~80岁平均成绩：0分，人数：0人\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "nld = [[20,24],[25,29],[30,34],[35,39],[40,44],[45,49],[50,54],[55,80]]\n",
     "\n",
@@ -2420,36 +1910,12 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": null,
    "id": "ad69c45d-3f62-42df-894d-47424e759029",
    "metadata": {
-    "execution": {
-     "iopub.execute_input": "2024-12-20T07:34:04.864554Z",
-     "iopub.status.busy": "2024-12-20T07:34:04.863864Z",
-     "iopub.status.idle": "2024-12-20T07:34:04.875213Z",
-     "shell.execute_reply": "2024-12-20T07:34:04.874207Z",
-     "shell.execute_reply.started": "2024-12-20T07:34:04.864491Z"
-    },
     "tags": []
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "BMI 3.65 279\n",
-      "肺活量 3.37 268\n",
-      "握力 1.77 284\n",
-      "坐位体前屈 2.78 249\n",
-      "纵跳 2.82 245\n",
-      "俯卧撑 2.31 145\n",
-      "一分钟仰卧起坐 2.98 56\n",
-      "单脚站立 2.59 205\n",
-      "选择反应时 2.83 270\n",
-      "台阶指数 2.88 213\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "with open(filename,'r') as fl:\n",
     "    dict1 = json.load(fl) \n",
@@ -2825,27 +2291,12 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 50,
+   "execution_count": null,
    "id": "ad3078ac-ae53-4bb4-95bd-387631092bf1",
    "metadata": {
-    "execution": {
-     "iopub.execute_input": "2024-12-06T14:12:43.778020Z",
-     "iopub.status.busy": "2024-12-06T14:12:43.777211Z",
-     "iopub.status.idle": "2024-12-06T14:12:43.913724Z",
-     "shell.execute_reply": "2024-12-06T14:12:43.913244Z",
-     "shell.execute_reply.started": "2024-12-06T14:12:43.777944Z"
-    },
     "tags": []
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "ok\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "list2 = ['成就感','愉快心境','放松程度','压力应对','体力充沛','情感充沛度']\n",
     "list3 = [[5,7],[7,4],[7,4],[7,4],[8,1],[6,1]]\n",
@@ -2902,26 +2353,10 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 63,
+   "execution_count": null,
    "id": "122f19fb-3531-4074-94e4-e2afdb8af51a",
-   "metadata": {
-    "execution": {
-     "iopub.execute_input": "2024-12-08T04:21:58.990344Z",
-     "iopub.status.busy": "2024-12-08T04:21:58.989588Z",
-     "iopub.status.idle": "2024-12-08T04:21:59.054676Z",
-     "shell.execute_reply": "2024-12-08T04:21:59.054144Z",
-     "shell.execute_reply.started": "2024-12-08T04:21:58.990273Z"
-    }
-   },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "ok\n"
-     ]
-    }
-   ],
+   "metadata": {},
+   "outputs": [],
    "source": [
     "list4 = ['颈椎','胸椎','腰椎','骶尾椎']\n",
     "list5 = [[0,10,10],[10,17,7],[17,24,6],[24,26,2]]\n",
@@ -2962,26 +2397,10 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 64,
+   "execution_count": null,
    "id": "1a5a10cb-f6bc-4e3a-83cc-78b9c0cbe994",
-   "metadata": {
-    "execution": {
-     "iopub.execute_input": "2024-12-08T04:24:23.871310Z",
-     "iopub.status.busy": "2024-12-08T04:24:23.870782Z",
-     "iopub.status.idle": "2024-12-08T04:24:24.037452Z",
-     "shell.execute_reply": "2024-12-08T04:24:24.036877Z",
-     "shell.execute_reply.started": "2024-12-08T04:24:23.871259Z"
-    }
-   },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "ok\n"
-     ]
-    }
-   ],
+   "metadata": {},
+   "outputs": [],
    "source": [
     "list4 = ['颈椎','胸椎','腰椎','骶尾椎']\n",
     "list5 = [[0,10,10],[10,17,7],[17,24,6],[24,26,2]]\n",
diff --git a/体测单位/延庆.ipynb b/体测单位/延庆.ipynb
index 017c359..f6d3048 100644
--- a/体测单位/延庆.ipynb
+++ b/体测单位/延庆.ipynb
@@ -10,15 +10,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 29,
    "id": "3d5ddc7a-a331-438d-aa8d-1ad74c7250d0",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-03-15T11:30:29.780788Z",
-     "iopub.status.busy": "2025-03-15T11:30:29.780027Z",
-     "iopub.status.idle": "2025-03-15T11:30:29.813663Z",
-     "shell.execute_reply": "2025-03-15T11:30:29.813167Z",
-     "shell.execute_reply.started": "2025-03-15T11:30:29.780712Z"
+     "iopub.execute_input": "2025-03-23T12:04:07.998224Z",
+     "iopub.status.busy": "2025-03-23T12:04:07.997422Z",
+     "iopub.status.idle": "2025-03-23T12:04:08.037664Z",
+     "shell.execute_reply": "2025-03-23T12:04:08.037059Z",
+     "shell.execute_reply.started": "2025-03-23T12:04:07.998155Z"
     }
    },
    "outputs": [
@@ -38,17 +38,21 @@
     "wb = openpyxl.load_workbook('data/延庆测试名单.xlsx')\n",
     "sheet = wb.active\n",
     "# sheets = wb.sheetnames\n",
-    "person = {}\n",
+    "filename = 'data/延庆人员.json'\n",
+    "with open(filename,'r') as fl:\n",
+    "    person = json.load(fl) \n",
+    "\n",
     "\n",
     "for n in range(2, sheet.max_row+1):\n",
     "    code = int(sheet.cell(n, 1).value)\n",
-    "    person.setdefault(code, {})\n",
-    "    dict1 = {}\n",
-    "    dict1['name'] = sheet.cell(n, 2).value\n",
-    "    dict1['sex'] = sheet.cell(n, 4).value\n",
-    "    dict1['birth'] = str(sheet.cell(n, 3).value).replace('/','-').split(' ')[0] \n",
-    "    dict1['phone'] = str(sheet.cell(n, 5).value)\n",
-    "    person[code] = dict1\n",
+    "    if code not in person.keys():\n",
+    "        person.setdefault(code, {})\n",
+    "        dict1 = {}\n",
+    "        dict1['name'] = sheet.cell(n, 2).value\n",
+    "        dict1['sex'] = sheet.cell(n, 4).value\n",
+    "        dict1['birth'] = str(sheet.cell(n, 3).value).replace('/','-').split(' ')[0] \n",
+    "        dict1['phone'] = str(sheet.cell(n, 5).value)\n",
+    "        person[code] = dict1\n",
     "filename = 'data/延庆人员.json'\n",
     "with open(filename, 'w') as fl:\n",
     "    json.dump(person, fl, ensure_ascii=False)\n",
@@ -65,15 +69,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 30,
    "id": "36aa14f9-cdfd-4ad4-a84e-9809c9db9958",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-03-15T11:53:27.327555Z",
-     "iopub.status.busy": "2025-03-15T11:53:27.327111Z",
-     "iopub.status.idle": "2025-03-15T11:53:27.348436Z",
-     "shell.execute_reply": "2025-03-15T11:53:27.347781Z",
-     "shell.execute_reply.started": "2025-03-15T11:53:27.327503Z"
+     "iopub.execute_input": "2025-03-23T12:05:05.752592Z",
+     "iopub.status.busy": "2025-03-23T12:05:05.751930Z",
+     "iopub.status.idle": "2025-03-23T12:05:05.764094Z",
+     "shell.execute_reply": "2025-03-23T12:05:05.763087Z",
+     "shell.execute_reply.started": "2025-03-23T12:05:05.752534Z"
     }
    },
    "outputs": [
@@ -81,7 +85,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "14\n"
+      "34\n"
      ]
     }
    ],
@@ -95,7 +99,7 @@
     "filename = 'data/延庆人员.json'\n",
     "with open(filename,'r') as fl:\n",
     "    dict1 = json.load(fl) \n",
-    "filename = 'data/marks_20250315.csv'\n",
+    "filename = 'data/marks_20250323.csv'\n",
     "re_ta = My.get_result(filename,dict1)\n",
     "\n",
     "filename = 'data/result_延庆人员.json'\n",
@@ -114,15 +118,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 31,
    "id": "8f459ed3-fc14-404f-998b-5ed2a15958c3",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-03-15T11:30:35.367110Z",
-     "iopub.status.busy": "2025-03-15T11:30:35.366428Z",
-     "iopub.status.idle": "2025-03-15T11:30:35.380746Z",
-     "shell.execute_reply": "2025-03-15T11:30:35.379748Z",
-     "shell.execute_reply.started": "2025-03-15T11:30:35.367051Z"
+     "iopub.execute_input": "2025-03-23T12:05:25.676321Z",
+     "iopub.status.busy": "2025-03-23T12:05:25.673408Z",
+     "iopub.status.idle": "2025-03-23T12:05:25.698862Z",
+     "shell.execute_reply": "2025-03-23T12:05:25.697358Z",
+     "shell.execute_reply.started": "2025-03-23T12:05:25.676245Z"
     }
    },
    "outputs": [
@@ -326,15 +330,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 27,
    "id": "7c170e0e-e618-42b2-99ee-7b6f2ee34bb4",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-03-15T11:30:50.221964Z",
-     "iopub.status.busy": "2025-03-15T11:30:50.221472Z",
-     "iopub.status.idle": "2025-03-15T11:30:50.229690Z",
-     "shell.execute_reply": "2025-03-15T11:30:50.229155Z",
-     "shell.execute_reply.started": "2025-03-15T11:30:50.221936Z"
+     "iopub.execute_input": "2025-03-19T06:03:51.230034Z",
+     "iopub.status.busy": "2025-03-19T06:03:51.229318Z",
+     "iopub.status.idle": "2025-03-19T06:03:51.242666Z",
+     "shell.execute_reply": "2025-03-19T06:03:51.241497Z",
+     "shell.execute_reply.started": "2025-03-19T06:03:51.229965Z"
     }
    },
    "outputs": [
@@ -342,7 +346,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "7\n"
+      "8\n"
      ]
     }
    ],
@@ -355,7 +359,6 @@
     "import my_module as My\n",
     "\n",
     "dict1 = {}\n",
-    "\n",
     "filename = 'data/result_延庆人员.json'\n",
     "with open(filename,'r') as fl:\n",
     "    dict1 = json.load(fl)\n",
@@ -368,21 +371,13 @@
     "    if 'phone' in v.keys():\n",
     "        phone[v['phone']] = k\n",
     "\n",
-    "list1 = []\n",
     "filename = 'data/Survey_20250315.csv'\n",
-    "with open(filename,'r',newline='') as csv_file:\n",
-    "    fl = csv.reader(csv_file,delimiter=',')\n",
-    "    header = next(fl)    \n",
-    "    for line in fl:\n",
-    "        list1.append(line)\n",
-    "\n",
-    "data1 = My.get_wenjuan(list1,phone,dict1,dict3)\n",
-    "\n",
+    "data1 = My.get_wenjuan(filename,phone,dict1,dict3)\n",
     "\n",
     "filename = 'data/result_延庆人员-1.json'\n",
     "with open(filename,'w') as fl:\n",
     "    json.dump(data1[0], fl, ensure_ascii=False)\n",
-    "print(data1[1])\n"
+    "print(data1[1])"
    ]
   },
   {
@@ -395,15 +390,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 32,
    "id": "9e843585-fef3-4f5c-baae-76e711f2a42f",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-03-15T11:31:04.247327Z",
-     "iopub.status.busy": "2025-03-15T11:31:04.246569Z",
-     "iopub.status.idle": "2025-03-15T11:31:12.426034Z",
-     "shell.execute_reply": "2025-03-15T11:31:12.425404Z",
-     "shell.execute_reply.started": "2025-03-15T11:31:04.247255Z"
+     "iopub.execute_input": "2025-03-23T12:06:54.063669Z",
+     "iopub.status.busy": "2025-03-23T12:06:54.062938Z",
+     "iopub.status.idle": "2025-03-23T12:07:09.016508Z",
+     "shell.execute_reply": "2025-03-23T12:07:09.015300Z",
+     "shell.execute_reply.started": "2025-03-23T12:06:54.063585Z"
     }
    },
    "outputs": [
@@ -411,7 +406,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "14\n"
+      "32\n"
      ]
     }
    ],
@@ -424,7 +419,7 @@
     "headers = {\n",
     "    \"Content-Type\": \"application/json; charset=UTF-8\"\n",
     "    }\n",
-    "filename = 'data/result_延庆人员-1.json'\n",
+    "filename = 'data/result_延庆人员.json'\n",
     "with open(filename,'r') as fl:\n",
     "    dict1 = json.load(fl)\n",
     "list1 = []\n",
@@ -445,8 +440,7 @@
     "    if v['sex'] == '男':\n",
     "        mydata['gender'] = 'male'\n",
     "    else:\n",
-    "        mydata['gender'] = 'female'\n",
-    "    \n",
+    "        mydata['gender'] = 'female'    \n",
     "    mydata['month'] = v['month']\n",
     "    mydata['fits'] = {}\n",
     "    survey_list = ['tcm','psy','spine']\n",
@@ -454,9 +448,6 @@
     "        if item in  v.keys():\n",
     "            mydata.setdefault('surveys',{})\n",
     "            mydata['surveys'][item] = v[item]\n",
-    "            \n",
-    "    \n",
-    "    #mydata['fits'] = {}\n",
     "    for item in list_item:\n",
     "        if item in v.keys():\n",
     "            mydata.setdefault('fits',{})\n",
@@ -465,14 +456,14 @@
     "            else:\n",
     "                mark = v[item]['成绩'].split()[0]\n",
     "            mydata['fits'][item] = {'mark':mark,'score':v[item]['score']}\n",
-    "    if len(mydata['fits']) >2 or len(mydata['surveys']) >0:\n",
+    "    #if len(mydata['fits']) >2 or len(mydata['surveys']) >0:\n",
+    "    if len(mydata['fits']) >2 or 'surveys' in mydata.keys():\n",
     "    #if len(mydata['fits']) >2 :    \n",
     "        list1.append(mydata)\n",
     "        list2.append([k,v['name']])\n",
     "        i+=1\n",
     "        x = requests.post('http://localhost:3003', data = json.dumps(list1), headers=headers)\n",
     "        #print(id,v['name'],x.text)\n",
-    "        #print(mydata)\n",
     "        #x.close()\n",
     "print(i)"
    ]
@@ -480,7 +471,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "7143c16b-6e45-4a10-a04c-6b90631ddfb0",
+   "id": "e67464a4-a588-4be4-9983-ac2555db08c4",
    "metadata": {},
    "outputs": [],
    "source": []
diff --git a/体测单位/海淀老干部大学.ipynb b/体测单位/海淀老干部大学.ipynb
index 65e6ef0..c21bef8 100644
--- a/体测单位/海淀老干部大学.ipynb
+++ b/体测单位/海淀老干部大学.ipynb
@@ -122,15 +122,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 20,
    "id": "fd005ed3-24ee-4b39-a619-6c83e64c2852",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-03-11T06:50:46.618660Z",
-     "iopub.status.busy": "2025-03-11T06:50:46.617709Z",
-     "iopub.status.idle": "2025-03-11T06:50:46.633813Z",
-     "shell.execute_reply": "2025-03-11T06:50:46.633056Z",
-     "shell.execute_reply.started": "2025-03-11T06:50:46.618581Z"
+     "iopub.execute_input": "2025-03-18T08:59:51.660525Z",
+     "iopub.status.busy": "2025-03-18T08:59:51.660023Z",
+     "iopub.status.idle": "2025-03-18T08:59:51.676922Z",
+     "shell.execute_reply": "2025-03-18T08:59:51.676147Z",
+     "shell.execute_reply.started": "2025-03-18T08:59:51.660475Z"
     }
    },
    "outputs": [
@@ -138,7 +138,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "29\n"
+      "40\n"
      ]
     }
    ],
@@ -155,7 +155,7 @@
     "with open(filename,'r') as fl:\n",
     "    dict1 = json.load(fl) \n",
     "\n",
-    "filename = 'data/marks_20250311.csv'\n",
+    "filename = 'data/marks_20250318.csv'\n",
     "with open(filename,'r',newline='') as csv_file:\n",
     "    fl = csv.reader(csv_file,delimiter=',')\n",
     "    header = next(fl)    \n",
@@ -206,15 +206,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 21,
    "id": "9481765c-92b7-4a58-b192-582bb001f167",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-03-11T06:51:42.447230Z",
-     "iopub.status.busy": "2025-03-11T06:51:42.446485Z",
-     "iopub.status.idle": "2025-03-11T06:51:42.461166Z",
-     "shell.execute_reply": "2025-03-11T06:51:42.459770Z",
-     "shell.execute_reply.started": "2025-03-11T06:51:42.447161Z"
+     "iopub.execute_input": "2025-03-18T08:59:58.639366Z",
+     "iopub.status.busy": "2025-03-18T08:59:58.638697Z",
+     "iopub.status.idle": "2025-03-18T08:59:58.654499Z",
+     "shell.execute_reply": "2025-03-18T08:59:58.653527Z",
+     "shell.execute_reply.started": "2025-03-18T08:59:58.639304Z"
     }
    },
    "outputs": [
@@ -355,15 +355,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": 22,
    "id": "dd8ed4fe-5014-455f-993d-64a41519de6d",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-03-13T07:54:13.739008Z",
-     "iopub.status.busy": "2025-03-13T07:54:13.738365Z",
-     "iopub.status.idle": "2025-03-13T07:54:13.762948Z",
-     "shell.execute_reply": "2025-03-13T07:54:13.762206Z",
-     "shell.execute_reply.started": "2025-03-13T07:54:13.738946Z"
+     "iopub.execute_input": "2025-03-18T09:00:09.951390Z",
+     "iopub.status.busy": "2025-03-18T09:00:09.949962Z",
+     "iopub.status.idle": "2025-03-18T09:00:09.977680Z",
+     "shell.execute_reply": "2025-03-18T09:00:09.977238Z",
+     "shell.execute_reply.started": "2025-03-18T09:00:09.951310Z"
     }
    },
    "outputs": [
@@ -371,7 +371,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "27\n"
+      "36\n"
      ]
     }
    ],
@@ -397,7 +397,7 @@
     "        phone[v['phone']] = k\n",
     "\n",
     "list1 = []\n",
-    "filename = 'data/Survey_20250313.csv'\n",
+    "filename = 'data/Survey_20250318.csv'\n",
     "with open(filename,'r',newline='') as csv_file:\n",
     "    fl = csv.reader(csv_file,delimiter=',')\n",
     "    header = next(fl)    \n",
@@ -470,15 +470,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 19,
+   "execution_count": 23,
    "id": "b8b2fc93-9e8b-4bde-bc13-2de179de2b2d",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-03-13T07:54:20.836739Z",
-     "iopub.status.busy": "2025-03-13T07:54:20.836013Z",
-     "iopub.status.idle": "2025-03-13T07:54:37.198424Z",
-     "shell.execute_reply": "2025-03-13T07:54:37.197192Z",
-     "shell.execute_reply.started": "2025-03-13T07:54:20.836671Z"
+     "iopub.execute_input": "2025-03-18T09:00:27.649247Z",
+     "iopub.status.busy": "2025-03-18T09:00:27.648488Z",
+     "iopub.status.idle": "2025-03-18T09:00:49.222330Z",
+     "shell.execute_reply": "2025-03-18T09:00:49.221284Z",
+     "shell.execute_reply.started": "2025-03-18T09:00:27.649176Z"
     }
    },
    "outputs": [
@@ -486,7 +486,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "29\n"
+      "40\n"
      ]
     }
    ],
diff --git a/体测单位/青海.ipynb b/体测单位/青海.ipynb
index 3e20535..714785c 100644
--- a/体测单位/青海.ipynb
+++ b/体测单位/青海.ipynb
@@ -1433,6 +1433,72 @@
     "print(len(re_ta))"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "id": "0658cf8a-9c37-45c8-84db-e24ad29b64c7",
+   "metadata": {},
+   "source": [
+    "## 生成测试得分"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "id": "58e5805d-e778-4ec5-a1cb-3b34207baea7",
+   "metadata": {
+    "execution": {
+     "iopub.execute_input": "2025-03-26T05:55:00.358304Z",
+     "iopub.status.busy": "2025-03-26T05:55:00.357480Z",
+     "iopub.status.idle": "2025-03-26T05:55:00.376296Z",
+     "shell.execute_reply": "2025-03-26T05:55:00.375437Z",
+     "shell.execute_reply.started": "2025-03-26T05:55:00.358233Z"
+    }
+   },
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "ok!\n"
+     ]
+    }
+   ],
+   "source": [
+    "import json\n",
+    "import time\n",
+    "import my_module as My\n",
+    "\n",
+    "#list_item = ['lung','grip','flexion','jump','pushup','balance','reaction','step','situp','height','weight']\n",
+    "list_item = ['lung','grip','flexion','jump','pushup','balance','reaction','step','situp']\n",
+    "filename = 'data/result_青海2025.json'\n",
+    "with open(filename,'r') as fl:\n",
+    "    dict2 = json.load(fl) \n",
+    "for k, v in dict2.items():\n",
+    "    #print(k)\n",
+    "    if v['sex'] == '男':\n",
+    "        sex = 'M'\n",
+    "    else:\n",
+    "        sex = 'F'            \n",
+    "    if 'bmi' in v.keys():\n",
+    "        #bmi_data = v['height']['成绩'].split()[0]+','+ v['weight']['成绩'].split()[0]\n",
+    "        bmi_data = v['bmi']['成绩']\n",
+    "        data1 = {'code':k,'sex':sex,'age':v['age'],'item':'HeightWeight','result':bmi_data}\n",
+    "        dict2[k]['bmi'] = {}\n",
+    "        dict2[k]['bmi']['成绩'] = bmi_data\n",
+    "        dict2[k]['bmi']['score'] = My.cal_bmi(data1)\n",
+    "    for item_en in list_item:\n",
+    "        if item_en in v.keys():            \n",
+    "            data1 = {'code':k,'sex':sex,'age':v['age'],'item':item_en,'result':float(v[item_en]['成绩'].split()[0])}\n",
+    "            #print(k,v['name'])\n",
+    "            dict2[k][item_en]['score'] = My.cal_score(data1)\n",
+    "            #print(k,v[item_en]['成绩'],cal_score(data1))\n",
+    "\n",
+    "filename = f'data/result_青海2025.json'\n",
+    "with open(filename,'w') as fl:\n",
+    "    json.dump(dict2,fl , ensure_ascii=False) \n",
+    "print('ok!')        "
+   ]
+  },
   {
    "cell_type": "markdown",
    "id": "c6ede59a-e5a0-489b-853f-f317e12b1fa3",
@@ -1443,15 +1509,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": 2,
    "id": "f3d39079-fa3a-400c-990e-75a8a0a7b42d",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-01-20T01:12:49.821141Z",
-     "iopub.status.busy": "2025-01-20T01:12:49.820394Z",
-     "iopub.status.idle": "2025-01-20T01:12:49.854877Z",
-     "shell.execute_reply": "2025-01-20T01:12:49.854327Z",
-     "shell.execute_reply.started": "2025-01-20T01:12:49.821069Z"
+     "iopub.execute_input": "2025-03-26T05:55:54.431815Z",
+     "iopub.status.busy": "2025-03-26T05:55:54.431138Z",
+     "iopub.status.idle": "2025-03-26T05:55:54.621742Z",
+     "shell.execute_reply": "2025-03-26T05:55:54.621190Z",
+     "shell.execute_reply.started": "2025-03-26T05:55:54.431756Z"
     }
    },
    "outputs": [],
@@ -1504,6 +1570,131 @@
     "wb.save(filename)"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "id": "cd0822ae-0d56-4da4-88f4-abbef0bbe77d",
+   "metadata": {},
+   "source": [
+    "## 导入问卷信息"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 16,
+   "id": "a9ead9a5-8006-414d-afe9-c1cb9ccfc378",
+   "metadata": {
+    "execution": {
+     "iopub.execute_input": "2025-03-26T08:49:28.501374Z",
+     "iopub.status.busy": "2025-03-26T08:49:28.500816Z",
+     "iopub.status.idle": "2025-03-26T08:49:28.528745Z",
+     "shell.execute_reply": "2025-03-26T08:49:28.528262Z",
+     "shell.execute_reply.started": "2025-03-26T08:49:28.501320Z"
+    }
+   },
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "46\n"
+     ]
+    }
+   ],
+   "source": [
+    "import json\n",
+    "import csv\n",
+    "import openpyxl\n",
+    "import time\n",
+    "from datetime import date\n",
+    "#import my_module as My\n",
+    "\n",
+    "dict1 = {}\n",
+    "filename = 'data/result_青海2025.json'\n",
+    "with open(filename,'r') as fl:\n",
+    "    dict1 = json.load(fl)\n",
+    "filename = 'data/青海人员2025.json'\n",
+    "with open(filename,'r') as fl:\n",
+    "    dict3 = json.load(fl)\n",
+    "\n",
+    "phone =  {}\n",
+    "for k,v in dict3.items():\n",
+    "    if 'phone' in v.keys():\n",
+    "        phone[str(v['phone'])] = k\n",
+    "\n",
+    "list1 = []\n",
+    "filename = 'data/Survey_20250118.csv'\n",
+    "with open(filename,'r',newline='') as csv_file:\n",
+    "    fl = csv.reader(csv_file,delimiter=',')\n",
+    "    header = next(fl)    \n",
+    "    for line in fl:\n",
+    "        list1.append(line)\n",
+    "#print(list1)\n",
+    "dict2 = {}\n",
+    "psy =[]\n",
+    "tcm = []\n",
+    "spine = []\n",
+    "for i in range(0,45):\n",
+    "    psy.append(0)\n",
+    "psy[44] = []\n",
+    "for i in range(0,60):\n",
+    "    tcm.append(0)\n",
+    "for i in range(0,26):\n",
+    "    spine.append(0)\n",
+    "\n",
+    "for item in list1:\n",
+    "    if item[2] in phone.keys():\n",
+    "        psy =[]\n",
+    "        tcm = []\n",
+    "        spine = []\n",
+    "        for i in range(0,45):\n",
+    "            psy.append(0)\n",
+    "        psy[44] = []\n",
+    "        for i in range(0,60):\n",
+    "            tcm.append(0)\n",
+    "        for i in range(0,26):\n",
+    "            spine.append(0)\n",
+    "       \n",
+    "        content = json.loads(item[5])\n",
+    "        if phone[item[2]] not in dict1.keys():\n",
+    "            dict1[phone[item[2]]] = dict3[phone[item[2]]]\n",
+    "            rq = date.fromisoformat(item[6].replace('/','-').split(' ')[0])\n",
+    "            #dict1[phone[item[2]]]['rq'] = date.fromisoformat(item[6].replace('/','-').split(' ')[0])\n",
+    "        else:\n",
+    "            rq = date.fromisoformat('2025-01-18')\n",
+    "        for k, v in content.items():\n",
+    "            if 'psy' in k:\n",
+    "                i = int(k[3:])\n",
+    "                psy[i-1] = int(v)\n",
+    "            if 'tcm' in k:\n",
+    "                i = int(k[3:])\n",
+    "                tcm[i-1] = int(v)\n",
+    "            if 'spine' in k:\n",
+    "                i = int(k[5:])\n",
+    "                spine[i-1] = int(v)\n",
+    "        if 'psy' in item[5]:\n",
+    "            #for i in range(5,26):\n",
+    "            #    new_valve = 5-psy[i]\n",
+    "            #    psy[i] = new_valve\n",
+    "            \n",
+    "            \n",
+    "            dict1[phone[item[2]]]['psy'] = psy\n",
+    "        if 'tcm' in item[5]:\n",
+    "            dict1[phone[item[2]]]['tcm'] = tcm\n",
+    "        if 'spine' in item[5]:\n",
+    "            dict1[phone[item[2]]]['spine'] = spine\n",
+    "        birth = date.fromisoformat(dict3[phone[item[2]]]['birth'].replace('/','-'))\n",
+    "        \n",
+    "        days =  (rq-birth).days          \n",
+    "        dict1[phone[item[2]]]['age'] = int(days/365)\n",
+    "        dict1[phone[item[2]]]['month'] = int(days/365*12)\n",
+    "        \n",
+    "\n",
+    "filename = 'data/result_青海2025-1.json'\n",
+    "with open(filename,'w') as fl:\n",
+    "    json.dump(dict1, fl, ensure_ascii=False)\n",
+    "print(data1[1])"
+   ]
+  },
   {
    "cell_type": "markdown",
    "id": "a19c9733-7af5-4dc6-a0ca-cc35069f532a",
@@ -1716,6 +1907,98 @@
     "wb.save(filename)    "
    ]
   },
+  {
+   "cell_type": "markdown",
+   "id": "dfaaae02-8f9b-42b1-80df-51e7c0e22495",
+   "metadata": {},
+   "source": [
+    "## 生成报告"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "id": "0ca61654-55b9-4d29-87ce-879c5f87ecd9",
+   "metadata": {
+    "execution": {
+     "iopub.execute_input": "2025-04-07T12:22:29.224569Z",
+     "iopub.status.busy": "2025-04-07T12:22:29.223783Z",
+     "iopub.status.idle": "2025-04-07T12:23:12.231320Z",
+     "shell.execute_reply": "2025-04-07T12:23:12.230105Z",
+     "shell.execute_reply.started": "2025-04-07T12:22:29.224494Z"
+    }
+   },
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "72\n"
+     ]
+    }
+   ],
+   "source": [
+    "import requests\n",
+    "import json\n",
+    "import openpyxl\n",
+    "\n",
+    "\n",
+    "headers = {\n",
+    "    \"Content-Type\": \"application/json; charset=UTF-8\"\n",
+    "    }\n",
+    "filename = 'data/result_青海2025-1.json'\n",
+    "with open(filename,'r') as fl:\n",
+    "    dict1 = json.load(fl)\n",
+    "list1 = []\n",
+    "file_path ='./青海2025-1/'\n",
+    "list_item = ['lung','grip','flexion','jump','pushup','balance','reaction','step','situp','bmi']\n",
+    "i=0\n",
+    "list2 = []\n",
+    "for  k, v in dict1.items():\n",
+    "    list1 = []\n",
+    "    mydata = {}\n",
+    "    \n",
+    "    id = str(k).rjust(4,\"0\")\n",
+    "    mydata['path'] = file_path+id+'-'+ v['name']+'.pdf'\n",
+    "    mydata['title'] = '青海油田勘探事业部'\n",
+    "    mydata['subtitle'] = v['unit']\n",
+    "    mydata['id'] = id\n",
+    "    mydata['name'] = v['name']\n",
+    "    if v['sex'] == '男':\n",
+    "        mydata['gender'] = 'male'\n",
+    "    else:\n",
+    "        mydata['gender'] = 'female'\n",
+    "    \n",
+    "    mydata['month'] = v['month']\n",
+    "    mydata['fits'] = {}\n",
+    "    survey_list = ['tcm','psy','spine']\n",
+    "    for item in survey_list:\n",
+    "        if item in  v.keys():\n",
+    "            mydata.setdefault('surveys',{})\n",
+    "            mydata['surveys'][item] = v[item]\n",
+    "            \n",
+    "    \n",
+    "    #mydata['fits'] = {}\n",
+    "    for item in list_item:\n",
+    "        if item in v.keys():\n",
+    "            mydata.setdefault('fits',{})\n",
+    "            if item in ['lung','pushup','step','situp']:\n",
+    "                mark = v[item]['成绩'].split()[0].split('.')[0]\n",
+    "            else:\n",
+    "                mark = v[item]['成绩'].split()[0]\n",
+    "            mydata['fits'][item] = {'mark':mark,'score':v[item]['score']}\n",
+    "    if len(mydata['fits']) >2 or len(mydata['surveys']) >0:\n",
+    "    #if len(mydata['fits']) >2 :    \n",
+    "        list1.append(mydata)\n",
+    "        list2.append([k,v['name']])\n",
+    "        i+=1\n",
+    "        x = requests.post('http://localhost:3003', data = json.dumps(list1), headers=headers)\n",
+    "        #print(id,v['name'],x.text)\n",
+    "        #print(mydata)\n",
+    "        #x.close()\n",
+    "print(i)"
+   ]
+  },
   {
    "cell_type": "markdown",
    "id": "1208eb16-a220-48c4-8c9e-cc4dbf67306e",