Merge remote-tracking branch 'origin/dev_special_focus_update'

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java

@@ -62,13 +62,16 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable {
     private String isHistory;
 
     /**
-     * 隔离类型,来自字典表
+     * 隔离类型,来自字典表;集中隔离：0;居家隔离1;居家健康监测2;已出隔离期3
      */
     // @NotBlank(message = "isolatedState不能为空",groups = {IcEpidemicSpecialAttentionAdd.class,IcEpidemicSpecialAttentionUpdate.class})
     private String isolatedState;
 
     /**
-     * 关注类型，核酸检测：2，疫苗接种：1，行程上报：0
+     * 关注类型，
+     * 核酸检测：2，
+     * 疫苗接种：1，
+     * 行程上报：0
      */
     @NotNull(message = "attentionType不能为空",groups = {IcEpidemicSpecialAttentionAdd.class,IcEpidemicSpecialAttentionUpdate.class})
     private Integer attentionType;

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java

@@ -24,6 +24,9 @@ public class VaccinationListFormDTO extends PageFormDTO implements Serializable
     @NotNull(message = "attentionType不能为空",groups = VaccinationListForm.class)
     private Integer attentionType;
 
+    /**
+     * 隔离类型,来自字典表;集中隔离：0;居家隔离1;居家健康监测2;已出隔离期3
+     */
     private String isolatedState;
     private String isHistory;
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java

@@ -117,6 +117,9 @@ public class VaccinationListResultDTO implements Serializable {
      * 小区名+楼栋名+单元名+房屋名
      */
     private String allName;
+    /**
+     * 隔离类型,来自字典表;集中隔离：0;居家隔离1;居家健康监测2;已出隔离期3
+     */
     private String isolatedState;
     private String id;
     private String userId;

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java

@@ -49,7 +49,7 @@ public class IcEpidemicSpecialAttentionEntity extends BaseEpmetEntity {
 	private String isHistory;
 
 	/**
-	 * 隔离类型,来自字典表
+	 * 隔离类型,来自字典表;集中隔离：0;居家隔离1;居家健康监测2;已出隔离期3
 	 */
 	private String isolatedState;
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java

@@ -309,6 +309,10 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
             e.setPids(agencyInfo.getPids());
             e.setCustomerId(formDTO.getCustomerId());
             e.setIsHistory(NumConstant.ZERO_STR);
+            if(StringUtils.isBlank(e.getIsolatedState())){
+                //从行程上报界面，点击加入重点人群关注，默认隔离状态是居家隔离
+                e.setIsolatedState(NumConstant.ONE_STR);
+            }
         });
         insertBatch(entities);
         //新增通知表信息

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.72__icepidemic_ISOLATED_STATE .sql

@@ -0,0 +1 @@
+ALTER TABLE ic_epidemic_special_attention MODIFY COLUMN ISOLATED_STATE VARCHAR(20) COMMENT '隔离类型,来自字典表;集中隔离：0;居家隔离1;居家健康监测2;已出隔离期3';