From 7cd0a564a069ded23c6cc40f1046f6576f4b4e9b Mon Sep 17 00:00:00 2001
From: liuyebo <1515783401@qq.com>
Date: Wed, 11 Sep 2024 10:24:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E7=BB=93=E7=AE=97=E5=8D=95?=
 =?UTF-8?q?=E6=89=8D=E8=BF=9B=E8=A1=8C=E9=AB=98=E6=B8=85=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml                | 32 +++++++++++++++----------------
 photo_review/auto_photo_review.py |  2 ++
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index dbb329b..b05ab8b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 x-env:
   &template
-  image: fcb_photo_review:1.14.4
+  image: fcb_photo_review:1.14.5
   restart: always
 
 x-review:
@@ -105,18 +105,18 @@ services:
       - photo_mask_1
     command: [ 'photo_mask.py' ]
 
-  photo_review_6:
-    <<: *review_template
-    container_name: photo_review_6
-    hostname: photo_review_6
-    depends_on:
-      - photo_mask_2
-    command: [ 'photo_review.py' ]
-
-  photo_review_7:
-    <<: *review_template
-    container_name: photo_review_7
-    hostname: photo_review_7
-    depends_on:
-      - photo_review_6
-    command: [ 'photo_review.py' ]
\ No newline at end of file
+#  photo_review_6:
+#    <<: *review_template
+#    container_name: photo_review_6
+#    hostname: photo_review_6
+#    depends_on:
+#      - photo_mask_2
+#    command: [ 'photo_review.py' ]
+#
+#  photo_review_7:
+#    <<: *review_template
+#    container_name: photo_review_7
+#    hostname: photo_review_7
+#    depends_on:
+#      - photo_review_6
+#    command: [ 'photo_review.py' ]
\ No newline at end of file
diff --git a/photo_review/auto_photo_review.py b/photo_review/auto_photo_review.py
index e4bd981..bd1bd08 100644
--- a/photo_review/auto_photo_review.py
+++ b/photo_review/auto_photo_review.py
@@ -149,6 +149,8 @@ def information_extraction(ie, phrecs, identity):
 
         # 尝试从二维码中获取高清图片
         better_image, text = get_better_image_from_qrcode(image, phrec.cfjaddress)
+        if phrec.cRectype != '1':
+            better_image = None  # 非结算单暂时不进行替换
         zx_ie_results = []
         if better_image is not None:
             img_angle = '0'