Browse Source

更新配置

攻心小虫 2 years ago
parent
commit
49aa42516d

+ 0 - 46
pom.xml

@@ -280,52 +280,6 @@
 	</dependencies>
 
 
-	<!-- 私有仓库 
-    <repositories>
-        <repository>
-            <id>nexus-releases</id>
-            <name>Nexus Release Repository</name>
-            <url>http://192.168.2.236:8081/repository/maven-releases/</url>
-        </repository>
-        <repository>
-            <id>nexus-snapshots</id>
-            <name>Nexus Snapshot Repository</name>
-            <url>http://192.168.2.236:8081/repository/maven-snapshots/</url>
-        </repository>
-    </repositories>-->
-	<!-- 私有仓库 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>nexus-releases</id>
-            <name>Nexus Release Repository</name>
-            <url>http://192.168.2.236:8081/repository/maven-releases/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </pluginRepository>
-        <pluginRepository>
-            <id>nexus-snapshots</id>
-            <name>Nexus Snapshot Repository</name>
-            <url>http://192.168.2.236:8081/repository/maven-snapshots/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
-	<distributionManagement>
-		<repository>
-			<id>nexus-releases</id>
-			<name>Nexus Release Repository</name>
-			<url>http://192.168.2.236:8081/repository/maven-releases/</url>
-		</repository>
-		<snapshotRepository>
-			<id>nexus-snapshots</id>
-			<name>Nexus Snapshot Repository</name>
-			<url>http://192.168.2.236:8081/repository/maven-snapshots/</url>
-		</snapshotRepository>
-	</distributionManagement>
--->
 	<build>
 		<plugins>
 			<plugin>

+ 4 - 4
src/main/resources/application-dev.yml

@@ -59,9 +59,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.126:3307/qc_xiamen?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      url: jdbc:mysql://192.168.2.71:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
-      password: Lat0ne@tesT
+      password: dsYun-test
       # 连接池的配置信息
       # 初始化大小,最小,最大
       initialSize: 5
@@ -111,9 +111,9 @@ spring:
     database:
       cache: 8 # cache索引
       token: 8 # Token索引
-    host: 192.168.2.236  #Redis服务器地址
+    host: 127.0.0.1  #Redis服务器地址
     port: 6379 # Redis服务器连接端口(本地环境端口6378,其他环境端口是6379)
-    password: lantone # Redis服务器连接密码(默认为空)
+    password:  # Redis服务器连接密码(默认为空)
     lettuce:
       pool:
         max-active: 8 # 连接池最大连接数(使用负值表示没有限制)

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: mrqc-sys
   profiles:
-    active: local
+    active: dev
   main:
     allow-bean-definition-overriding: true
 

+ 3 - 35
src/main/resources/logback-spring.xml

@@ -187,9 +187,9 @@
     <logger name="org.springframework" level="WARN"/>
 
     <!-- mybatis日志打印-->
-    <logger name="org.apache.ibatis" level="INFO"/>
-    <logger name="java.sql" level="INFO"/>
-    <logger name="com.diagbot.mapper" level="INFO"/>
+    <logger name="org.apache.ibatis" level="debug"/>
+    <logger name="java.sql" level="debug"/>
+    <logger name="com.diagbot.mapper" level="debug"/>
 
     <!-- 本地环境下的日志配置 -->
     <springProfile name="local">
@@ -213,36 +213,4 @@
         </root>
     </springProfile>
 
-    <!-- 测试环境下的日志配置 -->
-    <springProfile name="test">
-        <root level="INFO">
-            <appender-ref ref="ERROR"/>
-            <appender-ref ref="WARN"/>
-            <appender-ref ref="INFO"/>
-            <appender-ref ref="DEBUG"/>
-            <appender-ref ref="STDOUT"/>
-        </root>
-    </springProfile>
-
-    <!-- 预发布环境下的日志配置 -->
-    <springProfile name="pre">
-        <root level="INFO">
-            <appender-ref ref="ERROR"/>
-            <appender-ref ref="WARN"/>
-            <appender-ref ref="INFO"/>
-            <appender-ref ref="DEBUG"/>
-            <appender-ref ref="STDOUT"/>
-        </root>
-    </springProfile>
-
-    <!-- 生产环境下的日志配置 -->
-    <springProfile name="pro">
-        <root level="INFO">
-            <appender-ref ref="ERROR"/>
-            <appender-ref ref="WARN"/>
-            <appender-ref ref="INFO"/>
-            <appender-ref ref="DEBUG"/>
-            <appender-ref ref="STDOUT"/>
-        </root>
-    </springProfile>
 </configuration>

+ 18 - 9
src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -808,9 +808,17 @@
 			FROM
 			med_behospital_info a,
 			med_home_page e,
-			med_home_operation_info f
+			med_home_operation_info f, 
+			med_medical_record tt2, 
+			qc_mode tt3 
 			WHERE a.is_deleted = 'N'
 			AND e.is_deleted = 'N'
+			and tt2.is_deleted = 'N' 
+			AND tt3.is_deleted = 'N' 
+			AND a.hospital_id = tt2.hospital_id 
+			AND a.behospital_code = tt2.behospital_code 
+			AND tt2.mode_id = tt3.id 
+			AND tt3.`name` = '手术记录'
 			AND f.is_deleted = 'N'
 			AND a.hospital_id = e.hospital_id
 			AND a.hospital_id = f.hospital_id
@@ -841,17 +849,17 @@
 	            </if>
 	        </if>
 		    group by a.behospital_code
-		) a where a+b+c+d >0
+		) a 
     </select>
     
     <!-- 预处理病案首页手术数据  -->
     <update id="preHomeOperation" >
-		update med_home_operation_info a,(select home_page_id,GROUP_CONCAT(g.ssdj) ssdj
+		update med_home_operation_info a,(select home_page_id,operation_order_no,GROUP_CONCAT(g.ssdj) ssdj
 			from med_home_operation_info f 
-			left join  kl_operative_9 g on LOCATE(g.ssbm,f.operation_code) >0 and (lbbm='04' or lbbm='03')
+			left join  kl_operative_9 g on LOCATE(concat('[',g.ssbm,']'),concat('[',f.operation_code,']')) >0 and (lbbm='04' or lbbm='03')
 			where f.operation_code is not null and f.operation_code !='[]' and (f.flag =0 or f.flag is null)
-			group by home_page_id
- 		) b set a.ssdj=b.ssdj,a.flag=1 where a.home_page_id=b.home_page_id
+			group by home_page_id,operation_order_no
+ 		) b set a.ssdj=b.ssdj,a.flag=1 where a.home_page_id=b.home_page_id and a.operation_order_no=b.operation_order_no
     </update>
 
     <!-- 入院人数统计-首页 -->
@@ -5246,7 +5254,7 @@
         <if test='qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile == "1" and qcResultShortPageVO.hospitalId == "7"'>
             ,
             GROUP_CONCAT(case when t4.operation_doctor_id is not null then t4.operation_doctor_id else '' end separator ',') AS operationDoctorName,
-            t4.ssdj AS operationLevel
+            ifnull(GROUP_CONCAT(t4.ssdj),'') AS operationLevel
         </if>
         FROM
         (SELECT
@@ -10455,10 +10463,11 @@
     <select id="cancerCount" resultType="int" parameterType="com.diagbot.vo.FilterVO">
         SELECT count(1) from (
 	        select a.behospital_code 
-	        FROM med_behospital_info a,med_home_page b
+	        FROM med_behospital_info a,med_home_page b, med_home_operation_info t4
 	        WHERE a.hospital_id=b.hospital_id and a.behospital_code=b.behospital_code
 	        AND a.qc_type_id != 0 and a.is_deleted = 'N' and b.is_deleted = 'N' 
-	        and (b.outpatient_emr_diagnose_code like 'C%')
+	        and (b.outpatient_emr_diagnose_code like 'C%') AND b.home_page_id = t4.home_page_id AND t4.operation_code IS NOT NULL AND t4.operation_code != '[]' 
+	        AND a.hospital_id = t4.hospital_id
 	        <if test="isPlacefile != null and isPlacefile != ''">
 	            and a.is_placefile = #{isPlacefile}
 	        </if>