更新

partReport.py

@@ -303,11 +303,10 @@ def  getphysicsReport(originData,data,type, changeFileUrl, saveFileUrl, check_1_
     # 数据填报项审核 表5
     report.dataReportResult(physicsData, mkdir_path)
     # 表6数据 土壤质地类型不一致
-    middData = physicsData[['原样品编号', '样品编号']].astype(str)
-    middData['编号'] = middData['原样品编号']
-    del middData['原样品编号']
-
-    check_1_data = pd.merge(check_1_data, middData, how='left', on='编号')
+    # middData = physicsData[['原样品编号', '样品编号']].astype(str)
+    # middData['编号'] = middData['原样品编号']
+    # del middData['原样品编号']
+    # check_1_data = pd.merge(check_1_data, middData, how='left', on='编号')
     check_1_data = check_1_data.replace(np.nan, '')
     typeNotSame = check_1_data[check_1_data['土壤质地'] != check_1_data['土壤质地(判断)']]
     table_6_data = typeNotSame[['编号', '样品编号', '土壤质地', '土壤质地(判断)']]

rongzhong.py

@@ -829,10 +829,10 @@ def getReport(originData,data,changeFileUrl, saveFileUrl, check_1_data,
     # 数据填报项审核 表5
     report.dataReportResult(data, mkdir_path)
     # 表6数据 土壤质地类型不一致
-    middData = data[['原样品编号', '样品编号']].astype(str)
-    middData['编号'] = middData['原样品编号']
-    del middData['原样品编号']
-    check_1_data = pd.merge(check_1_data,middData, how='left', on='编号')
+    # middData = data[['原样品编号', '样品编号']].astype(str)
+    # middData['编号'] = middData['原样品编号']
+    # del middData['原样品编号']
+    # check_1_data = pd.merge(check_1_data,middData, how='left', on='编号')
     check_1_data = check_1_data.replace(np.nan,'')
     typeNotSame = check_1_data[check_1_data['土壤质地'] != check_1_data['土壤质地(判断)']]
     table_6_data = typeNotSame[['编号','样品编号', '土壤质地', '土壤质地(判断)']]