Merge branch 'master' of http://192.168.1.220:10080/EHR/commons

.gitignore

@@ -0,0 +1,21 @@
#project files
*.iml
.idea/*
target/*
# ---> Java
*/target
*.class
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar
*.war
*.ear
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*#
# thrift generate code

commons/commons-ehr-constants/src/main/java/com/yihu/ehr/constants/ServiceApi.java

@@ -1722,7 +1722,7 @@ public class ServiceApi {
        public static final String  HomeCompleteAnalyze= "/dataQuality/home/completeAnalyze";
        public static final String  HomeCorrectAnalyze= "/dataQuality/home/correctAnalyze";
        public static final String  HomeInTimeAnalyze= "/dataQuality/home/inTimeAnalyze";
        public static final String  HomeTrend= "/dataQuality/home/trend";
    }

commons/commons-util/src/main/java/com/yihu/ehr/util/image/ImageUtil.java

@@ -1,9 +1,5 @@
package com.yihu.ehr.util.image;
import com.sun.image.codec.jpeg.JPEGCodec;
import com.sun.image.codec.jpeg.JPEGEncodeParam;
import com.sun.image.codec.jpeg.JPEGImageEncoder;
import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.image.BufferedImage;
@@ -45,10 +41,10 @@ public class ImageUtil {
            g.dispose();
            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
            if (w == 640) {
                JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(byteArrayOutputStream);
               /* JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(byteArrayOutputStream);
                JPEGEncodeParam jep = JPEGCodec.getDefaultJPEGEncodeParam(bi);
                jep.setQuality(0.8f, true);
                encoder.encode(bi, jep);
                encoder.encode(bi, jep);*/
            } else {
                ImageIO.write(bi, "PNG", byteArrayOutputStream);
            }

ehr-cloud-parent/pom.xml

@@ -1115,10 +1115,6 @@
                <configuration>
                    <source>${version.java}</source>
                    <target>${version.java}</target>
                    <compilerArguments>
                        <verbose/>
                        <bootclasspath>${java.home}/lib/rt.jar;${java.home}/lib/jce.jar</bootclasspath>
                    </compilerArguments>
                </configuration>
                <version>3.8.0</version>
            </plugin>

pom.xml

@@ -116,7 +116,7 @@
            <dependency>
                <groupId>com.yihu.ehr</groupId>
                <artifactId>commons-web</artifactId>
                <version>1.2.0</version>
                <version>${version.ehr}</version>
            </dependency>
            <dependency>
                <groupId>com.yihu.hos</groupId>