sql 文件 处理冲突

src/main/java/cn/hnthyy/thmz/controller/CommonController.java

@@ -163,11 +163,6 @@ public class CommonController {
         }
     }
 
-    @GetMapping("/getDownFilePlus")
-   public R getDownFilePlus(){
-        String data = dictDataService.queryDictVlaue("2.9", "down_file_puls", null);
-        return R.ok().put("data", data);
-   }
 
     /**
      * 查询所有可以使用的门诊挂号时间区间(没过时间段)

src/main/java/cn/hnthyy/thmz/mapper/thmz/UserMapper.java

@@ -170,4 +170,6 @@ public interface UserMapper {
     User selectUserByUserIdCode(@Param("userIdCode") String userIdCode);
     @Update(" update t_user set password =#{password} where user_code = #{userCode} ")
     int updatePasswordByUserCode(User user);
+    @Select("select password from t_user where user_code=#{userCode}")
+    String selectPassword(String userCode);
 }

src/main/resources/otherSource/update_table.sql

@@ -143,3 +143,549 @@ WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW
 ON [PRIMARY]
 GO
 
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : 172.16.32.179
+ Source Server Type    : SQL Server
+ Source Server Version : 10506000
+ Source Host           : 172.16.32.179:1433
+ Source Catalog        : thxyhisdb
+ Source Schema         : dbo
+
+ Target Server Type    : SQL Server
+ Target Server Version : 10506000
+ File Encoding         : 65001
+
+ Date: 28/04/2025 10:06:24
+*/
+
+
+-- ----------------------------
+-- Table structure for t_wxmall_package
+-- ----------------------------
+IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[t_wxmall_package]') AND type IN ('U'))
+	DROP TABLE [dbo].[t_wxmall_package]
+GO
+
+CREATE TABLE [dbo].[t_wxmall_package] (
+  [id] varchar(32) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [name] nvarchar(32) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [origin_price] money  NOT NULL,
+  [discount_price] money  NOT NULL,
+  [thumb_path] varchar(128) COLLATE Chinese_PRC_BIN DEFAULT ('https://staticweb.hnthyy.cn/images/wxmall-package/blank.png') NOT NULL,
+  [create_time] datetime DEFAULT (getdate()) NOT NULL,
+  [create_staff_code] varchar(6) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [create_staff_name] nvarchar(16) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [state] varchar(16) COLLATE Chinese_PRC_BIN DEFAULT ('ACTIVATED') NOT NULL,
+  [description] nvarchar(256) COLLATE Chinese_PRC_BIN  NULL
+)
+GO
+
+ALTER TABLE [dbo].[t_wxmall_package] SET (LOCK_ESCALATION = TABLE)
+GO
+
+
+-- ----------------------------
+-- Table structure for t_wxmall_package_item
+-- ----------------------------
+IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[t_wxmall_package_item]') AND type IN ('U'))
+	DROP TABLE [dbo].[t_wxmall_package_item]
+GO
+
+CREATE TABLE [dbo].[t_wxmall_package_item] (
+  [package_id] nvarchar(32) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [his_code] varchar(12) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [his_name] nvarchar(128) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [type] varchar(2) COLLATE Chinese_PRC_BIN  NULL,
+  [origin_price] money  NOT NULL,
+  [discount_price] money  NOT NULL,
+  [quantity] smallint DEFAULT ((1)) NOT NULL,
+  [cost_amt] money  NULL,
+  [gender_restriction] tinyint  NULL,
+  [min_age_restriction] smallint  NULL,
+  [max_age_restriction] smallint  NULL
+)
+GO
+
+ALTER TABLE [dbo].[t_wxmall_package_item] SET (LOCK_ESCALATION = TABLE)
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'所属套餐ID',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_item',
+'COLUMN', N'package_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'HIS收费编码',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_item',
+'COLUMN', N'his_code'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'HIS收费名称',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_item',
+'COLUMN', N'his_name'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'项目类别',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_item',
+'COLUMN', N'type'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'原价',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_item',
+'COLUMN', N'origin_price'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'优惠价',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_item',
+'COLUMN', N'discount_price'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'数量',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_item',
+'COLUMN', N'quantity'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'总价',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_item',
+'COLUMN', N'cost_amt'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'服务号套餐明细',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_item'
+GO
+
+
+-- ----------------------------
+-- Table structure for t_wxmall_package_purchased
+-- ----------------------------
+IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[t_wxmall_package_purchased]') AND type IN ('U'))
+	DROP TABLE [dbo].[t_wxmall_package_purchased]
+GO
+
+CREATE TABLE [dbo].[t_wxmall_package_purchased] (
+  [id] varchar(32) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [pat_no] varchar(12) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [wx_trade_no] varchar(32) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [package_id] varchar(32) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [package_name] nvarchar(64) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [purchase_price] money  NOT NULL,
+  [purchase_time] datetime DEFAULT (getdate()) NOT NULL,
+  [state] varchar(12) COLLATE Chinese_PRC_BIN DEFAULT ('NOT_USED') NOT NULL,
+  [coupon_amt] money DEFAULT ((0)) NOT NULL,
+  [cashpay_amt] money  NOT NULL
+)
+GO
+
+ALTER TABLE [dbo].[t_wxmall_package_purchased] SET (LOCK_ESCALATION = TABLE)
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'主键',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_purchased',
+'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'门诊ID',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_purchased',
+'COLUMN', N'pat_no'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'微信支付订单号',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_purchased',
+'COLUMN', N'wx_trade_no'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'套餐ID',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_purchased',
+'COLUMN', N'package_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'套餐名称',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_purchased',
+'COLUMN', N'package_name'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'购买价格',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_purchased',
+'COLUMN', N'purchase_price'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'购买时间',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_purchased',
+'COLUMN', N'purchase_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'套餐使用状态：USABLE:可使用；RAN_OUT:已用完',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_purchased',
+'COLUMN', N'state'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'患者已购服务号套餐目录',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_purchased'
+GO
+
+
+-- ----------------------------
+-- Table structure for t_wxmall_package_purchased_item
+-- ----------------------------
+IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[t_wxmall_package_purchased_item]') AND type IN ('U'))
+	DROP TABLE [dbo].[t_wxmall_package_purchased_item]
+GO
+
+CREATE TABLE [dbo].[t_wxmall_package_purchased_item] (
+  [id] varchar(32) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [wx_trade_no] varchar(32) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [pat_no] varchar(12) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [package_id] varchar(32) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [his_code] varchar(12) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [his_name] nvarchar(32) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [quantity] smallint DEFAULT ((1)) NOT NULL,
+  [usable_quantity] smallint DEFAULT ((1)) NOT NULL,
+  [last_use_time] datetime  NULL,
+  [price] money  NULL,
+  [cost_amt] money  NULL,
+  [gender_restriction] tinyint  NULL,
+  [min_age_restriction] smallint  NULL,
+  [max_age_restriction] smallint  NULL
+)
+GO
+
+ALTER TABLE [dbo].[t_wxmall_package_purchased_item] SET (LOCK_ESCALATION = TABLE)
+GO
+
+
+-- ----------------------------
+-- Table structure for t_wxmall_package_use_history
+-- ----------------------------
+IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[t_wxmall_package_use_history]') AND type IN ('U'))
+	DROP TABLE [dbo].[t_wxmall_package_use_history]
+GO
+
+CREATE TABLE [dbo].[t_wxmall_package_use_history] (
+  [id] varchar(32) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [pat_no] varchar(12) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [times] smallint  NOT NULL,
+  [wx_trade_no] varchar(32) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [package_id] varchar(32) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [package_item_id] varchar(32) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [use_quantity] smallint DEFAULT ((1)) NOT NULL,
+  [use_time] datetime DEFAULT (getdate()) NOT NULL,
+  [doctor_code] varchar(6) COLLATE Chinese_PRC_BIN  NOT NULL
+)
+GO
+
+ALTER TABLE [dbo].[t_wxmall_package_use_history] SET (LOCK_ESCALATION = TABLE)
+GO
+
+
+-- ----------------------------
+-- Table structure for t_wxmall_package_used
+-- ----------------------------
+IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[t_wxmall_package_used]') AND type IN ('U'))
+	DROP TABLE [dbo].[t_wxmall_package_used]
+GO
+
+CREATE TABLE [dbo].[t_wxmall_package_used] (
+  [id] varchar(32) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [pat_no] varchar(12) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [times] smallint  NOT NULL,
+  [wx_trade_no] varchar(32) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [package_id] varchar(32) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [package_item_id] varchar(32) COLLATE Chinese_PRC_BIN  NOT NULL,
+  [use_quantity] smallint DEFAULT ((1)) NOT NULL,
+  [use_time] datetime DEFAULT (getdate()) NOT NULL,
+  [doctor_code] varchar(6) COLLATE Chinese_PRC_BIN  NOT NULL
+)
+GO
+
+ALTER TABLE [dbo].[t_wxmall_package_used] SET (LOCK_ESCALATION = TABLE)
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'主键',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_used',
+'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'患者门诊ID',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_used',
+'COLUMN', N'pat_no'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'就诊次数',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_used',
+'COLUMN', N'times'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'微信支付订单号',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_used',
+'COLUMN', N'wx_trade_no'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'套餐ID',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_used',
+'COLUMN', N'package_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'套餐项目id',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_used',
+'COLUMN', N'package_item_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'使用数量',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_used',
+'COLUMN', N'use_quantity'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'使用时间',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_used',
+'COLUMN', N'use_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'开单医生',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_used',
+'COLUMN', N'doctor_code'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'套餐使用记录',
+'SCHEMA', N'dbo',
+'TABLE', N't_wxmall_package_used'
+GO
+
+
+-- ----------------------------
+-- Primary Key structure for table t_wxmall_package
+-- ----------------------------
+ALTER TABLE [dbo].[t_wxmall_package] ADD CONSTRAINT [t_wxmall_package_pk] PRIMARY KEY CLUSTERED ([id])
+WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+ON [PRIMARY]
+GO
+
+
+-- ----------------------------
+-- Primary Key structure for table t_wxmall_package_item
+-- ----------------------------
+ALTER TABLE [dbo].[t_wxmall_package_item] ADD CONSTRAINT [t_wxmall_package_item_pk] PRIMARY KEY CLUSTERED ([package_id], [his_code])
+WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+ON [PRIMARY]
+GO
+
+
+-- ----------------------------
+-- Indexes structure for table t_wxmall_package_purchased
+-- ----------------------------
+CREATE NONCLUSTERED INDEX [t_wxmall_package_purchased_pat_no_index]
+ON [dbo].[t_wxmall_package_purchased] (
+  [pat_no] ASC
+)
+GO
+
+CREATE NONCLUSTERED INDEX [t_wxmall_package_purchased_wx_trade_no_index]
+ON [dbo].[t_wxmall_package_purchased] (
+  [wx_trade_no] ASC
+)
+GO
+
+CREATE NONCLUSTERED INDEX [t_wxmall_package_purchased_package_id_index]
+ON [dbo].[t_wxmall_package_purchased] (
+  [package_id] ASC
+)
+GO
+
+
+-- ----------------------------
+-- Primary Key structure for table t_wxmall_package_purchased
+-- ----------------------------
+ALTER TABLE [dbo].[t_wxmall_package_purchased] ADD CONSTRAINT [t_wxmall_package_purchased_pk] PRIMARY KEY CLUSTERED ([id])
+WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+ON [PRIMARY]
+GO
+
+
+-- ----------------------------
+-- Indexes structure for table t_wxmall_package_purchased_item
+-- ----------------------------
+CREATE NONCLUSTERED INDEX [t_wxmall_package_purchased_item_pat_no_index]
+ON [dbo].[t_wxmall_package_purchased_item] (
+  [pat_no] ASC
+)
+GO
+
+CREATE NONCLUSTERED INDEX [t_wxmall_package_purchased_item_wx_trade_no_index]
+ON [dbo].[t_wxmall_package_purchased_item] (
+  [wx_trade_no] ASC
+)
+GO
+
+CREATE NONCLUSTERED INDEX [t_wxmall_package_purchased_item_package_id_index]
+ON [dbo].[t_wxmall_package_purchased_item] (
+  [package_id] ASC
+)
+GO
+
+
+-- ----------------------------
+-- Primary Key structure for table t_wxmall_package_purchased_item
+-- ----------------------------
+ALTER TABLE [dbo].[t_wxmall_package_purchased_item] ADD CONSTRAINT [t_wxmall_package_purchased_item_pk] PRIMARY KEY CLUSTERED ([id])
+WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+ON [PRIMARY]
+GO
+
+
+-- ----------------------------
+-- Indexes structure for table t_wxmall_package_use_history
+-- ----------------------------
+CREATE NONCLUSTERED INDEX [t_wxmall_package_use_history_pat_no_times_index]
+ON [dbo].[t_wxmall_package_use_history] (
+  [pat_no] ASC,
+  [times] ASC
+)
+GO
+
+CREATE NONCLUSTERED INDEX [t_wxmall_package_use_history_wx_trade_no_index]
+ON [dbo].[t_wxmall_package_use_history] (
+  [wx_trade_no] ASC
+)
+GO
+
+CREATE NONCLUSTERED INDEX [t_wxmall_package_use_history_package_id_index]
+ON [dbo].[t_wxmall_package_use_history] (
+  [package_id] ASC
+)
+GO
+
+
+-- ----------------------------
+-- Primary Key structure for table t_wxmall_package_use_history
+-- ----------------------------
+ALTER TABLE [dbo].[t_wxmall_package_use_history] ADD CONSTRAINT [t_wxmall_package_use_history_pk] PRIMARY KEY CLUSTERED ([id])
+WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+ON [PRIMARY]
+GO
+
+
+-- ----------------------------
+-- Indexes structure for table t_wxmall_package_used
+-- ----------------------------
+CREATE NONCLUSTERED INDEX [t_wxmall_package_used_pat_no_times_index]
+ON [dbo].[t_wxmall_package_used] (
+  [pat_no] ASC,
+  [times] ASC
+)
+GO
+
+CREATE NONCLUSTERED INDEX [t_wxmall_package_used_wx_trade_no_index]
+ON [dbo].[t_wxmall_package_used] (
+  [wx_trade_no] ASC
+)
+GO
+
+CREATE NONCLUSTERED INDEX [t_wxmall_package_used_package_id_index]
+ON [dbo].[t_wxmall_package_used] (
+  [package_id] ASC
+)
+GO
+
+
+-- ----------------------------
+-- Primary Key structure for table t_wxmall_package_used
+-- ----------------------------
+ALTER TABLE [dbo].[t_wxmall_package_used] ADD CONSTRAINT [t_wxmall_package_used_pk] PRIMARY KEY CLUSTERED ([id])
+WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+ON [PRIMARY]
+GO
+
+
+
+
+
+
+
+alter table t_workspace_config
+    add crb_history_flag int ;
+
+alter table t_discount
+	add time_type varchar(255) default '0'
+go
+
+alter table t_discount
+	add week_day varchar(255)
+go
+
+alter table t_discount
+	add month_day varchar(100)
+go
+
+alter table t_discount
+	add always_day varchar(100)
+go
+
+alter table t_discount
+	add month_num varchar(100)
+go
+
+alter table t_discount
+	add start_time varchar(100)
+go
+
+alter table t_discount
+	add end_time varchar(100);
+
+
+
+