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

icss-service/src/main/java/com/diagbot/dto/HospitalInfoDTO.java

@@ -0,0 +1,15 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.HospitalInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/11/22 13:42
+ */
+@Getter
+@Setter
+public class HospitalInfoDTO extends HospitalInfo {
+}

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

@@ -0,0 +1,225 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * <p>
+ * 打印记录表
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-19
+ */
+@TableName("icss_print_record")
+public class PrintRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 医生id
+     */
+    private Long doctorId;
+
+    /**
+     * 部门id
+     */
+    private Long hospitalDeptId;
+
+    /**
+     * 医院id
+     */
+    private Long hospitalId;
+
+    /**
+     * 患者id
+     */
+    private Long patientId;
+
+    /**
+     * 就诊号
+     */
+    private String inquiryCode;
+
+    /**
+     * 文本内容
+     */
+    private String content;
+
+    /**
+     * 内容JSON字符串(打印页面展示)
+     */
+    private String dataJson;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public Long getDoctorId() {
+        return doctorId;
+    }
+
+    public void setDoctorId(Long doctorId) {
+        this.doctorId = doctorId;
+    }
+    public Long getHospitalDeptId() {
+        return hospitalDeptId;
+    }
+
+    public void setHospitalDeptId(Long hospitalDeptId) {
+        this.hospitalDeptId = hospitalDeptId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public Long getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(Long patientId) {
+        this.patientId = patientId;
+    }
+    public String getInquiryCode() {
+        return inquiryCode;
+    }
+
+    public void setInquiryCode(String inquiryCode) {
+        this.inquiryCode = inquiryCode;
+    }
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+    public String getDataJson() {
+        return dataJson;
+    }
+
+    public void setDataJson(String dataJson) {
+        this.dataJson = dataJson;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "PrintRecord{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", name=" + name +
+        ", doctorId=" + doctorId +
+        ", hospitalDeptId=" + hospitalDeptId +
+        ", hospitalId=" + hospitalId +
+        ", patientId=" + patientId +
+        ", inquiryCode=" + inquiryCode +
+        ", content=" + content +
+        ", dataJson=" + dataJson +
+        ", remark=" + remark +
+        "}";
+    }
+}

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

@@ -1,7 +1,6 @@
 package com.diagbot.facade;
 
 import com.diagbot.dto.DoctorInfoDTO;
-import com.diagbot.dto.RespDTO;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.DoctorInfoServiceImpl;
@@ -24,12 +23,12 @@ public class DoctorInfoFacade extends DoctorInfoServiceImpl {
      * @param doctorInfoVo
      * @return
      */
-    public RespDTO<List<DoctorInfoDTO>> getDoctorInfo(@RequestBody DoctorInfoVO doctorInfoVo) {
+    public List<DoctorInfoDTO> getDoctorInfo(@RequestBody DoctorInfoVO doctorInfoVo) {
         List<DoctorInfoDTO> doctorInfoDTOList = this.getDoctorInfos(doctorInfoVo.getDoctorCode(),doctorInfoVo.getHosptialCode(),doctorInfoVo.getDeptCode());
         if(doctorInfoDTOList == null || doctorInfoDTOList.size() == 0){
             throw new CommonException(CommonErrorCode.NOT_EXISTS,
                     "获取医生信息失败");
         }
-        return RespDTO.onSuc(doctorInfoDTOList);
+        return doctorInfoDTOList;
     }
 }

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

@@ -0,0 +1,33 @@
+package com.diagbot.facade;
+
+import com.diagbot.dto.HospitalInfoDTO;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.HospitalInfoServiceImpl;
+import com.diagbot.vo.HospitalInfoVO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/11/22 13:43
+ */
+@Component
+public class HospitalInfoFacade extends HospitalInfoServiceImpl {
+
+    /**
+     * 获取医院信息
+     * @param hospitalInfoVO
+     * @return
+     */
+    public List<HospitalInfoDTO> getHospitalInfo(HospitalInfoVO hospitalInfoVO) {
+        List<HospitalInfoDTO> hospitalInfoDTOList = this.getHospitalInfos(hospitalInfoVO);
+        if(hospitalInfoDTOList == null || hospitalInfoDTOList.size() == 0){
+            throw new CommonException(CommonErrorCode.NOT_EXISTS,
+                    "获取医院信息失败");
+        }
+        return hospitalInfoDTOList;
+    }
+}

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

@@ -27,22 +27,22 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
      * @param patientInfoVO
      * @return
      */
-    public RespDTO<List<PatientInfoDTO>> getPatientInfo(@RequestBody PatientInfoVO patientInfoVO) {
+    public List<PatientInfoDTO> getPatientInfo(@RequestBody PatientInfoVO patientInfoVO) {
         List<PatientInfoDTO> patientInfoDTOList = this.getPatientInfos(patientInfoVO.getPatientCode(),patientInfoVO.getHosptialCode());
         if(patientInfoDTOList == null || patientInfoDTOList.size() == 0){
             throw new CommonException(CommonErrorCode.NOT_EXISTS,
                     "获取患者信息失败");
         }
-        return RespDTO.onSuc(patientInfoDTOList);
+        return patientInfoDTOList;
     }
     
     /**
      * 页面顶部病人医生科室信息查询
-     * @param patientInfoVO
+     * @param getTopPatientInfoVO
      * @return
      */
-    public RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
-    	return RespDTO.onSuc(baseMapper.getTopPatientInfo(getTopPatientInfoVO));
+    public GetTopPatientInfoDTO getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
+    	return baseMapper.getTopPatientInfo(getTopPatientInfoVO);
     }
     
     

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

@@ -0,0 +1,42 @@
+package com.diagbot.facade;
+
+import com.diagbot.util.DateUtil;
+import org.springframework.stereotype.Component;
+
+import com.diagbot.entity.PrintRecord;
+import com.diagbot.service.impl.PrintRecordServiceImpl;
+import com.diagbot.vo.PrintRecordsVO;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: 打印记录
+ * @date 2018年11月19日 上午10:04:42
+ */
+@Component
+public class PrintRecordFacade extends PrintRecordServiceImpl{
+
+	/**
+	 * 保存打印记录
+	 * @param printRecordsVO
+	 * @return boolean
+	 */
+	public boolean savePrintRecord(PrintRecordsVO printRecordsVO) {
+		//获取传入的参数值，保存在数据表中
+		PrintRecord printRecord = new PrintRecord();
+		printRecord.setCreator(printRecordsVO.getDoctorId().toString());//创建人id
+		printRecord.setDoctorId(printRecordsVO.getDoctorId());//医生
+		printRecord.setGmtCreate(DateUtil.now());//创建时间
+		printRecord.setName(printRecordsVO.getName());//打印的名称
+		printRecord.setHospitalDeptId(printRecordsVO.getHospitalDeptId());//部门id
+		printRecord.setHospitalId(printRecordsVO.getHospitalId());//医院id
+		printRecord.setInquiryCode(printRecordsVO.getInquiryCode());//就诊号
+		printRecord.setPatientId(printRecordsVO.getPatientId());//患者id
+		printRecord.setContent(printRecordsVO.getContent());//文件展现
+		printRecord.setDataJson(printRecordsVO.getDataJson());//打印数据json
+		boolean res = save(printRecord);
+		return res;
+	}
+
+	
+}

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

@@ -19,14 +19,8 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.vo.PushVO;
 import com.diagbot.vo.QuestionVO;
-import com.diagbot.web.DeptInfoController;
-import com.google.common.collect.Lists;
-import com.sun.corba.se.impl.ior.OldJIDLObjectKeyTemplate;
-import com.sun.xml.internal.ws.config.metro.dev.FeatureReader;
-import org.aspectj.weaver.patterns.TypePatternQuestions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -59,8 +53,7 @@ public class PushFacade {
      * @param pushVO
      * @return
      */
-    public PushDTO push(PushVO pushVO) {
-        PushDTO pushDTO = new PushDTO();
+    public ResponseData pushAI(PushVO pushVO) {
         SearchData searchData = new SearchData();
         searchData.setAge(pushVO.getAge());
         searchData.setSymptom(pushVO.getSymptom());
@@ -82,19 +75,33 @@ public class PushFacade {
             default:
                 throw new CommonException(CommonErrorCode.PARAM_ERROR, "性别参数错误");
         }
-        String featureType = pushVO.getFeatureType();
-        String[] featureTypes = featureType.split(",|，");
-        Set<String> featureTypeSet = new HashSet(Arrays.asList(featureTypes));
 
         searchData.setFeatureType(pushVO.getFeatureType());
         searchData.setSysCode("1");
         searchData.setLength(10);
 
         Response<ResponseData> res = aiServiceClient.bayesPageData(searchData);
-        List<FeatureRate> symptom = res.getData().getSymptom();
-        List<FeatureRate> dis = res.getData().getDis();
-        List<FeatureRate> pacs = res.getData().getPacs();
-        List<FeatureRate> labs = res.getData().getLabs();
+        return res.getData();
+    }
+
+    /**
+     * 内部推理
+     *
+     * @param pushVO
+     * @return
+     */
+    public PushDTO pushInner(PushVO pushVO) {
+        PushDTO pushDTO = new PushDTO();
+        ResponseData data = pushAI(pushVO);
+
+        String featureType = pushVO.getFeatureType();
+        String[] featureTypes = featureType.split(",|，");
+        Set<String> featureTypeSet = new HashSet(Arrays.asList(featureTypes));
+
+        List<FeatureRate> symptom = data.getSymptom();
+        List<FeatureRate> dis = data.getDis();
+        List<FeatureRate> pacs = data.getPacs();
+        List<FeatureRate> labs = data.getLabs();
 
         Map<String, Object> symptomMap = list2Map(symptom);
         Map<String, Object> vitalMap = new HashMap<>();

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

@@ -1,6 +1,5 @@
 package com.diagbot.facade;
 
-import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.TranFieldInfoDTO;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -24,12 +23,12 @@ public class TranFieldInfoFacade extends TranFieldInfoServiceImpl {
      * @param info
      * @return
      */
-    public RespDTO<List<TranFieldInfoDTO>> getInfoByUuid(TranFieldInfoVO info){
+    public List<TranFieldInfoDTO> getInfoByUuid(TranFieldInfoVO info){
         List<TranFieldInfoDTO> tranFieldInfoDTOList = this.getInfosByUuid(info);
         if(tranFieldInfoDTOList == null || tranFieldInfoDTOList.size() == 0){
             throw new CommonException(CommonErrorCode.NOT_EXISTS,
                     "获取信息失败");
         }
-        return RespDTO.onSuc(tranFieldInfoDTOList);
+        return tranFieldInfoDTOList;
     }
 }

icss-service/src/main/java/com/diagbot/mapper/HospitalInfoMapper.java

@@ -1,7 +1,11 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.HospitalInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.dto.HospitalInfoDTO;
+import com.diagbot.entity.HospitalInfo;
+import com.diagbot.vo.HospitalInfoVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface HospitalInfoMapper extends BaseMapper<HospitalInfo> {
 
+
+    /**
+     * 获取医院信息
+     * @param hospitalInfoVO
+     * @return
+     */
+    public List<HospitalInfoDTO> getHospitalInfos(HospitalInfoVO hospitalInfoVO);
 }

icss-service/src/main/java/com/diagbot/mapper/PrintRecordMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.PrintRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 打印记录表 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-19
+ */
+public interface PrintRecordMapper extends BaseMapper<PrintRecord> {
+
+}

icss-service/src/main/java/com/diagbot/service/HospitalInfoService.java

@@ -1,7 +1,11 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.HospitalInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.HospitalInfoDTO;
+import com.diagbot.entity.HospitalInfo;
+import com.diagbot.vo.HospitalInfoVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface HospitalInfoService extends IService<HospitalInfo> {
 
+    /**
+     * 获取医院信息
+     * @param hospitalInfoVO
+     * @return
+     */
+    public List<HospitalInfoDTO> getHospitalInfos(HospitalInfoVO hospitalInfoVO);
 }

icss-service/src/main/java/com/diagbot/service/PrintRecordService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.PrintRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 打印记录表 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-19
+ */
+public interface PrintRecordService extends IService<PrintRecord> {
+
+}

icss-service/src/main/java/com/diagbot/service/impl/HospitalInfoServiceImpl.java

@@ -1,11 +1,15 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.entity.HospitalInfo;
 import com.diagbot.mapper.HospitalInfoMapper;
 import com.diagbot.service.HospitalInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.HospitalInfoVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 医院信息表 服务实现类
@@ -17,4 +21,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class HospitalInfoServiceImpl extends ServiceImpl<HospitalInfoMapper, HospitalInfo> implements HospitalInfoService {
 
+    @Override
+    public List<HospitalInfoDTO> getHospitalInfos(HospitalInfoVO hospitalInfoVO) {
+        return baseMapper.getHospitalInfos(hospitalInfoVO);
+    }
 }

icss-service/src/main/java/com/diagbot/service/impl/PrintRecordServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.PrintRecord;
+import com.diagbot.mapper.PrintRecordMapper;
+import com.diagbot.service.PrintRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 打印记录表 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-19
+ */
+@Service
+public class PrintRecordServiceImpl extends ServiceImpl<PrintRecordMapper, PrintRecord> implements PrintRecordService {
+
+}

icss-service/src/main/java/com/diagbot/vo/HospitalInfoVO.java

@@ -0,0 +1,27 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/11/22 13:42
+ */
+@Getter
+@Setter
+public class HospitalInfoVO {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 医院编码
+     */
+    @NotNull(message = "请输入医院编码")
+    private String code;
+}

icss-service/src/main/java/com/diagbot/vo/PrintRecordsVO.java

@@ -0,0 +1,63 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: 保存打印记录
+ * @date 2018年11月19日 上午10:25:00
+ */
+@Getter
+@Setter
+public class PrintRecordsVO {
+	/**
+	 * 名称
+	 */
+	@NotBlank(message = "请输打印的名称")
+	private String name;
+	/**
+     * 医生id
+     */
+	@NotNull(message = "请输入医生id")
+    private Long doctorId;
+
+    /**
+     * 医院编码
+     */
+	@NotNull(message = "请输入医院id")
+    private Long hospitalId;
+
+    /**
+     * 患者id
+     */
+	@NotNull(message = "请输入患者id")
+    private Long patientId;
+	/**
+     * 医院部门id
+     */
+	@NotNull(message = "请输入医院部门id")
+	private Long hospitalDeptId;
+    /**
+     * 问诊号
+     */
+	@NotBlank(message = "请输入就诊号")
+    private String inquiryCode;
+
+    /**
+     * 文本内容
+     */
+	@NotBlank(message = "请输入文本内容")
+    private String content;
+
+    /**
+     * 内容JSON字符串(打印页面展示)
+     */
+	@NotBlank(message = "请输入内容JSON字符串")
+    private String dataJson;
+
+}

icss-service/src/main/java/com/diagbot/web/DeptInfoController.java

@@ -36,8 +36,8 @@ public class DeptInfoController {
     @ApiOperation(value = "科室信息——查询[by:wangyu]",
             notes = "deptCode：科室编号，必填<br>" +
                     "hospitalCode:医院编号，必填<br>")
-    @PostMapping("/getPatientInfo")
-    @SysLogger("getPatientInfo")
+    @PostMapping("/getDeptInfo")
+    @SysLogger("getDeptInfo")
     public RespDTO<List<DeptInfoDTO>> getDeptInfo(@Valid @RequestBody DeptInfoVO deptInfoVO) {
         return deptInfoFacade.getDeptInfo(deptInfoVO);
     }

icss-service/src/main/java/com/diagbot/web/DoctorInfoController.java

@@ -37,9 +37,10 @@ public class DoctorInfoController {
             notes = "deptCode：科室编号，必填<br>" +
                     "hospitalCode: 医院编号，必填<br>" +
                     "doctorCode: 医生编号，必填<br>")
-    @PostMapping("/getPatientInfo")
-    @SysLogger("getPatientInfo")
+    @PostMapping("/getDoctorInfo")
+    @SysLogger("getDoctorInfo")
     public RespDTO<List<DoctorInfoDTO>> getDoctorInfo(@Valid @RequestBody DoctorInfoVO doctorInfoVo) {
-        return doctorInfoFacade.getDoctorInfo(doctorInfoVo);
+        List<DoctorInfoDTO> data = doctorInfoFacade.getDoctorInfo(doctorInfoVo);
+        return RespDTO.onSuc(data);
     }
 }

icss-service/src/main/java/com/diagbot/web/HospitalInfoController.java

@@ -0,0 +1,41 @@
+package com.diagbot.web;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.HospitalInfoDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.HospitalInfoFacade;
+import com.diagbot.vo.HospitalInfoVO;
+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 javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/11/22 13:41
+ */
+@RestController
+@RequestMapping("/hospitalInfo")
+@Api(value = "医院信息API", tags = { "医院信息API" })
+public class HospitalInfoController {
+
+    @Autowired
+    private HospitalInfoFacade hospitalInfoFacade;
+
+    @ApiOperation(value = "医院信息——根据医院编码获取医院信息[by:wangyu]",
+            notes = "id: 医院id<br>" +
+                    "code：医院编码<br>")
+    @PostMapping("/getHospitalInfo")
+    @SysLogger("getHospitalInfo")
+    public RespDTO<HospitalInfoDTO> getHospitalInfo(@RequestBody @Valid HospitalInfoVO hospitalInfoVO) {
+        List<HospitalInfoDTO> data = hospitalInfoFacade.getHospitalInfo(hospitalInfoVO);
+        return RespDTO.onSuc( data);
+    }
+}

icss-service/src/main/java/com/diagbot/web/PatientInfoController.java

@@ -40,7 +40,8 @@ public class PatientInfoController {
     @PostMapping("/getPatientInfo")
     @SysLogger("getPatientInfo")
     public RespDTO<List<PatientInfoDTO>> getPatientInfo(@Valid @RequestBody PatientInfoVO patientInfoVO) {
-        return patientInfoFacade.getPatientInfo(patientInfoVO);
+        List<PatientInfoDTO> data = patientInfoFacade.getPatientInfo(patientInfoVO);
+        return RespDTO.onSuc(data);
     }
     
     
@@ -52,7 +53,7 @@ public class PatientInfoController {
     @PostMapping("/getTopPatientInfo")
     @SysLogger("getTopPatientInfo")
     public RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(@Valid @RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
-        return patientInfoFacade.getTopPatientInfo(getTopPatientInfoVO);
+        return RespDTO.onSuc(patientInfoFacade.getTopPatientInfo(getTopPatientInfoVO));
     }
     
 }

icss-service/src/main/java/com/diagbot/web/PrintRecordController.java

@@ -0,0 +1,48 @@
+package com.diagbot.web;
+
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+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 com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.PrintRecordFacade;
+import com.diagbot.vo.PrintRecordsVO;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: 打印记录表 前端控制器
+ * @date 2018年11月19日 上午10:03:12
+ */
+@RestController
+@RequestMapping("/printRecord")
+@Api(value = "打印记录API[by:wangfeng]", tags = { "打印记录API" })
+@SuppressWarnings("unchecked")
+public class PrintRecordController {
+	
+	@Autowired
+	PrintRecordFacade printRecordFacade;
+	
+	@ApiOperation(value = "保存打印记录",notes = "保存打印记录")
+    @PostMapping("/savePrintRecords")
+	@SysLogger("savePrintRecords")
+	@Transactional
+    public RespDTO<Boolean> savePrintRecords(@Valid @RequestBody PrintRecordsVO printRecordsVO) {
+
+        boolean res = printRecordFacade.savePrintRecord(printRecordsVO);
+        
+        return RespDTO.onSuc(res);
+    }
+	
+
+}

icss-service/src/main/java/com/diagbot/web/PushController.java

@@ -1,6 +1,7 @@
 package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.client.bean.ResponseData;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.PushFacade;
@@ -24,14 +25,25 @@ import javax.validation.Valid;
 @RequestMapping("/push")
 @Api(value = "推理相关API", tags = { "推理相关API" })
 public class PushController {
+
     @Autowired
     PushFacade pushFacade;
+
     @ApiOperation(value = "推理接口[by:zhaops]",
             notes = "age： 年龄(必填)<br>" +
                     "sex：性别，1：男，2：女(必填)<br>")
-    @PostMapping("/push")
-    @SysLogger("push")
-    public RespDTO<PushDTO> push(@RequestBody @Valid PushVO pushVO) {
-        return RespDTO.onSuc(pushFacade.push(pushVO));
+    @PostMapping("/push_inner")
+    @SysLogger("push_inner")
+    public RespDTO<PushDTO> pushInner(@RequestBody @Valid PushVO pushVO) {
+        return RespDTO.onSuc(pushFacade.pushInner(pushVO));
+    }
+
+    @ApiOperation(value = "推理接口(直接返回大数据推理结果）[by:zhaops]",
+            notes = "age： 年龄(必填)<br>" +
+                    "sex：性别，1：男，2：女(必填)<br>")
+    @PostMapping("/push_ai")
+    @SysLogger("push_ai")
+    public RespDTO<ResponseData> pushAI(@RequestBody @Valid PushVO pushVO) {
+        return RespDTO.onSuc(pushFacade.pushAI(pushVO));
     }
 }

icss-service/src/main/java/com/diagbot/web/TranFieldInfoController.java

@@ -32,11 +32,12 @@ public class TranFieldInfoController {
     @Autowired
     TranFieldInfoFacade tranFieldInfoFacade;
 
-    @ApiOperation(value = "患者信息——查询[by:wangyu]",
+    @ApiOperation(value = "字段对应信息——查询[by:wangyu]",
             notes = "uuid:医院编号，必填<br>")
-    @PostMapping("/getPatientInfo")
-    @SysLogger("getPatientInfo")
+    @PostMapping("/getInfoByUuid")
+    @SysLogger("getInfoByUuid")
     public RespDTO<List<TranFieldInfoDTO>> getInfoByUuid(@Valid @RequestBody TranFieldInfoVO tranFieldInfoVO) {
-        return tranFieldInfoFacade.getInfoByUuid(tranFieldInfoVO);
+        List<TranFieldInfoDTO> data = tranFieldInfoFacade.getInfoByUuid(tranFieldInfoVO);
+        return RespDTO.onSuc(data);
     }
 }

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

@@ -19,4 +19,13 @@
         <result column="remark" property="remark" />
     </resultMap>
 
+    <select id="getHospitalInfos"  resultType="com.diagbot.dto.HospitalInfoDTO">
+        select * from tran_hospital_info i where i.status = 1 and i.is_deleted = 'N'
+        <if test="id != null and id != ''">
+            and i.id = #{id}
+        </if>
+        <if test="code != null and code != ''">
+            and i.code = #{code}
+        </if>
+    </select>
 </mapper>

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.PrintRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.PrintRecord">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="name" property="name" />
+        <result column="doctor_id" property="doctorId" />
+        <result column="hospital_dept_id" property="hospitalDeptId" />
+        <result column="hospital_id" property="hospitalId" />
+        <result column="patient_id" property="patientId" />
+        <result column="inquiry_code" property="inquiryCode" />
+        <result column="content" property="content" />
+        <result column="data_json" property="dataJson" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

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

@@ -18,6 +18,6 @@
     </resultMap>
 
     <select id="getInfosByUuid" resultType="com.diagbot.dto.TranFieldInfoDTO">
-        SELECT * FROM `tran_field_info` t where t.status = '1' and FIND_IN_SET(#{uuid},uuid)
+        SELECT * FROM `tran_field_info` t where t.status = '1'and t.is_deleted = 'N' and FIND_IN_SET(#{uuid},uuid)
     </select>
 </mapper>

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

@@ -0,0 +1,140 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 科室信息表
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-11-22
+ */
+@TableName("icss_dept_info")
+public class DeptInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "DeptInfo{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", name=" + name +
+                ", remark=" + remark +
+                "}";
+    }
+}

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

@@ -0,0 +1,154 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 科室查体对应表
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-11-22
+ */
+@TableName("icss_dept_vital")
+public class DeptVital implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 科室id
+     */
+    private Long deptId;
+
+    /**
+     * 查体id(question_id)
+     */
+    private Long vitalId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public Long getVitalId() {
+        return vitalId;
+    }
+
+    public void setVitalId(Long vitalId) {
+        this.vitalId = vitalId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "DeptVital{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", deptId=" + deptId +
+                ", vitalId=" + vitalId +
+                ", remark=" + remark +
+                "}";
+    }
+}

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

@@ -0,0 +1,140 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 查体全局排序
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-11-22
+ */
+@TableName("icss_vital_order")
+public class VitalOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 查体id
+     */
+    private Long questionId;
+
+    /**
+     * 排序号
+     */
+    private Integer orderNo;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    public Long getQuestionId() {
+        return questionId;
+    }
+
+    public void setQuestionId(Long questionId) {
+        this.questionId = questionId;
+    }
+
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    @Override
+    public String toString() {
+        return "VitalOrder{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", questionId=" + questionId +
+                ", orderNo=" + orderNo +
+                "}";
+    }
+}

icssman-service/src/main/java/com/diagbot/enums/QuestionTypeEnum.java

@@ -0,0 +1,54 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description:标签类型
+ * @Author:zhaops
+ * @time: 2018/11/21 11:39
+ */
+public enum QuestionTypeEnum implements KeyedNamed {
+    Mainsuit(1, "主诉"),
+    Symptom(2, "现病史"),
+    Other(3, "其他史"),
+    Vital(4, "查体"),
+    Lis(5, "化验"),
+    Pacs(6, "辅检"),
+    Disease(7, "诊断");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    QuestionTypeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static QuestionTypeEnum getEnum(Integer key) {
+        for (QuestionTypeEnum item : QuestionTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        QuestionTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

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

@@ -0,0 +1,13 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.DeptInfoServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/11/22 11:44
+ */
+@Component
+public class DeptInfoFacade extends DeptInfoServiceImpl {
+}

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

@@ -0,0 +1,13 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.DeptInfoServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/11/22 11:45
+ */
+@Component
+public class DeptVitalFacade extends DeptInfoServiceImpl {
+}

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

@@ -13,6 +13,7 @@ import com.diagbot.vo.IntroduceVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.Map;
 
@@ -50,10 +51,9 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         //明细信息不更新，每次都删除重新插入
         //删除已有明细，物理删除
         if (!(introduceInfo.getId() == null)) {
-            UpdateWrapper<IntroduceDetail> detailUpdateWrapper = new UpdateWrapper<>();
-            detailUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                    eq("introduce_id", introduceInfo.getId());
-            introduceDetailFacade.remove(detailUpdateWrapper);
+            QueryWrapper<IntroduceDetail> detailQueryWrapper = new QueryWrapper<>();
+            detailQueryWrapper.eq("introduce_id", introduceInfo.getId());
+            introduceDetailFacade.remove(detailQueryWrapper);
         }
         //新增明细，清空id
         for (IntroduceDetail detail : introduceVO.getDetailList()) {
@@ -68,53 +68,32 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
     }
 
     /**
-     * 单条删除提示信息
+     * 单条删除提示信息 物理删除
      *
      * @param id
      * @return
      */
     public Boolean deleteRecord(Long id) {
         //删除明细
-        UpdateWrapper<IntroduceDetail> introduceDetailUpdateWrapper = new UpdateWrapper<>();
-        introduceDetailUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                eq("introduce_id", id).
-                set("is_deleted", IsDeleteEnum.Y.getKey()).
-                set("gmt_modified", new Date()).
-                set("modifier", UserUtils.getCurrentPrincipleID());
-        introduceDetailFacade.update(new IntroduceDetail(), introduceDetailUpdateWrapper);
-
-        UpdateWrapper<IntroduceInfo> introduceInfoUpdateWrapper = new UpdateWrapper<>();
-        introduceInfoUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                eq("id", id).
-                set("is_deleted", IsDeleteEnum.Y.getKey()).
-                set("gmt_modified", new Date()).
-                set("modifier", UserUtils.getCurrentPrincipleID());
-        this.update(new IntroduceInfo(), introduceInfoUpdateWrapper);
+        QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper = new QueryWrapper<>();
+        introduceDetailQueryWrapper.eq("introduce_id", id);
+        introduceDetailFacade.remove(introduceDetailQueryWrapper);
+        this.removeById(id);
         return true;
     }
 
     /**
-     * 批量删除提示信息
+     * 批量删除提示信息 物理删除
      *
      * @param ids
      * @return
      */
     public Boolean deleteRecords(Long[] ids) {
         //删除明细
-        UpdateWrapper<IntroduceDetail> introduceDetailUpdateWrapper = new UpdateWrapper<>();
-        introduceDetailUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                in("introduce_id", ids).
-                set("is_deleted", IsDeleteEnum.Y.getKey()).
-                set("gmt_modified", new Date()).
-                set("modifier", UserUtils.getCurrentPrincipleID());
-        introduceDetailFacade.update(new IntroduceDetail(), introduceDetailUpdateWrapper);
-        UpdateWrapper<IntroduceInfo> introduceInfoUpdateWrapper = new UpdateWrapper<>();
-        introduceInfoUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                in("id", ids).
-                set("is_deleted", IsDeleteEnum.Y.getKey()).
-                set("gmt_modified", new Date()).
-                set("modifier", UserUtils.getCurrentPrincipleID());
-        this.update(new IntroduceInfo(), introduceInfoUpdateWrapper);
+        QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper = new QueryWrapper<>();
+        introduceDetailQueryWrapper.in("introduce_id", ids);
+        introduceDetailFacade.remove(introduceDetailQueryWrapper);
+        this.removeByIds(Arrays.asList(ids));
         return true;
     }
 

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

@@ -0,0 +1,13 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.VitalOrderServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/11/22 11:45
+ */
+@Component
+public class VitalOrderFacade extends VitalOrderServiceImpl {
+}

icssman-service/src/main/java/com/diagbot/mapper/DeptInfoMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.DeptInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 科室信息表 Mapper 接口
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-11-22
+ */
+public interface DeptInfoMapper extends BaseMapper<DeptInfo> {
+
+}

icssman-service/src/main/java/com/diagbot/mapper/DeptVitalMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.DeptVital;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 科室查体对应表 Mapper 接口
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-11-22
+ */
+public interface DeptVitalMapper extends BaseMapper<DeptVital> {
+
+}

icssman-service/src/main/java/com/diagbot/mapper/VitalOrderMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.VitalOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 查体全局排序 Mapper 接口
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-11-22
+ */
+public interface VitalOrderMapper extends BaseMapper<VitalOrder> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.DeptInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 科室信息表 服务类
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-11-22
+ */
+public interface DeptInfoService extends IService<DeptInfo> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.DeptVital;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 科室查体对应表 服务类
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-11-22
+ */
+public interface DeptVitalService extends IService<DeptVital> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.VitalOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 查体全局排序 服务类
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-11-22
+ */
+public interface VitalOrderService extends IService<VitalOrder> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.DeptInfo;
+import com.diagbot.mapper.DeptInfoMapper;
+import com.diagbot.service.DeptInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 科室信息表 服务实现类
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-11-22
+ */
+@Service
+public class DeptInfoServiceImpl extends ServiceImpl<DeptInfoMapper, DeptInfo> implements DeptInfoService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.DeptVital;
+import com.diagbot.mapper.DeptVitalMapper;
+import com.diagbot.service.DeptVitalService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 科室查体对应表 服务实现类
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-11-22
+ */
+@Service
+public class DeptVitalServiceImpl extends ServiceImpl<DeptVitalMapper, DeptVital> implements DeptVitalService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.VitalOrder;
+import com.diagbot.mapper.VitalOrderMapper;
+import com.diagbot.service.VitalOrderService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 查体全局排序 服务实现类
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-11-22
+ */
+@Service
+public class VitalOrderServiceImpl extends ServiceImpl<VitalOrderMapper, VitalOrder> implements VitalOrderService {
+
+}

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

@@ -0,0 +1,23 @@
+package com.diagbot.web;
+
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 科室信息表 前端控制器
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-11-22
+ */
+@RestController
+@RequestMapping("/deptInfo")
+@Api(value = "科室相关API", tags = { "科室相关API" })
+public class DeptInfoController {
+
+}

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

@@ -0,0 +1,21 @@
+package com.diagbot.web;
+
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 科室查体对应表 前端控制器
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-11-22
+ */
+@RestController
+@RequestMapping("/deptVital")
+@Api(value = "查体模板相关API", tags = { "查体模板相关API" })
+public class DeptVitalController {
+
+}

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

@@ -0,0 +1,23 @@
+package com.diagbot.web;
+
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 查体全局排序 前端控制器
+ * </p>
+ *
+ * @author zhaops
+ * @since 2018-11-22
+ */
+@RestController
+@RequestMapping("/vitalOrder")
+@Api(value = "查体排序相关API", tags = { "查体排序相关API" })
+public class VitalOrderController {
+
+}

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.DeptInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.DeptInfo">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="name" property="name" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.DeptVitalMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.DeptVital">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="dept_id" property="deptId" />
+        <result column="vital_id" property="vitalId" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.VitalOrderMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.VitalOrder">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="question_id" property="questionId" />
+        <result column="order_no" property="orderNo" />
+    </resultMap>
+
+</mapper>