Merge branch 'dev' of LiTaohong/patient-co-management into dev

patient-co/patient-co-figure-label/pom.xml

@@ -81,7 +81,7 @@
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>common-data-es-starter</artifactId>
            <version>1.0.3</version>
            <version>1.1.0</version>
        </dependency>
        <dependency>
            <groupId>org.json</groupId>

patient-co/patient-co-figure-label/sql/label_es_sql

@@ -0,0 +1,32 @@
-- 新增居民标签索引映射
PUT http://172.19.103.45:9200/figure_label_index
{
  "mappings": {
    "figure_label_type": {
      "properties": {
      	"idcard":{
      		"type":"String"
      	},
      	"labelType":{
      		"type":"String"
      	},
      	"labelCode":{
      		"type":"String"
      	},
      	"labeName":{
      		"type":"String"
      	},
      	"labeValue":{
      		"type":"String"
      	},
         "createTime":{
          		"type":"date",
          		"format":"yyyy-MM-dd HH:mm:ss"
        }
      }
    }
  }
}
-- 给索引建立别名
PUT http://172.19.103.45:9200/figure_label_index/figure_label_index_a

patient-co/patient-co-figure-label/src/main/java/com/yihu/wlyy/figure/label/util/MakeModelIDUtil.java

@@ -7,7 +7,7 @@ public class MakeModelIDUtil {
    /**
     * 生成存入es的id，确保数据不会重复
     * d由 idcard，sex，parentCode，labelName，labelCode MD5加密而成。不用es自动生成的_id，实现数据插入排重
     * id由 idcard，parentCode，labelName，labelCode MD5加密而成。不用es自动生成的_id，实现数据插入排重
     * @param dataModel
     * @param labelValue
     * @return