From aadc6071452647d34ed5cb955f606cd9147abd3c Mon Sep 17 00:00:00 2001 From: liuyebo <1515783401@qq.com> Date: Tue, 13 Aug 2024 17:08:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8C=BB=E9=99=A2=E7=9A=84?= =?UTF-8?q?=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 2 +- photo_review/photo_review.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a759c8f..bebe078 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ x-env: &template - image: fcb_photo_review:1.11.1 + image: fcb_photo_review:1.11.2 restart: always services: diff --git a/photo_review/photo_review.py b/photo_review/photo_review.py index 58c2ad1..6a58f85 100644 --- a/photo_review/photo_review.py +++ b/photo_review/photo_review.py @@ -8,7 +8,7 @@ from time import sleep import cv2 import requests -from sqlalchemy import update +from sqlalchemy import update, or_ from db import MysqlSession from db.mysql import BdYljg, BdYlks, ZxIeResult, ZxIeCost, ZxIeDischarge, ZxIeSettlement, ZxPhhd, ZxPhrec @@ -239,8 +239,8 @@ def discharge_task(pk_phhd, discharge_record, identity): hospital_value = get_values_of_keys(discharge_record_ie_result, HOSPITAL) if hospital_value: session = MysqlSession() - yljg = session.query(BdYljg.pk_yljg, BdYljg.name) \ - .filter(BdYljg.name.in_(hospital_value)).limit(1).one_or_none() + yljg = (session.query(BdYljg.pk_yljg, BdYljg.name) + .filter(or_(*[BdYljg.name.like(f'%{hos}%') for hos in hospital_value])).limit(1).one_or_none()) session.close() if yljg: discharge_data["pk_yljg"] = yljg.pk_yljg