慢病管理：居民列表BUG

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

@@ -1,5 +1,6 @@
package com.yihu.wlyy.repository.patient;
import com.yihu.wlyy.entity.patient.vo.PatientCodeDeviceType;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
@@ -36,4 +37,7 @@ public interface PatientDeviceDao extends PagingAndSortingRepository<PatientDevi
    @Query("update PatientDevice t set t.deviceSn = ?3 , t.userType = ?4 where t.user = ?1 and t.deviceSn = ?2 ")
    int updatePatientDevice(String user, String deviceSN, String newDeviceSN,String userType);
    @Query(value = "select user,sum(category_code) as deviceType FROM wlyy_patient_device GROUP BY user",nativeQuery = true)
    List<PatientCodeDeviceType> getPatientAndDeviceCount();
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/label/SignPatientLabelInfoService.java

@@ -362,11 +362,13 @@ public class SignPatientLabelInfoService extends BaseService {
        //查询患者设备绑定情况
        String _pdsql = "select user,sum(category_code) deviceType FROM wlyy_patient_device GROUP BY user";
        List<PatientCodeDeviceType> patientCodeDeviceTypes =  jdbcTemplate.queryForList(_pdsql,PatientCodeDeviceType.class);
        List<Map<String,Object>> patientCodeDeviceTypes =  jdbcTemplate.queryForList(_pdsql);
        if(!patientCodeDeviceTypes.isEmpty()){
            for (PatientCodeDeviceType patientCodeDeviceType : patientCodeDeviceTypes) {
                patientDeviceTypeMap.put(patientCodeDeviceType.getUser(),patientCodeDeviceType.getDeviceType());
            for (Map<String,Object> patientCodeDeviceType : patientCodeDeviceTypes) {
                String user = String.valueOf(patientCodeDeviceType.get("user"));
                String sum = String.valueOf(patientCodeDeviceType.get("deviceType"));
                patientDeviceTypeMap.put(user,sum);
            }
        }
@@ -3702,11 +3704,13 @@ public class SignPatientLabelInfoService extends BaseService {
        //查询患者设备绑定情况
        String _pdsql = "select user,sum(category_code) deviceType FROM wlyy_patient_device GROUP BY user";
        List<PatientCodeDeviceType> patientCodeDeviceTypes =  jdbcTemplate.queryForList(_pdsql,PatientCodeDeviceType.class);
        List<Map<String,Object>> patientCodeDeviceTypes =  jdbcTemplate.queryForList(_pdsql);
        if(!patientCodeDeviceTypes.isEmpty()){
            for (PatientCodeDeviceType patientCodeDeviceType : patientCodeDeviceTypes) {
                patientDeviceTypeMap.put(patientCodeDeviceType.getUser(),patientCodeDeviceType.getDeviceType());
            for (Map<String,Object> patientCodeDeviceType : patientCodeDeviceTypes) {
                String user = String.valueOf(patientCodeDeviceType.get("user"));
                String sum = String.valueOf(patientCodeDeviceType.get("deviceType"));
                patientDeviceTypeMap.put(user,sum);
            }
        }
@@ -4139,13 +4143,16 @@ public class SignPatientLabelInfoService extends BaseService {
        //查询患者设备绑定情况
        String _pdsql = "select user,sum(category_code) deviceType FROM wlyy_patient_device GROUP BY user";
        List<PatientCodeDeviceType> patientCodeDeviceTypes =  jdbcTemplate.queryForList(_pdsql,PatientCodeDeviceType.class);
        List<Map<String,Object>> patientCodeDeviceTypes =  jdbcTemplate.queryForList(_pdsql);
        if(!patientCodeDeviceTypes.isEmpty()){
            for (PatientCodeDeviceType patientCodeDeviceType : patientCodeDeviceTypes) {
                patientDeviceTypeMap.put(patientCodeDeviceType.getUser(),patientCodeDeviceType.getDeviceType());
            for (Map<String,Object> patientCodeDeviceType : patientCodeDeviceTypes) {
                String user = String.valueOf(patientCodeDeviceType.get("user"));
                String sum = String.valueOf(patientCodeDeviceType.get("deviceType"));
                patientDeviceTypeMap.put(user,sum);
            }
        }
        if (signList != null && signList.size() > 0) {
            for (Map<String, Object> sign : signList) {
                Patient p = patientDao.findByCode(sign.get("patient") == null ? "" : sign.get("patient").toString());
@@ -4347,11 +4354,13 @@ public class SignPatientLabelInfoService extends BaseService {
        //查询患者设备绑定情况
        String _pdsql = "select user,sum(category_code) deviceType FROM wlyy_patient_device GROUP BY user";
        List<PatientCodeDeviceType> patientCodeDeviceTypes =  jdbcTemplate.queryForList(_pdsql,PatientCodeDeviceType.class);
        List<Map<String,Object>> patientCodeDeviceTypes =  jdbcTemplate.queryForList(_pdsql);
        if(!patientCodeDeviceTypes.isEmpty()){
            for (PatientCodeDeviceType patientCodeDeviceType : patientCodeDeviceTypes) {
                patientDeviceTypeMap.put(patientCodeDeviceType.getUser(),patientCodeDeviceType.getDeviceType());
            for (Map<String,Object> patientCodeDeviceType : patientCodeDeviceTypes) {
                String user = String.valueOf(patientCodeDeviceType.get("user"));
                String sum = String.valueOf(patientCodeDeviceType.get("deviceType"));
                patientDeviceTypeMap.put(user,sum);
            }
        }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/patient/SignPatientLabelInfoController.java

@@ -171,8 +171,8 @@ public class SignPatientLabelInfoController extends BaseController {
                return write(200, "查询成功", "data", jsonObject);
            }
            JSONArray result = labelInfoService.getPatientByLabel(getUID(), labelCode, labelType, teamCode, page, pagesize,isSlowDisease,diseaseCondition);
            //JSONArray result = labelInfoService.getPatientByLabel("xh1D201703150222", labelCode, labelType, teamCode, page, pagesize);
//            JSONArray result = labelInfoService.getPatientByLabel(getUID(), labelCode, labelType, teamCode, page, pagesize,isSlowDisease,diseaseCondition);
            JSONArray result = labelInfoService.getPatientByLabel("xh1D201703150222", labelCode, labelType, teamCode, page, pagesize,isSlowDisease,diseaseCondition);
            return write(200, "查询成功", "data", result);
        } catch (Exception e) {