96-门诊医生站会诊申请确认界面和97-门诊会诊申请管理界面全部功能。

openhis-server-new/openhis-application/src/main/resources/application-dev.yml

@@ -90,15 +90,4 @@ server:
   port: 18080
   servlet:
     # 应用的访问路径
-    context-path: /openhis
-
-# 开发环境日志配置
-logging:
-  level:
-    com.openhis: info
-    com.baomidou.mybatisplus: info
-    com.openhis.mapper: info
-    com.openhis.domain: info
-    org.springframework.jdbc.core: info
-    com.alibaba.druid: info
-    com.alibaba.druid.sql: info
+    context-path: /openhis

openhis-server-new/openhis-application/src/main/resources/application.yml

@@ -32,17 +32,16 @@ server:
 # 日志配置
 logging:
   level:
-    com.openhis: debug
+    com.openhis: info
     org.springframework: warn
     # MyBatis和MyBatis-Plus日志
     com.baomidou.mybatisplus: debug
-    com.openhis.mapper: debug
-    com.openhis.domain: debug
+    com.openhis.web.regdoctorstation.mapper: info
     # JDBC日志
-    org.springframework.jdbc.core: debug
+    org.springframework.jdbc.core: info
     # Druid SQL日志
-    com.alibaba.druid: debug
-    com.alibaba.druid.sql: debug
+    com.alibaba.druid: info
+    com.alibaba.druid.sql: info
 
 # 用户配置
 user:
@@ -92,9 +91,6 @@ mybatis-plus:
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 加载全局的配置文件
   configLocation: classpath:mybatis/mybatis-config.xml
-  configuration:
-    # 开启 SQL 日志输出
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
   global-config:
     db-config:
       logic-delete-field: validFlag # 全局逻辑删除的实体字段名

openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml

@@ -29,7 +29,6 @@
             cs.apply_dept_id,
             cs.apply_dept_name,
             cs.org_id,
-            cs.encounter_id,
             o.name AS org_name,
             cs.main_surgeon_name AS surgeon_name
         FROM op_schedule os

openhis-server-new/openhis-application/src/main/resources/mapper/consultation/ConsultationRequestMapper.xml

@@ -2,10 +2,10 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.consultation.mapper.ConsultationRequestMapper">
+<mapper namespace="com.openhis.web.consultation.mapper.ConsultationRequestMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.openhis.consultation.domain.ConsultationRequest">
+    <resultMap id="BaseResultMap" type="com.openhis.web.consultation.domain.ConsultationRequest">
         <id column="id" property="id" />
         <result column="consultation_id" property="consultationId" />
         <result column="patient_id" property="patientId" />
@@ -22,6 +22,8 @@
         <result column="requesting_physician_id" property="requestingPhysicianId" />
         <result column="consultation_request_date" property="consultationRequestDate" />
         <result column="invited_object" property="invitedObject" />
+        <result column="invited_department_id" property="invitedDepartmentId" />
+        <result column="invited_physician_id" property="invitedPhysicianId" />
         <result column="consultation_date" property="consultationDate" />
         <result column="consultation_purpose" property="consultationPurpose" />
         <result column="provisional_diagnosis" property="provisionalDiagnosis" />
@@ -43,11 +45,6 @@
         <result column="tenant_id" property="tenantId" />
         <result column="is_deleted" property="isDeleted" />
         <result column="remark" property="remark" />
-        <result column="consultation_activity_id" property="consultationActivityId" />
-        <result column="consultation_activity_name" property="consultationActivityName" />
-        <result column="confirming_physician_name" property="confirmingPhysicianName" />
-        <result column="confirming_department_name" property="confirmingDepartmentName" />
-        <result column="confirming_physician_participation" property="confirmingPhysicianParticipation" />
     </resultMap>
 
 </mapper>

openhis-server-new/openhis-application/src/main/resources/spy.properties

@@ -1,5 +0,0 @@
-modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory
-logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger
-outagedetection=true
-outagedetectioninterval=2000
-appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger