Merge branch 'dev/icss' into debug

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

@@ -1,14 +1,17 @@
 package com.diagbot.facade;
 
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.HospitalInfoDTO;
+import com.diagbot.entity.HospitalInfo;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.HospitalInfoServiceImpl;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.HospitalInfoVO;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
 
 /**
  * @Description:
@@ -31,4 +34,18 @@ public class HospitalInfoFacade extends HospitalInfoServiceImpl {
         }
         return hospitalInfoDTOList;
     }
+    
+    /**
+     * 通过医院编码获取医院信息
+     * @param code 医院编码
+     * @return
+     */
+    public HospitalInfo getHospitalByCode(String code){
+    	QueryWrapper<HospitalInfo> queryWrapper = new QueryWrapper<HospitalInfo>();
+    	queryWrapper.eq("is_deleted", "N");
+    	queryWrapper.eq("code", code);
+    	queryWrapper.eq("status", 1);
+    	return this.getOne(queryWrapper);
+    }
+    
 }

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

@@ -2,7 +2,9 @@ package com.diagbot.facade;
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -11,8 +13,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.InquiryDetailDTO;
 import com.diagbot.dto.ReadInquiryDTO;
 import com.diagbot.dto.SaveInquiryDTO;
+import com.diagbot.entity.HospitalInfo;
 import com.diagbot.entity.InquiryDetail;
 import com.diagbot.entity.InquiryInfo;
+import com.diagbot.entity.PatientInfo;
 import com.diagbot.service.impl.InquiryInfoServiceImpl;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.ReadInquiryVO;
@@ -28,6 +32,10 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 	
 	@Autowired
 	private InquiryDetailFacade inquiryDetailFacade;
+	@Autowired
+	private HospitalInfoFacade hospitalInfoFacade;
+	@Autowired
+	private PatientInfoFacade patientInfoFacade;
 	
 	/**
 	 * 问诊记录保存
@@ -39,6 +47,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 		Date now = new Date();
 		
 		QueryWrapper<InquiryInfo> queryWrapper = new QueryWrapper<InquiryInfo>();
+		queryWrapper.eq("is_deleted", "N");
 		queryWrapper.eq("hospital_id", saveInquiryVO.getHospitalId());
 		queryWrapper.eq("hospital_dept_id", saveInquiryVO.getHospitalDeptId());
 		queryWrapper.eq("doctor_id", saveInquiryVO.getDoctorId());
@@ -99,6 +108,18 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 	public ReadInquiryDTO readInquiry(ReadInquiryVO readInquiryVO){
 		ReadInquiryDTO readInquiryDTO = new ReadInquiryDTO();
 		
+		HospitalInfo hospitalInfo = hospitalInfoFacade.getHospitalByCode(readInquiryVO.getHospitalCode());
+		PatientInfo patientInfo = patientInfoFacade.getPatientByCode(readInquiryVO.getHospitalCode(), readInquiryVO.getPatientCode()); 
+		
+		Map<String,Object> map = new HashMap<>();
+		map.put("hospitalId", hospitalInfo.getId());
+		map.put("patientId", patientInfo.getId());
+		InquiryInfo inquiryInfo = baseMapper.getPatientLast(map);
+		
+		if(inquiryInfo!=null){
+			readInquiryDTO.setDataJson(inquiryInfo.getDataJson());
+		}
+		
 		return readInquiryDTO;
 	}
 

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

@@ -51,7 +51,9 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
             bean.setModuleDetailDTOList(moduleDetailDTOList);
             StringBuffer sb = new StringBuffer();
             for (ModuleDetailDTO detailDTO : moduleDetailDTOList) {
-                sb.append(detailDTO.getQuestionId()).append(",");
+                if (detailDTO.getQuestionId() != null) {
+                    sb.append(detailDTO.getQuestionId()).append(",");
+                }
             }
             if (ListUtil.isNotEmpty(moduleDetailDTOList)) {
                 QuestionIdsVO questionIdsVO = new QuestionIdsVO();

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

@@ -1,17 +1,20 @@
 package com.diagbot.facade;
 
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;
+import com.diagbot.entity.PatientInfo;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.PatientInfoServiceImpl;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.PatientInfoVO;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
 
 /**
  * @Description: 患者业务逻辑
@@ -44,6 +47,18 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
     	return baseMapper.getTopPatientInfo(getTopPatientInfoVO);
     }
     
-    
+    /**
+     * 通过医院编码、病人编码获取病人信息
+     * @param hospitalCode 医院编码
+     * @param patientCode 病人编码
+     * @return
+     */
+    public PatientInfo getPatientByCode(String hospitalCode,String patientCode){
+    	QueryWrapper<PatientInfo> queryWrapper = new QueryWrapper<PatientInfo>();
+    	queryWrapper.eq("is_deleted", "N");
+    	queryWrapper.eq("hospital_code", hospitalCode);
+    	queryWrapper.eq("code", patientCode);
+    	return this.getOne(queryWrapper);
+    }
     
 }

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

@@ -1,7 +1,9 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.InquiryInfo;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.InquiryInfo;
 
 /**
  * <p>
@@ -12,5 +14,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2018-11-23
  */
 public interface InquiryInfoMapper extends BaseMapper<InquiryInfo> {
-
+	
+	/**
+	 * 根据医院id和病人id获取最近一条其他史不为空的病历
+	 * @param map 包含两个参数 
+	 * hospitalId 医院id
+	 * patientId 病人id
+	 * @return
+	 */
+	InquiryInfo getPatientLast(Map<String,Object> map);
+	
 }

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

@@ -1,21 +0,0 @@
-package com.diagbot.web;
-
-
-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-15
- */
-@RestController
-@RequestMapping("/deptVital")
-public class DeptVitalController {
-
-}

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

@@ -1,19 +0,0 @@
-package com.diagbot.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 提示信息明细 前端控制器
- * </p>
- *
- * @author zhaops
- * @since 2018-11-15
- */
-@RestController
-@RequestMapping("/introduceDetail")
-public class IntroduceDetailController {
-
-}

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

@@ -1,19 +0,0 @@
-package com.diagbot.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 标签与提示信息映射表 前端控制器
- * </p>
- *
- * @author zhaops
- * @since 2018-11-15
- */
-@RestController
-@RequestMapping("/introduceMap")
-public class IntroduceMapController {
-
-}

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

@@ -1,19 +0,0 @@
-package com.diagbot.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 版本详情(关于) 前端控制器
- * </p>
- *
- * @author wangfeng
- * @since 2018-11-20
- */
-@RestController
-@RequestMapping("/versionDetail")
-public class VersionDetailController {
-
-}

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

@@ -1,21 +0,0 @@
-package com.diagbot.web;
-
-
-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-15
- */
-@RestController
-@RequestMapping("/vitalOrder")
-public class VitalOrderController {
-
-}

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

@@ -22,5 +22,18 @@
         <result column="data_json" property="dataJson" />
         <result column="remark" property="remark" />
     </resultMap>
+    
+    <select id="getPatientLast" parameterType="map" resultMap="BaseResultMap">
+    	SELECT
+		a.*
+		FROM icss_inquiry_info a JOIN icss_inquiry_detail b 
+		on a.id=b.inquiry_id
+		where a.hospital_id=#{hospitalId} and a.patient_id=#{patientId}
+		and b.type=3 and a.is_deleted='N' 
+		and b.is_deleted='N' 
+		group by a.id
+		ORDER BY a.gmt_create desc
+		limit 0,1
+    </select>
 
 </mapper>

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

@@ -73,4 +73,18 @@ public class DeptVitalFacade extends DeptVitalServiceImpl implements DeptVitalSe
         deptVitalServiceImpl.saveBatch(deptVitalList);
         return true;
     }
+
+    /**
+     * 删除科室查体模板标签
+     *
+     * @param deptVitalVO
+     * @return
+     */
+    public Boolean delDeptVitalList(DeptVitalVO deptVitalVO) {
+        QueryWrapper<DeptVital> deptVitalQueryWrapper = new QueryWrapper<DeptVital>();
+        deptVitalQueryWrapper.eq("dept_id", deptVitalVO.getDeptId()).
+                in("vital_id", deptVitalVO.getVitalIds());
+        this.remove(deptVitalQueryWrapper);
+        return true;
+    }
 }

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

@@ -23,10 +23,10 @@ public class VitalOrderFacade extends VitalOrderServiceImpl {
     @Autowired
     VitalOrderServiceImpl vitalOrderServiceImpl;
 
-    public Boolean saveVitalOrders(List<VitalOrderVO> vitalOrderVOList) {
+    public Boolean saveAll(List<VitalOrderVO> vitalOrderVOList) {
         //先删除现有排序
         QueryWrapper<VitalOrder> vitalOrderQueryWrapper = new QueryWrapper<>();
-        vitalOrderQueryWrapper.eq("1", "1");
+        this.remove(vitalOrderQueryWrapper);
         //插入新排序
         List<VitalOrder> vitalOrderList = Lists.newArrayList();
         for (VitalOrderVO vitalOrderVO : vitalOrderVOList) {
@@ -40,4 +40,13 @@ public class VitalOrderFacade extends VitalOrderServiceImpl {
         vitalOrderServiceImpl.saveBatch(vitalOrderList);
         return true;
     }
+
+    /**
+     * 获取所有查体排序关系
+     * @return
+     */
+    public List<VitalOrder> getAll() {
+        QueryWrapper<VitalOrder> vitalOrderQueryWrapper = new QueryWrapper<>();
+        return this.list(vitalOrderQueryWrapper);
+    }
 }

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

@@ -32,7 +32,7 @@ public class DeptVitalController {
     @Autowired
     private DeptVitalFacade deptVitalFacade;
 
-    @ApiOperation(value = "保存查体模板",
+    @ApiOperation(value = "保存查体模板[by:zhaops]",
             notes = "deptId:科室ID，必填<br>" +
                     "vitalIds:查体标签ids，必填<br>")
     @PostMapping("/saveDeptVitals")
@@ -41,4 +41,14 @@ public class DeptVitalController {
         Boolean data = deptVitalFacade.saveDeptVitals(deptVitalVO);
         return RespDTO.onSuc(data);
     }
+
+    @ApiOperation(value = "删除模板标签[by:zhaops]",
+            notes = "deptId:科室ID，必填<br>" +
+                    "vitalIds:查体标签ids，必填<br>")
+    @PostMapping("/delDeptVitalList")
+    @SysLogger("delDeptVitalList")
+    public RespDTO<Boolean> delDeptVitalList(@RequestBody DeptVitalVO deptVitalVO) {
+        Boolean data = deptVitalFacade.delDeptVitalList(deptVitalVO);
+        return RespDTO.onSuc(data);
+    }
 }

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

@@ -3,6 +3,7 @@ package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.VitalOrder;
 import com.diagbot.facade.VitalOrderFacade;
 import com.diagbot.vo.DeptVitalVO;
 import com.diagbot.vo.VitalOrderVO;
@@ -32,13 +33,21 @@ public class VitalOrderController {
     @Autowired
     private VitalOrderFacade vitalOrderFacade;
 
-    @ApiOperation(value = "保存查体顺序",
+    @ApiOperation(value = "保存查体顺序-全部[by:zhaops]",
             notes = "vital:查体标签ID，必填<br>" +
                     "orderNo:查体排序号，必填<br>")
-    @PostMapping("/saveVitalOrders")
-    @SysLogger("saveVitalOrders")
-    public RespDTO<Boolean> saveVitalOrders(@RequestBody List<VitalOrderVO> vitalOrderVOList) {
-        Boolean data = vitalOrderFacade.saveVitalOrders(vitalOrderVOList);
+    @PostMapping("/saveAll")
+    @SysLogger("saveAll")
+    public RespDTO<Boolean> saveAll(@RequestBody List<VitalOrderVO> vitalOrderVOList) {
+        Boolean data = vitalOrderFacade.saveAll(vitalOrderVOList);
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "获取查体排序-全部[by:zhaops]")
+    @PostMapping("/getAll")
+    @SysLogger("getAll")
+    public RespDTO<List<VitalOrder>> getAll() {
+        List<VitalOrder> data = vitalOrderFacade.getAll();
         return RespDTO.onSuc(data);
     }