Merge remote-tracking branch 'origin/dev/icss' into dev/icss

icss-service/src/main/java/com/diagbot/entity/DeptVital.java

@@ -60,6 +60,11 @@ public class DeptVital implements Serializable {
      */
     private Long vitalId;
 
+    /**
+     * 排序
+     */
+    private Integer orderNo;
+
     /**
      * 备注
      */
@@ -72,6 +77,7 @@ public class DeptVital implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -79,6 +85,7 @@ public class DeptVital implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
+
     public Date getGmtCreate() {
         return gmtCreate;
     }
@@ -86,6 +93,7 @@ public class DeptVital implements Serializable {
     public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
+
     public Date getGmtModified() {
         return gmtModified;
     }
@@ -93,6 +101,7 @@ public class DeptVital implements Serializable {
     public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -100,6 +109,7 @@ public class DeptVital implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -107,6 +117,7 @@ public class DeptVital implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public Long getDeptId() {
         return deptId;
     }
@@ -114,6 +125,7 @@ public class DeptVital implements Serializable {
     public void setDeptId(Long deptId) {
         this.deptId = deptId;
     }
+
     public Long getVitalId() {
         return vitalId;
     }
@@ -121,6 +133,15 @@ public class DeptVital implements Serializable {
     public void setVitalId(Long vitalId) {
         this.vitalId = vitalId;
     }
+
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+
     public String getRemark() {
         return remark;
     }
@@ -132,15 +153,16 @@ public class DeptVital implements Serializable {
     @Override
     public String toString() {
         return "DeptVital{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", deptId=" + deptId +
-        ", vitalId=" + vitalId +
-        ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", deptId=" + deptId +
+                ", vitalId=" + vitalId +
+                ", orderNo=" + orderNo +
+                ", remark=" + remark +
+                "}";
     }
 }

icss-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -413,9 +413,21 @@ public class PushFacade {
 
         QueryWrapper<DeptVital> deptVitalQueryWrapper = new QueryWrapper<>();
         deptVitalQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                eq("dept_id", deptInfo.getId());
+                eq("dept_id", deptInfo.getId()).
+                orderByAsc("order_no");
         List<DeptVital> deptVitalList = deptVitalFacade.list(deptVitalQueryWrapper);
-        if (deptVitalList.size() > 0) {
+        //标签列表
+        for (DeptVital deptVital:deptVitalList) {
+            QuestionVO questionVO = new QuestionVO();
+            questionVO.setAge(pushVO.getAge());
+            questionVO.setSexType(pushVO.getSex());
+            questionVO.setId(deptVital.getVitalId());
+            QuestionDTO questionDTO = questionFacade.getById(questionVO);
+            if (questionDTO != null) {
+                vitalDTO.add(questionDTO);
+            }
+        }
+        /*if (deptVitalList.size() > 0) {
             Map<Long, DeptVital> deptVitalMap = EntityUtil.makeEntityMap(deptVitalList, "vitalId");
             //排序
             QueryWrapper<VitalOrder> vitalOrderQueryWrapper = new QueryWrapper<>();
@@ -435,7 +447,7 @@ public class PushFacade {
                     vitalDTO.add(questionDTO);
                 }
             }
-        }
+        }*/
         return vitalDTO;
     }
 }

icss-service/src/main/resources/mapper/DeptVitalMapper.xml

@@ -12,6 +12,7 @@
         <result column="modifier" property="modifier" />
         <result column="dept_id" property="deptId" />
         <result column="vital_id" property="vitalId" />
+        <result column="order_no" property="orderNo" />
         <result column="remark" property="remark" />
     </resultMap>
 

icssman-service/src/main/java/com/diagbot/entity/DeptVital.java

@@ -60,6 +60,11 @@ public class DeptVital implements Serializable {
      */
     private Long vitalId;
 
+    /**
+     * 排序
+     */
+    private Integer orderNo;
+
     /**
      * 备注
      */
@@ -129,6 +134,14 @@ public class DeptVital implements Serializable {
         this.vitalId = vitalId;
     }
 
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+
     public String getRemark() {
         return remark;
     }
@@ -148,6 +161,7 @@ public class DeptVital implements Serializable {
                 ", modifier=" + modifier +
                 ", deptId=" + deptId +
                 ", vitalId=" + vitalId +
+                ", orderNo=" + orderNo +
                 ", remark=" + remark +
                 "}";
     }

icssman-service/src/main/java/com/diagbot/facade/DeptVitalFacade.java

@@ -21,6 +21,7 @@ import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.UserUtils;
+import com.diagbot.vo.DVDetailVO;
 import com.diagbot.vo.DeptVitalPageVO;
 import com.diagbot.vo.DeptVitalVO;
 import com.google.common.collect.Lists;
@@ -69,13 +70,14 @@ public class DeptVitalFacade extends DeptVitalServiceImpl {
 
         //查找标签是否存在
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        questionInfoQueryWrapper.in("id", deptVitalVO.getVitalIds()).
+        List<Long> vitalIds = deptVitalVO.getDvDetailVOList().stream().map(deDetailVO -> deDetailVO.getVitalId()).collect(Collectors.toList());
+        questionInfoQueryWrapper.in("id", vitalIds).
                 eq("type", QuestionTypeEnum.Vital.getKey()).
                 eq("is_deleted", IsDeleteEnum.N.getKey());
         List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
 
         Map<Long, QuestionInfo> questionInfoMap = EntityUtil.makeEntityMap(questionInfoList, "id");
-        for (Long vital : deptVitalVO.getVitalIds()) {
+        for (Long vital : vitalIds) {
             if (questionInfoMap.get(vital) == null) {
                 throw new CommonException(CommonErrorCode.NOT_EXISTS, "id=" + vital + "的查体标签不存在");
             }
@@ -85,10 +87,11 @@ public class DeptVitalFacade extends DeptVitalServiceImpl {
         List<DeptVital> deptVitalList = Lists.newArrayList();
         Date now = DateUtil.now();
         String userId = UserUtils.getCurrentPrincipleID();
-        for (Long vital : deptVitalVO.getVitalIds()) {
+        for (DVDetailVO dvDetailVO : deptVitalVO.getDvDetailVOList()) {
             DeptVital deptVital = new DeptVital();
             deptVital.setDeptId(deptVitalVO.getDeptId());
-            deptVital.setVitalId(vital);
+            deptVital.setVitalId(dvDetailVO.getVitalId());
+            deptVital.setOrderNo(dvDetailVO.getOrderNo());
             deptVital.setCreator(userId);
             deptVital.setGmtCreate(now);
             deptVital.setModifier(userId);
@@ -108,8 +111,9 @@ public class DeptVitalFacade extends DeptVitalServiceImpl {
      */
     public Boolean delDeptVitalList(DeptVitalVO deptVitalVO) {
         UpdateWrapper<DeptVital> deptVitalUpdateWrapper = new UpdateWrapper<>();
+        List<Long> vitalIds = deptVitalVO.getDvDetailVOList().stream().map(deDetailVO -> deDetailVO.getVitalId()).collect(Collectors.toList());
         deptVitalUpdateWrapper.eq("dept_id", deptVitalVO.getDeptId()).
-                in("vital_id", deptVitalVO.getVitalIds()).
+                in("vital_id", vitalIds).
                 eq("is_deleted", IsDeleteEnum.N.getKey()).
                 set("is_deleted", IsDeleteEnum.Y.getKey()).
                 set("modifier", UserUtils.getCurrentPrincipleID()).
@@ -154,7 +158,8 @@ public class DeptVitalFacade extends DeptVitalServiceImpl {
         //已关联查体
         QueryWrapper<DeptVital> deptVitalQueryWrapper = new QueryWrapper<>();
         deptVitalQueryWrapper.eq("dept_id", deptId).
-                eq("is_deleted", IsDeleteEnum.N.getKey());
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                orderByAsc("order_no");
         List<DeptVital> deptVitalList = this.list(deptVitalQueryWrapper);
         List<Long> vitalIds = deptVitalList.stream()
                 .map(deptVitals -> deptVitals.getVitalId())

icssman-service/src/main/java/com/diagbot/vo/DVDetailVO.java

@@ -0,0 +1,16 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/1/3 16:45
+ */
+@Getter
+@Setter
+public class DVDetailVO {
+    private Long vitalId;
+    private Integer orderNo;
+}

icssman-service/src/main/java/com/diagbot/vo/DeptVitalVO.java

@@ -4,6 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:查体模板
@@ -16,5 +17,5 @@ public class DeptVitalVO {
     @NotNull(message = "请输入科室ID")
     private Long deptId;
     @NotNull(message = "请输入查体标签ID")
-    private Long[] vitalIds;
+    private List<DVDetailVO> dvDetailVOList;
 }

icssman-service/src/main/java/com/diagbot/web/DeptVitalController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
@@ -55,6 +56,7 @@ public class DeptVitalController {
     @PostMapping("/delDeptVitalList")
     @SysLogger("delDeptVitalList")
     @Transactional
+    @ApiIgnore
     public RespDTO<Boolean> delDeptVitalList(@RequestBody DeptVitalVO deptVitalVO) {
         Boolean data = deptVitalFacade.delDeptVitalList(deptVitalVO);
         return RespDTO.onSuc(data);
@@ -80,12 +82,12 @@ public class DeptVitalController {
     }
 
     /**
-     * 分页查询查体模板，可带等于条件
+     * 分页查询查体模板，可带过滤条件
      *
      * @param deptVitalPageVO
      * @return
      */
-    @ApiOperation(value = "分页查询查体模板，可带等于条件[by:zhaops]",
+    @ApiOperation(value = "分页查询查体模板，可带过滤条件[by:zhaops]",
             notes = "current:页码，必填<br>" +
                     "size:每页显示条数，必填<br>" +
                     "deptName:科室名称<br>")

icssman-service/src/main/java/com/diagbot/web/UploadController.java

@@ -20,7 +20,7 @@ public class UploadController {
     @Autowired
     private UploadFacade uploadFacade;
 
-    @GetMapping("/uploadImage")
+    @PostMapping("/uploadImage")
     public RespDTO<FileDTO> singleFileUpload(@RequestParam("upfile") MultipartFile file) {
         return RespDTO.onSuc(uploadFacade.singleFileUpload(file));
     }

icssman-service/src/main/resources/mapper/DeptVitalMapper.xml

@@ -12,6 +12,7 @@
         <result column="modifier" property="modifier" />
         <result column="dept_id" property="deptId" />
         <result column="vital_id" property="vitalId" />
+        <result column="order_no" property="orderNo" />
         <result column="remark" property="remark" />
     </resultMap>