From 0f26f7f4d45dd0c304ae7608633548049497383c Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 12 Dec 2024 18:42:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B7=A5=E4=BD=8D=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=8C=BB=E4=BF=9D=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/basic/SysWorkplaceDocumentEntity.java    |  8 ++++++++
 .../api/res/basic/SysWorkplaceDocumentResponse.java |  7 +++++++
 .../collect/IoCollectOrderBackupService.java        | 13 ++++++++-----
 src/main/resources/schemas/schema_v2.4.sql          |  5 +++++
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java
index 5bf2f7ba8..8d4113c58 100644
--- a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java
@@ -214,5 +214,13 @@ public class SysWorkplaceDocumentEntity {
      */
     @TableField(value = "autoHandle")
     private Boolean autoHandle;
+
+
+    /**
+     * 是否需要上传医保 ：0：不需要；1.需要
+     */
+    @TableField(value = "uploadYb")
+    private Integer uploadYb;
+
 }
 
diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java
index 8ab19dd1c..f37a1be3f 100644
--- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java
@@ -145,6 +145,13 @@ public class SysWorkplaceDocumentResponse {
     private String collectAndTypeCodes;
 
 
+    /**
+     * 是否需要上传医保 ：0：不需要；1.需要
+     */
+    @TableField(value = "uploadYb")
+    private Integer uploadYb;
+
+
     public String getThrBusName() {
         if (StrUtil.isNotEmpty(innerBusName))
             return innerBusName;
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
index 10d0f2d33..c34098820 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
@@ -267,11 +267,14 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
             }
         }
 
-        /**
-         *    todo 这边每次都会上传至第三方服务（医保）
-         *    根据单据类型，判断是否需要上传医保，需要的话   uploadThrid(collectOrder);
-         */
-        uploadThrid(collectOrder);
+        if (sysWorkplaceDocumentEntity != null){
+            Integer uploadYb = sysWorkplaceDocumentEntity.getUploadYb();
+            if (uploadYb == 1){
+                uploadThrid(collectOrder);
+            }
+        }
+
+
 //        //插入处方备份表
 //        IoCollectOrderBackup ioCollectOrderBackup = new IoCollectOrderBackup();
 //        BeanUtils.copyProperties(collectOrder, ioCollectOrderBackup);
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 8f08f4db7..5f2f3a097 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -4902,3 +4902,8 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `
 
 
 call Modify_UNIQUE_index('io_collect_order_biz', 'orderIdFk`, `relId`, `batchNo', 'sorts', 'BTREE');
+
+
+CALL Pro_Temp_ColumnWork('sys_workplace_document', 'uploadYb',
+                         'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要上传医保 1是；0否''',
+                         1);