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

patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/transform/HealthArchiveLogTransform.java

@@ -213,7 +213,7 @@ public class HealthArchiveLogTransform implements ILogTransform {
        // 吸烟情况
        if (event.has("dailySmokingQuantity") && StringUtils.isNotEmpty(event.getString("dailySmokingQuantity"))) {
            String cy = event.getString("everyAlcohol_tolerance");
            String cy = event.getString("dailySmokingQuantity");
            if (cy.compareTo("0") > 0) {
                UserPortrait userPortrait = new UserPortrait();