Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/entity/device/PatientDevice.java

@@ -31,33 +31,33 @@ public class PatientDevice extends IdEntity {
	private String doctor;
	// 操作时间
	private Date czrq;
	/**
	 * 是否有效
	 * 1-已删除绑定
	 * 0-正常绑定
	 */
	private int del;
	/**
	 * 删除人CODE
	 */
	private String delUser;
	@Column(name="del_user")
	public String getDelUser() {
		return delUser;
	}
	public void setDelUser(String delUser) {
		this.delUser = delUser;
	}
	public int getDel() {
		return del;
	}
	public void setDel(int del) {
		this.del = del;
	}
	///**
	// * 是否有效
	// * 1-已删除绑定
	// * 0-正常绑定
	// */
	//private int del;
	///**
	// * 删除人CODE
	// */
	//private String delUser;
    //
	//@Column(name="del_user")
	//public String getDelUser() {
	//	return delUser;
	//}
    //
	//public void setDelUser(String delUser) {
	//	this.delUser = delUser;
	//}
    //
	//public int getDel() {
	//	return del;
	//}
    //
	//public void setDel(int del) {
	//	this.del = del;
	//}
	@Column(name="device_id")
	public Long getDeviceId() {

patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/patient/PatientDeviceDao.java

@@ -10,16 +10,16 @@ import com.yihu.wlyy.entity.device.PatientDevice;;import java.util.List;
public interface PatientDeviceDao extends PagingAndSortingRepository<PatientDevice, Long>, JpaSpecificationExecutor<PatientDevice> {
    @Query("select a from PatientDevice a where a.user = ?1 and a.del =?2")
	Iterable<PatientDevice> findByUser(String user,int del);
    @Query("select a from PatientDevice a where a.user = ?1 ")
	Iterable<PatientDevice> findByUser(String user);
	List<PatientDevice> findByUserAndDel(String user,int del,Pageable pageRequest);
	List<PatientDevice> findByUser(String user,Pageable pageRequest);
	List<PatientDevice> findByUserAndDoctorAndDel(String user,String doctor,int del, Pageable pageRequest);
	List<PatientDevice> findByUserAndDoctor(String user,String doctor,Pageable pageRequest);
	List<PatientDevice> findByDeviceSnAndCategoryCodeAndDel(String deviceSn, String categoryCode,int del);
	List<PatientDevice> findByDeviceSnAndCategoryCode(String deviceSn, String categoryCode);
	PatientDevice findByDeviceSnAndCategoryCodeAndUserTypeAndDel(String deviceSn, String categoryCode,String userType,int del);
	PatientDevice findByDeviceSnAndCategoryCodeAndUserType(String deviceSn, String categoryCode,String userType);
	PatientDevice findByDeviceIdAndDeviceSnAndUserTypeAndDel(Long deviceId, String deviceSn,String userType,int del);
	PatientDevice findByDeviceIdAndDeviceSnAndUserType(Long deviceId, String deviceSn,String userType);
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/device/PatientDeviceService.java

@@ -99,7 +99,7 @@ public class PatientDeviceService extends BaseService {
			//校验sn码是否被使用
			if(needVerify) {
				PatientDevice device = patientDeviceDao.findByDeviceIdAndDeviceSnAndUserTypeAndDel(deviceId, sn, userType,0);
				PatientDevice device = patientDeviceDao.findByDeviceIdAndDeviceSnAndUserType(deviceId, sn, userType);
				if (device != null && !device.getId().equals(patientDevice.getId())) {
					throw new Exception("sn码" + sn + "已被使用！");
				}
@@ -178,14 +178,12 @@ public class PatientDeviceService extends BaseService {
	public void deleteDevices(String deviceSn,String type,String uuid){
		List<PatientDevice> patientDevices = 	patientDeviceDao.findByDeviceSnAndCategoryCodeAndDel(deviceSn,type,0);
		List<PatientDevice> patientDevices = 	patientDeviceDao.findByDeviceSnAndCategoryCode(deviceSn,type);
		if(patientDevices==null||patientDevices.size()==0){
			throw  new RuntimeException("设备未被绑定！");
		}
		for(PatientDevice patientDevice: patientDevices){
			patientDevice.setDelUser(uuid);
			patientDevice.setDel(1);
			patientDeviceDao.save(patientDevice);
			patientDeviceDao.delete(patientDevice);
		}
	}
@@ -195,10 +193,8 @@ public class PatientDeviceService extends BaseService {
	 */
	public List<JSONObject> deleteDevice(String id,String uuid) {
		PatientDevice device = patientDeviceDao.findOne(Long.valueOf(id));
		device.setDelUser(uuid);
		device.setDel(1);
		patientDeviceDao.save(device);
		List<PatientDevice> patientDevices = patientDeviceDao.findByDeviceSnAndCategoryCodeAndDel(device.getDeviceSn(),device.getCategoryCode(),0);
		patientDeviceDao.delete(device);
		List<PatientDevice> patientDevices = patientDeviceDao.findByDeviceSnAndCategoryCode(device.getDeviceSn(),device.getCategoryCode());
		List<JSONObject> objects = new ArrayList<>();
		for(PatientDevice patientDevice:patientDevices){
			JSONObject object = new JSONObject(patientDevice);
@@ -272,7 +268,7 @@ public class PatientDeviceService extends BaseService {
		//else{
		//	list = patientDeviceDao.findByUserAndDoctor(patientCode, doctorCode,pageRequest);
		//}
		list = patientDeviceDao.findByUserAndDel(patientCode,0,pageRequest);
		list = patientDeviceDao.findByUser(patientCode,pageRequest);
		if(list!=null)
		{
			//获取设备路径,医生姓名
@@ -366,7 +362,7 @@ public class PatientDeviceService extends BaseService {
	 * @return
	 */
	public Iterator<PatientDevice> findPatientHave(String patient) {
		return patientDeviceDao.findByUser(patient,0).iterator();
		return patientDeviceDao.findByUser(patient).iterator();
	}
	/**
@@ -383,7 +379,7 @@ public class PatientDeviceService extends BaseService {
	 **/
	public List<Map<String,String>> getDeviceUser(String user,String deviceSn,String type) throws Exception {
		List<Map<String,String>> re = new ArrayList<>();
		List<PatientDevice> list =patientDeviceDao.findByDeviceSnAndCategoryCodeAndDel(deviceSn,type,0);
		List<PatientDevice> list =patientDeviceDao.findByDeviceSnAndCategoryCode(deviceSn,type);
		if(list!=null)
		{
			for(PatientDevice item:list)
@@ -417,7 +413,7 @@ public class PatientDeviceService extends BaseService {
	}
	public JSONArray getDeviceByDeviceSn(String deviceSn,String type){
		List<PatientDevice> list =patientDeviceDao.findByDeviceSnAndCategoryCodeAndDel(deviceSn,type,0);
		List<PatientDevice> list =patientDeviceDao.findByDeviceSnAndCategoryCode(deviceSn,type);
		JSONArray objects = new JSONArray();
		for(PatientDevice patientDevice:list){
			JSONObject object = new JSONObject(patientDevice);

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/health/PatientHealthIndexService.java

@@ -442,7 +442,7 @@ public class PatientHealthIndexService extends BaseService {
        obj.setDel("1");
        Date time = currentTime;
        if (map.containsKey("time")) {
            time = DateUtil.strToDateLong(map.get("time"));
            time = DateUtil.strToDate(map.get("time"));
        }
        obj.setRecordDate(time);    //记录时间
        obj.setSortDate(time);      //排序时间
@@ -457,7 +457,7 @@ public class PatientHealthIndexService extends BaseService {
                userType = map.get("user");
            }
            //根据设备获取患者(不同厂家sn码一样的问题未解决！！)
            PatientDevice device = patientDeviceDao.findByDeviceSnAndCategoryCodeAndUserTypeAndDel(deviceSn, type, userType,0);
            PatientDevice device = patientDeviceDao.findByDeviceSnAndCategoryCodeAndUserType(deviceSn, type, userType);
            if (device != null) {
                patientCode = device.getUser();
                patient = patientDao.findByCode(patientCode);
@@ -565,8 +565,8 @@ public class PatientHealthIndexService extends BaseService {
        } else {
            // 排序
            Sort sort = new Sort(Direction.ASC, "recordDate");
            PageRequest pageRequest = new PageRequest(0, 100, sort);
            re = patientHealthIndexDao.findIndexByPatient(patient, type, startDate, endDate, null).getContent();
            PageRequest pageRequest = new PageRequest(0, 1000, sort);
            re = patientHealthIndexDao.findIndexByPatient(patient, type, startDate, endDate, pageRequest).getContent();
        }
        return re;
    }

patient-co-wlyy/src/main/java/com/yihu/wlyy/util/DateUtil.java

@@ -35,6 +35,11 @@ public class DateUtil {
		}
		else{
			int length = strDate.length();
			if(strDate.contains("/"))
			{
				strDate = strDate.replace("/","-");
			}
			if(strDate.contains("-"))
			{
				if(length == 10)
@@ -190,10 +195,6 @@ public class DateUtil {
	/**
	 * 将短时间格式时间转换为字符串 yyyy-MM-dd
	 * 
	 * @param dateDate
	 * @param k
	 * @return
	 */
	public static String dateToStr(java.util.Date dateDate, String format) {
		if (dateDate == null) {