diff --git a/log/__init__.py b/log/__init__.py index bf3f6a1..7f83ed7 100644 --- a/log/__init__.py +++ b/log/__init__.py @@ -7,6 +7,7 @@ HOSTNAME = socket.gethostname() LOG_PATHS = [ f"log/{HOSTNAME}/ucloud", f"log/{HOSTNAME}/error", + f"log/{HOSTNAME}/qr", ] for path in LOG_PATHS: if not os.path.exists(path): @@ -63,6 +64,16 @@ LOGGING_CONFIG = { 'backupCount': 14, 'encoding': 'utf-8', }, + 'qr': { + 'class': 'logging.handlers.TimedRotatingFileHandler', + 'level': 'INFO', + 'formatter': 'standard', + 'filename': f'log/{HOSTNAME}/qr/fcb_photo_review_qr.log', + 'when': 'midnight', + 'interval': 1, + 'backupCount': 14, + 'encoding': 'utf-8', + }, }, # loggers定义了日志记录器 @@ -81,6 +92,11 @@ LOGGING_CONFIG = { 'handlers': ['console', 'file', 'error'], 'level': 'DEBUG', 'propagate': False, - } + }, + 'qr': { + 'handlers': ['console', 'qr'], + 'level': 'DEBUG', + 'propagate': False, + }, }, } diff --git a/photo_mask/__init__.py b/photo_mask/__init__.py index bd48978..4550163 100644 --- a/photo_mask/__init__.py +++ b/photo_mask/__init__.py @@ -1,10 +1,5 @@ -import socket - from paddleocr import PaddleOCR -# 主机名 -HOSTNAME = socket.gethostname() - """ 项目配置 """ diff --git a/photo_mask/auto_photo_mask.py b/photo_mask/auto_photo_mask.py index ee4bb99..b016f7a 100644 --- a/photo_mask/auto_photo_mask.py +++ b/photo_mask/auto_photo_mask.py @@ -9,7 +9,8 @@ from sqlalchemy import update, and_ from db import MysqlSession from db.mysql import ZxPhrec, ZxPhhd -from photo_mask import OCR, PHHD_BATCH_SIZE, SLEEP_MINUTES, NAME_KEYS, ID_CARD_NUM_KEYS, SIMILAR_CHAR, HOSTNAME +from log import HOSTNAME +from photo_mask import OCR, PHHD_BATCH_SIZE, SLEEP_MINUTES, NAME_KEYS, ID_CARD_NUM_KEYS, SIMILAR_CHAR from ucloud import BUCKET, ufile from util import image_util, util diff --git a/photo_review/__init__.py b/photo_review/__init__.py index 7d5a9fd..4077044 100644 --- a/photo_review/__init__.py +++ b/photo_review/__init__.py @@ -1,12 +1,7 @@ -import socket - import jieba from paddlenlp import Taskflow from paddleocr import PaddleOCR -# 主机名 -HOSTNAME = socket.gethostname() - """ 项目配置 """ diff --git a/photo_review/auto_photo_review.py b/photo_review/auto_photo_review.py index 3a80e2d..b39c0dc 100644 --- a/photo_review/auto_photo_review.py +++ b/photo_review/auto_photo_review.py @@ -15,11 +15,12 @@ from sqlalchemy import update from db import MysqlSession from db.mysql import BdYljg, BdYlks, ZxIeResult, ZxIeCost, ZxIeDischarge, ZxIeSettlement, ZxPhhd, ZxPhrec from doc_dewarp import dewarp +from log import HOSTNAME from paddle_detection import detector from photo_review import PATIENT_NAME, ADMISSION_DATE, DISCHARGE_DATE, MEDICAL_EXPENSES, PERSONAL_CASH_PAYMENT, \ PERSONAL_ACCOUNT_PAYMENT, PERSONAL_FUNDED_AMOUNT, MEDICAL_INSURANCE_TYPE, HOSPITAL, DEPARTMENT, DOCTOR, \ ADMISSION_ID, SETTLEMENT_ID, AGE, OCR, SETTLEMENT_IE, DISCHARGE_IE, COST_IE, PHHD_BATCH_SIZE, SLEEP_MINUTES, \ - UPPERCASE_MEDICAL_EXPENSES, HOSTNAME, HOSPITAL_ALIAS, HOSPITAL_FILTER, DEPARTMENT_ALIAS, DEPARTMENT_FILTER + UPPERCASE_MEDICAL_EXPENSES, HOSPITAL_ALIAS, HOSPITAL_FILTER, DEPARTMENT_ALIAS, DEPARTMENT_FILTER from ucloud import ufile from util import image_util, util from util.data_util import handle_date, handle_decimal, parse_department, handle_name, \ @@ -81,6 +82,7 @@ def information_extraction(ie, phrecs, identity): continue image = image_util.read(img_path) + target_images = [] target_images += detector.request_book_areas(image) # 识别文档区域并裁剪 if not target_images: