浏览代码

统计新需求接口开发

zhaops 5 年之前
父节点
当前提交
2de8cf98f0

+ 2 - 1
docs/031.20200229自诊程序配置/init_zzcx.sql

@@ -38,6 +38,7 @@ INSERT INTO `sys-zzcx`.`zzcx_sys_set` (`id`, `is_deleted`, `gmt_create`, `gmt_mo
 INSERT INTO `sys-zzcx`.`zzcx_sys_set` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `hospital_code`, `name`, `code`, `value`, `remark`) VALUES ('20', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', NULL, NULL, '飞图影像', 'logo图片参数', 'imgUrl', 'ftyx.png', 'logo图片参数');
 
 
-
+ALTER TABLE `zzcx_sys_set`
+ADD COLUMN `province` varchar(50) NOT NULL DEFAULT '' COMMENT '省份' after `value`;
 
 

+ 33 - 0
zzcx-service/src/main/java/com/diagbot/dto/SysSetProHosResDTO.java

@@ -0,0 +1,33 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: zhoutg
+ * @date: 2020/2/9 12:06
+ * @version: V1.0
+ */
+@Getter
+@Setter
+public class SysSetProHosResDTO {
+
+    /**
+     * 医院列表
+     */
+    private List<String> hospitalCodeList;
+
+    /**
+     * 省份
+     */
+    private String province;
+
+    /**
+     * 医院数量
+     */
+    private int size = 0;
+
+}

+ 20 - 17
zzcx-service/src/main/java/com/diagbot/entity/SysSet.java

@@ -67,6 +67,8 @@ public class SysSet implements Serializable {
 
     private String value;
 
+    private String province;
+
     /**
      * 备注
      */
@@ -79,6 +81,7 @@ public class SysSet implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -86,6 +89,7 @@ public class SysSet implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
+
     public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
@@ -93,6 +97,7 @@ public class SysSet implements Serializable {
     public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
+
     public LocalDateTime getGmtModified() {
         return gmtModified;
     }
@@ -100,6 +105,7 @@ public class SysSet implements Serializable {
     public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -107,6 +113,7 @@ public class SysSet implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -114,6 +121,7 @@ public class SysSet implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public String getHospitalCode() {
         return hospitalCode;
     }
@@ -121,6 +129,7 @@ public class SysSet implements Serializable {
     public void setHospitalCode(String hospitalCode) {
         this.hospitalCode = hospitalCode;
     }
+
     public String getName() {
         return name;
     }
@@ -128,6 +137,7 @@ public class SysSet implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
+
     public String getCode() {
         return code;
     }
@@ -135,6 +145,7 @@ public class SysSet implements Serializable {
     public void setCode(String code) {
         this.code = code;
     }
+
     public String getValue() {
         return value;
     }
@@ -142,6 +153,15 @@ public class SysSet implements Serializable {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
     public String getRemark() {
         return remark;
     }
@@ -149,21 +169,4 @@ public class SysSet implements Serializable {
     public void setRemark(String remark) {
         this.remark = remark;
     }
-
-    @Override
-    public String toString() {
-        return "SysSet{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", hospitalCode=" + hospitalCode +
-            ", name=" + name +
-            ", code=" + code +
-            ", value=" + value +
-            ", remark=" + remark +
-        "}";
-    }
 }

+ 25 - 0
zzcx-service/src/main/java/com/diagbot/facade/SysSetFacade.java

@@ -2,17 +2,22 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.SysSetDTO;
+import com.diagbot.dto.SysSetProHosResDTO;
 import com.diagbot.entity.SysSet;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.SysSetServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.EntityUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.SysSetVO;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description:
@@ -33,4 +38,24 @@ public class SysSetFacade extends SysSetServiceImpl {
         List<SysSetDTO> res = BeanUtil.listCopyTo(sysSetList, SysSetDTO.class);
         return res;
     }
+
+
+    public List<SysSetProHosResDTO> getPositon(){
+        List<SysSetProHosResDTO> res = new ArrayList<>();
+        QueryWrapper<SysSet> sysSetQueryWrapper = new QueryWrapper<>();
+        sysSetQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("code","imgUrl")
+                .ne("province","")
+                .orderByAsc("province");
+        List<SysSet> sysSetList = this.list(sysSetQueryWrapper);
+        Map<String, List<SysSet>> map = EntityUtil.makeEntityListMap(sysSetList, "province");
+        for (String key : map.keySet()) {
+            SysSetProHosResDTO bean = new SysSetProHosResDTO();
+            bean.setProvince(key);
+            bean.setHospitalCodeList(map.get(key).stream().map(r -> r.getHospitalCode()).collect(Collectors.toList()));
+            bean.setSize(bean.getHospitalCodeList().size());
+            res.add(bean);
+        }
+        return res;
+    }
 }

+ 8 - 0
zzcx-service/src/main/java/com/diagbot/web/SysSetController.java

@@ -4,6 +4,7 @@ package com.diagbot.web;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SysSetDTO;
+import com.diagbot.dto.SysSetProHosResDTO;
 import com.diagbot.facade.SysSetFacade;
 import com.diagbot.vo.SysSetVO;
 import io.swagger.annotations.Api;
@@ -38,4 +39,11 @@ public class SysSetController {
     public RespDTO<List<SysSetDTO>> getSysSet(@RequestBody SysSetVO sysSetVO) {
         return RespDTO.onSuc(sysSetFacade.getSysSet(sysSetVO));
     }
+
+    @ApiOperation(value = "获取省份统计信息[by:zhoutg]")
+    @PostMapping("/getPosition")
+    @SysLogger("getPosition")
+    public RespDTO<List<SysSetProHosResDTO>> getPosition() {
+        return RespDTO.onSuc(sysSetFacade.getPositon());
+    }
 }