修改pc管理端设备管理的bug

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/device/DeviceHealthIndexService.java

@@ -65,7 +65,7 @@ public class DeviceHealthIndexService extends BaseDeviceJpaService<DeviceHealthI
        HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest();
        User loginUser = (User) request.getSession().getAttribute("userInfo");
        Pageable pageRequest = new PageRequest(page-1,pageSize);
        Pageable pageRequest = new PageRequest(page - 1,pageSize);
        StringBuilder filter = new StringBuilder();
@@ -140,7 +140,7 @@ public class DeviceHealthIndexService extends BaseDeviceJpaService<DeviceHealthI
//        }
        String f = filter.toString();
//        System.out.println("sql:"+sql+f+" order by i.czrq desc "+" limit "+(page-1)+","+pageSize);
        List<Map<String, Object>> resultList = jdbcTemplate.queryForList(sql+f+" order by i.czrq desc "+" limit "+(page-1)+","+pageSize);
        List<Map<String, Object>> resultList = jdbcTemplate.queryForList(sql+f+" order by i.czrq desc "+" limit "+(page-1)*pageSize+","+pageSize);
        if(resultList.size()<=0){
            return new PageImpl<DeviceHealthIndexVO>(new ArrayList<>(), pageRequest, 0);
        }

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/device/WlyyDeviceService.java

@@ -1,22 +1,21 @@
package com.yihu.wlyy.service.manager.device;
        import com.yihu.wlyy.device.entity.WlyyDevice;
        import com.yihu.wlyy.device.repository.WlyyDeviceDao;
        import org.apache.commons.lang3.StringUtils;
        import org.springframework.beans.factory.annotation.Autowired;
        import org.springframework.data.domain.Page;
        import org.springframework.data.domain.PageRequest;
        import org.springframework.data.jpa.domain.Specification;
        import org.springframework.stereotype.Service;
        import org.springframework.transaction.annotation.Transactional;
        import org.springside.modules.persistence.DynamicSpecifications;
        import org.springside.modules.persistence.SearchFilter;
import com.yihu.wlyy.device.repository.WlyyDeviceDao;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springside.modules.persistence.DynamicSpecifications;
import org.springside.modules.persistence.SearchFilter;
        import javax.persistence.EntityManager;
        import java.util.Date;
        import java.util.HashMap;
        import java.util.List;
        import java.util.Map;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * Created by yww on 2016/12/1.
@@ -86,6 +85,7 @@ public class WlyyDeviceService {
        deviceNew.setApplicantIdentity(device.getApplicantIdentity());
        deviceNew.setApplicantTel(device.getApplicantTel());
        deviceNew.setApplicantMail(device.getApplicantMail());
        deviceNew.setSim(device.getSim());
        return deviceDao.save(deviceNew);
    }

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/device/device_list_js.jsp

@@ -165,7 +165,7 @@
					var self = this;
					//状态修改
					$.subscribe('device:info:view', function (event, id) {
						var title = '查看查看信息';
						var title = '查看信息';
						self.deviceInfoDialog = $.ligerDialog.open({
							height: 770,
							width: 560,
@@ -175,7 +175,7 @@
						})
					});
					$.subscribe('device:info:edit', function (event, id) {
						var title = '编辑编辑信息';
						var title = '编辑信息';
						self.deviceInfoDialog = $.ligerDialog.open({
							height: 770,
							width: 560,

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/service/common/account/PatientService.java

@@ -1138,32 +1138,4 @@ public class PatientService extends TokenService {
        }
        return "1";
    }
    /**
     * 根据患者身份证号更新患者医疗保险号情况
     * @param idcard_medicare_number_map
     */
    @Transactional
    public void updatePatientMedicareNumberByIdcard(HashMap<String, String> idcard_medicare_number_map){
        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); // 事物隔离级别，开启新事务
        TransactionStatus status = transactionManager.getTransaction(def); // 获得事务状态
        try {
            for (String idcard : idcard_medicare_number_map.keySet()) {
                patientDao.updatePatientMedicareNumberByIdcard(idcard,idcard_medicare_number_map.get(idcard));
            }
            //事务提交
            transactionManager.commit(status);
        } catch (Exception ex) {
            logger.info("更新患者医疗保险号出错，从基卫获取的患者数据为：START");
            for (String idcard : idcard_medicare_number_map.keySet()) {
                logger.info("idcard:" + idcard);
                logger.info("idcard:" + idcard_medicare_number_map.get(idcard));
            }
            logger.info("更新患者医疗保险号出错，从基卫获取的患者数据为：END");
            //报错事务回滚
            transactionManager.rollback(status);
        }
    }
}