Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

business/base-service/src/main/java/com/yihu/jw/healthUpload/service/BaseDoctorHealthUploadService.java

@@ -1278,7 +1278,16 @@ public class BaseDoctorHealthUploadService extends BaseJpaService<BaseDoctorHeal
            Date endTime = DateUtil.strToDateLong(DateUtil.getStringDateShort()+" 23:59:59");
            List<BaseDoctorHealthUploadDO> healthUploadDOS = baseDoctorHealthUploadDao.selectHealthUploadInfoByDoctorIdAndStartAndEnd(id,startTime,endTime);
            if (healthUploadDOS!=null&&healthUploadDOS.size()!=0){
                map.put("healthUpload",healthUploadDOS.get(0));
                BaseDoctorHealthUploadDO healthUploadDO = healthUploadDOS.get(0);
                String healthStateName = "";
                if (healthUploadDO.getHealthCode()==2 ||healthUploadDO.getHealthCode()==3||Double.parseDouble(healthUploadDO.getTemperature())>=37.3
                        || healthUploadDO.getIsSymptoms()==1 || healthUploadDO.getIsEpidemic()==1) {
                    healthStateName = "异常";
                } else {
                    healthStateName = "正常";
                }
                map.put("healthStateName",healthStateName);
                map.put("healthUpload",healthUploadDO);
            }else {
                map.put("healthUpload",null);
            }