Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/account/DoctorInfoService.java

@@ -755,7 +755,7 @@ public class DoctorInfoService extends BaseService {
    @Transactional
    public JSONArray findWorkingDoctorListByDept(String dept, String hospital, String level, String key, int page, int pagesize) throws Exception {
        String sql = "select * from wlyy_doctor where  status = 1";
        String sql = "select * from wlyy_doctor where  status = 1 and level = 1";
        List<Object> args = new ArrayList<>();
        if (!StringUtils.isEmpty(dept)) {

patient-co-wlyy/src/main/resources/logback.xml

@@ -3,7 +3,7 @@
	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
		<encoder>
			<pattern>%date{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
			<charset>UTF-8</charset>
			<charset class="java.nio.charset.Charset">UTF-8</charset>
		</encoder>
	</appender>
@@ -14,7 +14,7 @@
		</rollingPolicy>
		<encoder>
			<pattern>%date{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
			<charset>UTF-8</charset>
			<charset class="java.nio.charset.Charset">UTF-8</charset>
		</encoder>
	</appender>
@@ -25,7 +25,7 @@
		</rollingPolicy>
		<encoder>
			<pattern>%msg%n</pattern>
			<charset>UTF-8</charset>
			<charset class="java.nio.charset.Charset">UTF-8</charset>
		</encoder>
	</appender>
	<appender name="business_d" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -35,7 +35,7 @@
		</rollingPolicy>
		<encoder>
			<pattern>%msg%n</pattern>
			<charset>UTF-8</charset>
			<charset class="java.nio.charset.Charset">UTF-8</charset>
		</encoder>
	</appender>
	<appender name="interface_call_m" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -45,7 +45,7 @@
		</rollingPolicy>
		<encoder>
			<pattern>%msg%n</pattern>
			<charset>UTF-8</charset>
			<charset class="java.nio.charset.Charset">UTF-8</charset>
		</encoder>
	</appender>
	<appender name="interface_call_d" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -55,7 +55,7 @@
		</rollingPolicy>
		<encoder>
			<pattern>%msg%n</pattern>
			<charset>UTF-8</charset>
			<charset class="java.nio.charset.Charset">UTF-8</charset>
		</encoder>
	</appender>