Merge remote-tracking branch 'origin/master'

.gitignore

@@ -0,0 +1,42 @@
#project files
ehr.ipr
ehr.iws
ehr.ids
*.html
*.iml
*/target/*
*/*/target/*
.idea/*
# ---> Java
*.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-thrift-services/src/main/java/com/yihu/ehr/adaption
commons-thrift-services/src/main/java/com/yihu/ehr/app
commons-thrift-services/src/main/java/com/yihu/ehr/browser
commons-thrift-services/src/main/java/com/yihu/ehr/data/domain
commons-thrift-services/src/main/java/com/yihu/ehr/dict
commons-thrift-services/src/main/java/com/yihu/ehr/geography
commons-thrift-services/src/main/java/com/yihu/ehr/hadoop
commons-thrift-services/src/main/java/com/yihu/ehr/lang
commons-thrift-services/src/main/java/com/yihu/ehr/org
commons-thrift-services/src/main/java/com/yihu/ehr/pack
commons-thrift-services/src/main/java/com/yihu/ehr/patient
commons-thrift-services/src/main/java/com/yihu/ehr/profile
commons-thrift-services/src/main/java/com/yihu/ehr/resolve
commons-thrift-services/src/main/java/com/yihu/ehr/resource
commons-thrift-services/src/main/java/com/yihu/ehr/security
commons-thrift-services/src/main/java/com/yihu/ehr/std
commons-thrift-services/src/main/java/com/yihu/ehr/user

src/main/java/com/yihu/ehr/pack/common/MgrApi.java

@@ -0,0 +1,8 @@
package com.yihu.ehr.pack.common;
public class MgrApi {
    public static class Packages{
        public static final String Status = "/packages/status";
    }
}

src/main/java/com/yihu/ehr/pack/controller/PackageEndPoint.java

@@ -10,6 +10,7 @@ import com.yihu.ehr.fastdfs.FastDFSUtil;
import com.yihu.ehr.model.packs.EsDetailsPackage;
import com.yihu.ehr.model.packs.EsSimplePackage;
import com.yihu.ehr.model.security.MKey;
import com.yihu.ehr.pack.common.MgrApi;
import com.yihu.ehr.pack.feign.SecurityClient;
import com.yihu.ehr.pack.service.RedisService;
import com.yihu.ehr.pack.task.FastDFSTask;
@@ -486,7 +487,7 @@ public class PackageEndPoint extends EnvelopRestEndPoint {
    }
    @RequestMapping(value = ServiceApi.Packages.Status, method = RequestMethod.PUT)
    @RequestMapping(value = MgrApi.Packages.Status, method = RequestMethod.PUT)
    @ApiOperation(value = "将接收时间为某段时间的结构化档案,状态更改为待解析", notes = "将接收时间为某段时间的结构化档案")
    public long bulkUpdate(@ApiParam(name = "startDate", value = "开始时间（eg：2017-01-01 00:00:00）", required = false )
                           @RequestParam(value = "startDate",required = false) String startDate,