提示信息、查体模板

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

@@ -136,11 +136,6 @@ public class QuestionInfo implements Serializable {
      */
     private Integer showAdd;
 
-    /**
-     * 提示语
-     */
-    private String placeholder;
-
     /**
      * 备注
      */
@@ -307,13 +302,6 @@ public class QuestionInfo implements Serializable {
     public void setShowAdd(Integer showAdd) {
         this.showAdd = showAdd;
     }
-    public String getPlaceholder() {
-        return placeholder;
-    }
-
-    public void setPlaceholder(String placeholder) {
-        this.placeholder = placeholder;
-    }
     public String getRemark() {
         return remark;
     }
@@ -348,7 +336,6 @@ public class QuestionInfo implements Serializable {
         ", textGenerate=" + textGenerate +
         ", copyType=" + copyType +
         ", showAdd=" + showAdd +
-        ", placeholder=" + placeholder +
         ", remark=" + remark +
         "}";
     }

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

@@ -7,8 +7,10 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.service.DeptVitalService;
 import com.diagbot.service.impl.DeptVitalServiceImpl;
 import com.diagbot.util.EntityUtil;
+import com.diagbot.util.UserUtils;
 import com.diagbot.vo.DeptVitalVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,10 +26,12 @@ import java.util.Map;
  * @time: 2018/11/22 11:45
  */
 @Component
-public class DeptVitalFacade extends DeptVitalServiceImpl {
+public class DeptVitalFacade extends DeptVitalServiceImpl implements DeptVitalService {
 
     @Autowired
     private QuestionInfoFacade questionInfoFacade;
+    @Autowired
+    private DeptVitalServiceImpl deptVitalServiceImpl;
 
     /**
      * 保存查体模板
@@ -61,9 +65,12 @@ public class DeptVitalFacade extends DeptVitalServiceImpl {
             DeptVital deptVital = new DeptVital();
             deptVital.setDeptId(deptVitalVO.getDeptId());
             deptVital.setVitalId(vital);
+            deptVital.setCreator(UserUtils.getCurrentPrincipleID());
             deptVital.setGmtCreate(new Date());
+            deptVitalList.add(deptVital);
         }
-        this.saveBatch(deptVitalList);
+
+        deptVitalServiceImpl.saveBatch(deptVitalList);
         return true;
     }
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.entity.IntroduceDetail;
 import com.diagbot.entity.IntroduceInfo;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.impl.IntroduceDetailServiceImpl;
 import com.diagbot.service.impl.IntroduceInfoServiceImpl;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.IntroducePageVO;
@@ -28,6 +29,8 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
     IntroduceMapFacade introduceMapFacade;
     @Autowired
     IntroduceDetailFacade introduceDetailFacade;
+    @Autowired
+    IntroduceDetailServiceImpl introduceDetailServiceImpl;
 
     /**
      * 保存提示信息（新增or修改）
@@ -60,7 +63,7 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
             detail.setId(null);
         }
         //插入新的明细记录
-        introduceDetailFacade.saveOrUpdateBatch(introduceVO.getDetailList());
+        introduceDetailServiceImpl.saveOrUpdateBatch(introduceVO.getDetailList());
 
         //更新提示信息
         this.saveOrUpdate(introduceInfo);

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

@@ -1,8 +1,17 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.VitalOrder;
 import com.diagbot.service.impl.VitalOrderServiceImpl;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.VitalOrderVO;
+import com.google.common.collect.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -10,4 +19,25 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class VitalOrderFacade extends VitalOrderServiceImpl {
+
+    @Autowired
+    VitalOrderServiceImpl vitalOrderServiceImpl;
+
+    public Boolean saveVitalOrders(List<VitalOrderVO> vitalOrderVOList) {
+        //先删除现有排序
+        QueryWrapper<VitalOrder> vitalOrderQueryWrapper = new QueryWrapper<>();
+        vitalOrderQueryWrapper.eq("1", "1");
+        //插入新排序
+        List<VitalOrder> vitalOrderList = Lists.newArrayList();
+        for (VitalOrderVO vitalOrderVO : vitalOrderVOList) {
+            VitalOrder vitalOrder = new VitalOrder();
+            vitalOrder.setQuestionId(vitalOrderVO.getVitalId());
+            vitalOrder.setOrderNo(vitalOrderVO.getOrderNo());
+            vitalOrder.setCreator(UserUtils.getCurrentPrincipleID());
+            vitalOrder.setGmtCreate(new Date());
+            vitalOrderList.add(vitalOrder);
+        }
+        vitalOrderServiceImpl.saveBatch(vitalOrderList);
+        return true;
+    }
 }

icssman-service/src/main/java/com/diagbot/service/DeptVitalService.java

@@ -3,6 +3,8 @@ package com.diagbot.service;
 import com.diagbot.entity.DeptVital;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 科室查体对应表 服务类
@@ -12,5 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2018-11-22
  */
 public interface DeptVitalService extends IService<DeptVital> {
-
+    Boolean saveRecords(List<DeptVital> deptVitalList);
 }

icssman-service/src/main/java/com/diagbot/service/impl/DeptVitalServiceImpl.java

@@ -6,6 +6,8 @@ import com.diagbot.service.DeptVitalService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 科室查体对应表 服务实现类
@@ -17,4 +19,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class DeptVitalServiceImpl extends ServiceImpl<DeptVitalMapper, DeptVital> implements DeptVitalService {
 
+    public Boolean saveRecords(List<DeptVital> deptVitalList){
+        super.saveBatch(deptVitalList);
+        return true;
+    }
+
 }

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

@@ -0,0 +1,20 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/11/26 15:26
+ */
+@Getter
+@Setter
+public class VitalOrderVO {
+    @NotNull(message = "请输入查体标签ID")
+    private Long vitalId;
+    @NotNull(message = "请输入查体标签排序号")
+    private Integer orderNo;
+}

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

@@ -4,9 +4,11 @@ package com.diagbot.web;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DeptVital;
+import com.diagbot.facade.DeptVitalFacade;
 import com.diagbot.vo.DeptVitalVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,12 +29,16 @@ import java.util.List;
 @Api(value = "查体模板相关API", tags = { "查体模板相关API" })
 public class DeptVitalController {
 
+    @Autowired
+    private DeptVitalFacade deptVitalFacade;
+
     @ApiOperation(value = "保存查体模板",
             notes = "deptId:科室ID，必填<br>" +
-                    "vitalIds:查体标签ids，必填<br>" )
+                    "vitalIds:查体标签ids，必填<br>")
     @PostMapping("/saveDeptVitals")
     @SysLogger("saveDeptVitals")
-    public RespDTO<Boolean> saveDeptVitals(@RequestBody DeptVitalVO deptVitalVO){
-        return RespDTO.onSuc(true);
+    public RespDTO<Boolean> saveDeptVitals(@RequestBody DeptVitalVO deptVitalVO) {
+        Boolean data = deptVitalFacade.saveDeptVitals(deptVitalVO);
+        return RespDTO.onSuc(data);
     }
 }

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

@@ -1,10 +1,21 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.VitalOrderFacade;
+import com.diagbot.vo.DeptVitalVO;
+import com.diagbot.vo.VitalOrderVO;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  * 查体全局排序 前端控制器
@@ -18,5 +29,17 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(value = "查体排序相关API", tags = { "查体排序相关API" })
 public class VitalOrderController {
 
+    @Autowired
+    private VitalOrderFacade vitalOrderFacade;
+
+    @ApiOperation(value = "保存查体顺序",
+            notes = "vital:查体标签ID，必填<br>" +
+                    "orderNo:查体排序号，必填<br>")
+    @PostMapping("/saveVitalOrders")
+    @SysLogger("saveVitalOrders")
+    public RespDTO<Boolean> saveVitalOrders(@RequestBody List<VitalOrderVO> vitalOrderVOList) {
+        Boolean data = vitalOrderFacade.saveVitalOrders(vitalOrderVOList);
+        return RespDTO.onSuc(data);
+    }
 
 }

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

@@ -27,7 +27,6 @@
         <result column="text_generate" property="textGenerate" />
         <result column="copy_type" property="copyType" />
         <result column="show_add" property="showAdd" />
-        <result column="placeholder" property="placeholder" />
         <result column="remark" property="remark" />
     </resultMap>