查体排序改成按科室排序

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>