隔离防疫历史记录列表，磐石增加了一些列，禅道713 详情

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

@@ -133,35 +133,93 @@ public class VaccinationListResultDTO implements Serializable {
      */
     private String gkTime;
 
+    /**
+     * 管控开始时间yyyy-MM-dd,需求来源于磐石
+     */
+    private String gkStartTime;
+
+    /**
+     * 管控结束时间yyyy-MM-dd,需求来源于磐石
+     */
+    private String gkEndTime;
+
     /**
      * 镇（街）干部名称联系方式,需求来源于磐石
      * gbName+gbMobile
      */
     private String gb;
 
+    /**
+     * 镇（街）干部名称,需求来源于磐石
+     */
+    private String gbName;
+
+    /**
+     * 镇（街）干部联系方式,需求来源于磐石
+     */
+    private String gbMobile;
+
+
     /**
      * 村（社区）网格管理员gridManager,需求来源于磐石
      * gridManager+gridManagerMobile
      */
+    private String gridManagerShow;
+
+    /**
+     * 村（社区）网格管理员,需求来源于磐石
+     */
     private String gridManager;
 
+    /**
+     * 村（社区）网格管理员联系方式,需求来源于磐石
+     */
+    private String gridManagerMobile;
+
     /**
      * 基层医务工作者联系方式,需求来源于磐石
      * healthWorker+healthWorkerMobile
      */
+    private String healthWorkerShow;
+
+    /**
+     * 基层医务工作者,需求来源于磐石
+     */
     private String healthWorker;
 
+    /**
+     * 基层医务工作者联系方式,需求来源于磐石
+     */
+    private String healthWorkerMobile;
+
     /**
      * 民警联系方式,需求来源于磐石
      * policeName+policeMobile
      */
-    private String police;
+    private String policeShow;
+    /**
+     * 民警,需求来源于磐石
+     */
+    private String policeName;
 
+    /**
+     * 民警联系方式,需求来源于磐石
+     */
+    private String policeMobile;
     /**
      * 志愿者+联系方式,需求来源于磐石
      */
-    private String volunteer;
+    private String volunteerShow;
 
+    /**
+     * 志愿者,需求来源于磐石
+     */
+    private String volunteerName;
+
+    /**
+     * 志愿者联系方式,需求来源于磐石
+     */
+    private String volunteerMobile;
 
     public VaccinationListResultDTO() {
         this.vaccinationCount = NumConstant.ZERO;

epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml

@@ -94,10 +94,10 @@
                 end
             )as gkTime,
             concat(a.GB_NAME,a.GB_MOBILE) as gb,
-            concat(a.GRID_MANAGER,a.GRID_MANAGER_MOBILE) as gridManager,
-            concat(a.HEALTH_WORKER,a.HEALTH_WORKER_MOBILE) as healthWorker,
-            concat(a.POLICE_NAMEm,a.POLICE_MOBILE) as police,
-            concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteer
+            concat(a.GRID_MANAGER,a.GRID_MANAGER_MOBILE) as gridManagerShow,
+            concat(a.HEALTH_WORKER,a.HEALTH_WORKER_MOBILE) as healthWorkerShow,
+            concat(a.POLICE_NAMEm,a.POLICE_MOBILE) as policeShow,
+            concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteerShow
         FROM ic_epidemic_special_attention a
         LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND  b.del_flag = '0' and b.CUSTOMER_ID=a.CUSTOMER_ID
         LEFT JOIN (SELECT id_card , CUSTOMER_ID, count(1) AS vaccinationCount, CREATED_TIME FROM ic_vaccine WHERE DEL_FLAG = 0 GROUP BY ID_CARD, CUSTOMER_ID) v ON (v.ID_CARD = a.ID_CARD and v.CUSTOMER_ID=a.CUSTOMER_ID)
@@ -169,10 +169,10 @@
             end
             )as gkTime,
             concat(a.GB_NAME,a.GB_MOBILE) as gb,
-            concat(a.GRID_MANAGER,a.GRID_MANAGER_MOBILE) as gridManager,
-            concat(a.HEALTH_WORKER,a.HEALTH_WORKER_MOBILE) as healthWorker,
-            concat(a.POLICE_NAMEm,a.POLICE_MOBILE) as police,
-            concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteer
+            concat(a.GRID_MANAGER,a.GRID_MANAGER_MOBILE) as gridManagerShow,
+            concat(a.HEALTH_WORKER,a.HEALTH_WORKER_MOBILE) as healthWorkerShow,
+            concat(a.POLICE_NAMEm,a.POLICE_MOBILE) as policeShow,
+            concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteerShow
         FROM ic_epidemic_special_attention a
         LEFT JOIN ic_resi_user b ON a.id_card = b.id_card  AND  b.del_flag = '0' and a.CUSTOMER_ID = b.CUSTOMER_ID
         WHERE a.DEL_FLAG = 0
@@ -261,7 +261,19 @@
             a.ID_CARD,
             a.REMARK,
             a.REASON,
-            a.ISOLATED_STATE
+            a.ISOLATED_STATE,
+            a.GK_START_TIME,
+            a.GK_END_TIME,
+            a.GB_NAME,
+            a.GB_MOBILE,
+            a.GRID_MANAGER,
+            a.GRID_MANAGER_MOBILE,
+            a.HEALTH_WORKER,
+            a.HEALTH_WORKER_MOBILE,
+            a.POLICE_NAME,
+            a.POLICE_MOBILE,
+            a.VOLUNTEER_NAME,
+            a.VOLUNTEER_MOBILE
         FROM ic_epidemic_special_attention a
         WHERE a.ID = #{id}
     </select>