归档文件路径

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/JianYanJianChaDao.java

@@ -482,7 +482,7 @@ public interface JianYanJianChaDao {
     @Select("select time_limit, note, collection_info\n" +
             "from ${tableName}\n" +
             "where zy_order_code = #{code}\n")
-    ViewInspectionItemDetailsVo selectJcJyItem(String tableName, String code);
+    ViewInspectionItemDetailsVo selectJcJyItem(@Param("tableName") String tableName, @Param("code") String code);
 
     /**
      * 获取检验大类

src/main/java/thyyxxk/webserver/service/ca/CaServer.java

@@ -75,7 +75,7 @@ public class CaServer implements Assertion {
     public CaServer(CaData caData, EmrPatientDao emrPatientDao, CaCache cache, UserCache userCache, ArchiveConfig archive, MzEmrDao mzEmrDao, PatientIdCardTypeDao patientIdCardTypeDao) {
         this.caData = caData;
         this.emrPatientDao = emrPatientDao;
-        this.archivePath = archive.getPath() + "/emr";
+        this.archivePath = archive.getPath() + "/archive/emr";
         this.cache = cache;
         this.userCache = userCache;
         this.mzEmrDao = mzEmrDao;

src/main/resources/application-dev.yml

@@ -17,31 +17,31 @@ spring:
       primary: his
       strict: false
       datasource:
-        prod:
-          url: "jdbc:sqlserver://172.16.32.168:1433;databaseName=thxyhisdb"
-          username: "sa"
-          password:
-          driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
+#        prod:
+#          url: "jdbc:sqlserver://172.16.32.168:1433;databaseName=thxyhisdb"
+#          username: "sa"
+#          password:
+#          driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
         his:
           url: "jdbc:sqlserver://172.16.32.179:1433;databaseName=thxyhisdb"
           username: "sa"
           password:
           driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-        demo:
-          url: "jdbc:sqlserver://172.16.32.179:1433;databaseName=demohisdb"
-          username: "demo"
-          password: "demo2025"
-          driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-        lis:
-          url: "jdbc:sqlserver://172.16.32.178:1433;databaseName=eLimsCore"
-          username: "sa"
-          password: "hnthxyyy"
-          driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-        adicon:
-          url: "jdbc:sqlserver://172.16.32.100:1433;databaseName=CYYFCheckUPV5_HNTHYY"
-          username: "sa"
-          password: "*ThyyHis2018#"
-          driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
+#        demo:
+#          url: "jdbc:sqlserver://172.16.32.179:1433;databaseName=demohisdb"
+#          username: "demo"
+#          password: "demo2025"
+#          driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
+#        lis:
+#          url: "jdbc:sqlserver://172.16.32.178:1433;databaseName=eLimsCore"
+#          username: "sa"
+#          password: "hnthxyyy"
+#          driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
+#        adicon:
+#          url: "jdbc:sqlserver://172.16.32.100:1433;databaseName=CYYFCheckUPV5_HNTHYY"
+#          username: "sa"
+#          password: "*ThyyHis2018#"
+#          driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
     druid:
       #type: com.alibaba.druid.pool.DruidDataSource
       #初始化时建立物理连接的个数。初始化发生在显示调用init方法，或者第一次getConnection时
@@ -211,6 +211,7 @@ thyy:
       exceeding-discharge-days: 4
       ignore-dis-order-role: 85
       shoushubingqu: "8000130"
+      yz-allow-invalidation: false
     emr-zy-dept-code: "3020000"
     medinsur-dept: "3020100"
   we-com:
@@ -235,4 +236,4 @@ thyy:
     config-file: D:\work\ccbmis\config.xml
     cert-file: D:\work\ccbmis\MC1819980.pfx
     cert-password: 123456
-    service-url: https://merchant.ccb.com
+    service-url: https://merchant.ccb.com

update/2025-08-15.md

@@ -0,0 +1,103 @@
+# 新建表
+
+```sql
+-- auto-generated definition
+create table diagnose_to_req
+(
+    id          varchar(50) not null
+        constraint diagnose_to_req_pk
+            primary key,
+    name        nvarchar(50),
+    create_code varchar(20) not null,
+    create_time datetime    not null,
+    update_code varchar(20),
+    update_time datetime,
+    py_code     varchar(50) not null,
+    wb_code     varchar(50) not null
+)
+go
+
+exec sp_addextendedproperty 'MS_Description', N'开了诊断触发是否开具检验检查', 'SCHEMA', 'dbo', 'TABLE',
+     'diagnose_to_req'
+go
+
+exec sp_addextendedproperty 'MS_Description', N'诊断的编码，主键', 'SCHEMA', 'dbo', 'TABLE', 'diagnose_to_req', 'COLUMN',
+     'id'
+go
+
+exec sp_addextendedproperty 'MS_Description', N'创建人', 'SCHEMA', 'dbo', 'TABLE', 'diagnose_to_req', 'COLUMN',
+     'create_code'
+go
+
+exec sp_addextendedproperty 'MS_Description', N'创建时间', 'SCHEMA', 'dbo', 'TABLE', 'diagnose_to_req', 'COLUMN',
+     'create_time'
+go
+
+
+```
+```sql
+-- auto-generated definition
+create table diagnose_req_template
+(
+    id             varchar(32) not null
+        constraint diagnose_req_template_pk
+            primary key,
+    order_code     varchar(32) not null,
+    req_type       smallint    not null,
+    exec_dept      varchar(20) not null,
+    part_or_sample varchar(30),
+    template_id    varchar(32) not null
+)
+go
+
+exec sp_addextendedproperty 'MS_Description', N'检验检查模板', 'SCHEMA', 'dbo', 'TABLE', 'diagnose_req_template'
+go
+
+exec sp_addextendedproperty 'MS_Description', N'2-检验 -3检查', 'SCHEMA', 'dbo', 'TABLE', 'diagnose_req_template',
+     'COLUMN', 'req_type'
+go
+
+exec sp_addextendedproperty 'MS_Description', N'执行科室', 'SCHEMA', 'dbo', 'TABLE', 'diagnose_req_template', 'COLUMN',
+     'exec_dept'
+go
+
+exec sp_addextendedproperty 'MS_Description', N'部位或者标本', 'SCHEMA', 'dbo', 'TABLE', 'diagnose_req_template',
+     'COLUMN', 'part_or_sample'
+go
+
+exec sp_addextendedproperty 'MS_Description', N'对应的是 diagnose_to_req 的id', 'SCHEMA', 'dbo', 'TABLE',
+     'diagnose_req_template', 'COLUMN', 'template_id'
+go
+
+
+```
+```sql
+-- auto-generated definition
+create table diagnose_template
+(
+    id            varchar(32)  not null
+        constraint diagnose_template_pk
+            primary key,
+    diagnose_code varchar(100) not null,
+    template_id   varchar(32)  not null
+)
+go
+
+exec sp_addextendedproperty 'MS_Description', N'一个诊断可以对应多个检验检查', 'SCHEMA', 'dbo', 'TABLE',
+     'diagnose_template'
+go
+
+exec sp_addextendedproperty 'MS_Description', N'诊断编码', 'SCHEMA', 'dbo', 'TABLE', 'diagnose_template', 'COLUMN',
+     'diagnose_code'
+go
+
+exec sp_addextendedproperty 'MS_Description', N'对应的是 diagnose_to_req 的id', 'SCHEMA', 'dbo', 'TABLE',
+     'diagnose_template', 'COLUMN', 'template_id'
+go
+
+create index diagnose_template_diagnose_code_index
+    on diagnose_template (diagnose_code)
+go
+
+
+```