代码修改

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/article/ArticleEndpoint.java

@@ -10,13 +10,10 @@ import com.yihu.jw.base.service.article.KnowledgeArticleService;
import com.yihu.jw.base.service.article.KnowledgeArticleUserService;
import com.yihu.jw.base.service.article.KnowledgeCategoryService;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.patient.BasePatientBusinessDO;
import com.yihu.jw.entity.base.role.RoleDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDictDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleUserDO;
import com.yihu.jw.entity.hospital.article.KnowledgeCategoryDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
@@ -90,10 +87,10 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
		try {
			String userId=getUID();
			UserDO userDO = userdao.getOne(userId);
			UserDO userDO = userdao.findById(userId).orElse(null);
			boolean queryAll=false;
			if (userDO!=null){
				RoleDO roleDO= roleDao.getOne(userDO.getRoleId());
				RoleDO roleDO= roleDao.findById(userDO.getRoleId()).orElse(null);
				if (roleDO!=null){
					if ("admin".equalsIgnoreCase(roleDO.getCode())
							||"hosAdmin".equalsIgnoreCase(roleDO.getCode())

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/dict/BusinessSysDictEndpoint.java

@@ -104,6 +104,6 @@ public class BusinessSysDictEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value= "findOneDict")
    public Envelop findOneDict(@ApiParam(name = "id", value = "id", required = true)
                               @RequestParam(value = "id", required = true)String id) throws Exception{
        return success(businessSysDictDao.getOne(id));
        return success(businessSysDictDao.findById(id).orElse(null));
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/doctor/DoctorServicePermissionsEndpoint.java

@@ -90,7 +90,7 @@ public class DoctorServicePermissionsEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "size") int size) throws Exception {
        List<DoctorServicePermissionsDO> permissionsDOs = permissionsService.search(fields, filters, sorts, page, size);
        for (DoctorServicePermissionsDO permissionsDO:permissionsDOs){
            BaseDoctorDO doctorDO = doctorDao.getOne(permissionsDO.getDoctor());
            BaseDoctorDO doctorDO = doctorDao.findById(permissionsDO.getDoctor()).orElse(null);
            if(doctorDO!=null){
                permissionsDO.setIdcard(doctorDO.getIdcard());
                permissionsDO.setMobile(doctorDO.getMobile());

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/patient/BasePatientEndpoint.java

@@ -337,7 +337,7 @@ public class BasePatientEndpoint extends EnvelopRestEndpoint {
                            errorMsgMap.put(idcard,"团队信息获取失败");
                            continue;
                        }
                        BaseDoctorDO doctorDO = baseDoctorDao.getOne(teamDO.getLeaderCode());
                        BaseDoctorDO doctorDO = baseDoctorDao.findById(teamDO.getLeaderCode()).orElse(null);;
                        if (doctorDO == null) {
                            errorMsgMap.put(idcard,"医生信息获取失败");
                            continue;

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/servicePackage/ServicePackageEndpoint.java

@@ -109,7 +109,7 @@ public class ServicePackageEndpoint extends EnvelopRestEndpoint {
    public ObjEnvelop<ServicePackageDO> findById (
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = true) String id) throws Exception {
        ServicePackageDO servicePackageDO = servicePackageDao.getOne(id);
        ServicePackageDO servicePackageDO = servicePackageDao.findById(id).orElse(null);
        List<ServicePackageItemDO> itemDOList = servicePackageItemDao.findByServicePackageId(servicePackageDO.getId());
        List<String> orgNames = itemDOList.stream().map(p -> p.getOrgName()).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
//        List<String> teamNames = itemDOList.stream().map(p -> p.getTeamName()).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/voluntary/VoluntaryRecruitmentArrangeEndpoint.java

@@ -104,7 +104,7 @@ public class VoluntaryRecruitmentArrangeEndpoint extends EnvelopRestEndpoint {
            int j = 1;
            int ii=1;
            for (VoluntaryRecruitmentArrangeDO tmp : list) {
                VoluntaryRecruitmentPeopleDO peopleDO= peopleDao.getOne(tmp.getPeopleId());
                VoluntaryRecruitmentPeopleDO peopleDO= peopleDao.findById(tmp.getPeopleId()).orElse(null);;
                if (null == peopleDO){
                    continue;
                }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/voluntary/VoluntaryRecruitmentEndpoint.java

@@ -215,7 +215,7 @@ public class VoluntaryRecruitmentEndpoint extends EnvelopRestEndpoint {
        List<VoluntaryRecruitmentPeopleDO> List = peopleService.getRepository().queryByIdIn(idsTmp);
        peopleService.delete(ids.split(","));
        for (VoluntaryRecruitmentPeopleDO tmp:List){
            VoluntaryRecruitmentCompanyDO companyDO = companyDao.getOne(tmp.getCompanyId());
            VoluntaryRecruitmentCompanyDO companyDO = companyDao.findById(tmp.getCompanyId()).orElse(null);;
            if (null !=companyDO ){
                Integer count = peopleService.getRepository().findByCompanyId(tmp.getCompanyId());
                companyDO.setNum(count);

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/voluntary/VoluntaryRecruitmentPeopleEndpoint.java

@@ -43,7 +43,7 @@ public class VoluntaryRecruitmentPeopleEndpoint extends EnvelopRestEndpoint {
        List<VoluntaryRecruitmentPeopleDO> List = peopleService.getRepository().queryByIdIn(idsTmp);
        peopleService.delete(ids.split(","));
        for (VoluntaryRecruitmentPeopleDO tmp:List){
            VoluntaryRecruitmentCompanyDO companyDO = companyDao.getOne(tmp.getCompanyId());
            VoluntaryRecruitmentCompanyDO companyDO = companyDao.findById(tmp.getCompanyId()).orElse(null);;
            if (null !=companyDO ){
                Integer count = peopleService.getRepository().findByCompanyId(tmp.getCompanyId());
                companyDO.setNum(count);
@@ -63,7 +63,7 @@ public class VoluntaryRecruitmentPeopleEndpoint extends EnvelopRestEndpoint {
            return failed("ID不能为空", ObjEnvelop.class);
        }
        appVersion = peopleService.save(appVersion);
        VoluntaryRecruitmentCompanyDO companyDO = companyDao.getOne(appVersion.getCompanyId());
        VoluntaryRecruitmentCompanyDO companyDO = companyDao.findById(appVersion.getCompanyId()).orElse(null);;
        if (null !=companyDO ){
            Integer count = peopleService.getRepository().findByCompanyId(appVersion.getCompanyId());
            companyDO.setNum(count);

svr/svr-base/src/main/java/com/yihu/jw/base/service/ManageMessagePush/ManageSystemPushMessageService.java

@@ -95,7 +95,7 @@ public class ManageSystemPushMessageService {
        Date date =DateUtil.strToDate(pushDate);
        if (null!=addType&&addType==2) {
            BasePushRecordLogEntity one = basePushRecordLogDao.getOne(pushId);
            BasePushRecordLogEntity one = basePushRecordLogDao.findById(pushId).orElse(null);;
            if (one.getStatus()!=1) {
                basePushRecordLogDao.deleteById(pushId);
                basePushrecordLogInfoDao.deleteByPushId(pushId);

svr/svr-base/src/main/java/com/yihu/jw/base/service/article/KnowledgeArticleService.java

@@ -105,7 +105,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
		List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql,page,pageSize);
		for (Map<String,Object> map:list){
			if (!"0".equalsIgnoreCase(map.get("parentId").toString())){
				BaseMenuDictDO baseMenuDictDO = baseMenuDictDao.getOne(map.get("parentId").toString());
				BaseMenuDictDO baseMenuDictDO = baseMenuDictDao.findById(map.get("parentId").toString()).orElse(null);;
				if (baseMenuDictDO!=null){
					map.put("parentName",baseMenuDictDO.getName());
				}
@@ -156,7 +156,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
	 */
	public KnowledgeArticleDictDO saveArticle(String jsonData) throws  Exception {
		KnowledgeArticleDictDO knowledgeArticleDO = EntityUtils.jsonToEntity(jsonData, KnowledgeArticleDictDO.class);
		WlyyHospitalSysDictDO wlyyHospitalSysDictDO = hospitalSysDictDao.getOne("articleNeedCheck");
		WlyyHospitalSysDictDO wlyyHospitalSysDictDO = hospitalSysDictDao.findById("articleNeedCheck").orElse(null);;
		Boolean articleNeedCheck= true;
		if (wlyyHospitalSysDictDO!=null){
			if (!wlyyHospitalSysDictDO.getDictValue().equalsIgnoreCase("1")){
@@ -170,7 +170,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
			knowledgeArticleDO.setStatus(0);
			knowledgeArticleDO.setReleaseStatus(0);
			knowledgeArticleDO.setDel(1);
			UserDO userDO = userDao.getOne(knowledgeArticleDO.getCreateUser());
			UserDO userDO = userDao.findById(knowledgeArticleDO.getCreateUser()).orElse(null);;
			if (userDO!=null){
				knowledgeArticleDO.setCreateUserName(userDO.getName());
			}
@@ -181,7 +181,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
			knowledgeArticleDO = knowledgeArticleDictDao.save(knowledgeArticleDO);
			return knowledgeArticleDO;
		} else {
			KnowledgeArticleDictDO one = knowledgeArticleDictDao.getOne(knowledgeArticleDO.getId());
			KnowledgeArticleDictDO one = knowledgeArticleDictDao.findById(knowledgeArticleDO.getId()).orElse(null);;
			one.setTitle(knowledgeArticleDO.getTitle());
			one.setContent(knowledgeArticleDO.getContent());
			one.setImage(knowledgeArticleDO.getImage());
@@ -205,7 +205,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
	//审核/退回文章
	public KnowledgeArticleDictDO reviewArticle(String articleId,Integer status,String reason) throws Exception{
		KnowledgeArticleDictDO knowledgeArticleDO = knowledgeArticleDictDao.getOne(articleId);
		KnowledgeArticleDictDO knowledgeArticleDO = knowledgeArticleDictDao.findById(articleId).orElse(null);;
		if (null == knowledgeArticleDO) {
			throw new Exception("该文章不存在");
		} else {
@@ -344,7 +344,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
				}else {
					WlyySurveyUserDO wlyySurveyUserDO = new WlyySurveyUserDO();
					String doctor = patientBusinessDO.getDoctor();
					BaseDoctorDO doctorDO = doctorDao.getOne(doctor);
					BaseDoctorDO doctorDO = doctorDao.findById(doctor).orElse(null);;
					wlyySurveyUserDO.setDept(doctorDO.getVisitDept());
					wlyySurveyUserDO.setDeptName(doctorDO.getVisitDeptName());
					wlyySurveyUserDO.setDoctor(doctor);
@@ -358,7 +358,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
					wlyySurveyUserDO.setEndTime(new Date());
					wlyySurveyUserDO = surveyUserDao.save(wlyySurveyUserDO);
					JSONObject object = new JSONObject();
					WlyySurveyTemplateDO wlyySurveyTemplateDO = surveyTemplateDao.getOne(wlyySurveyUserDO.getSurveyTempCode());
					WlyySurveyTemplateDO wlyySurveyTemplateDO = surveyTemplateDao.findById(wlyySurveyUserDO.getSurveyTempCode()).orElse(null);;
					if (null!=wlyySurveyTemplateDO){
						object.put("title",wlyySurveyTemplateDO.getTitle());
						object.put("content",wlyySurveyTemplateDO.getTemplateComment());
@@ -380,7 +380,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
	 */
	public KnowledgeArticleDictDO setUsed(String id,Integer used,String doctor){
		KnowledgeArticleDictDO knowledgeArticleDO = knowledgeArticleDictDao.findByIdAndDel(id);
		BaseDoctorDO doctorDO = doctorDao.getOne(doctor);
		BaseDoctorDO doctorDO = doctorDao.findById(doctor).orElse(null);;
		KnowledgeArticleUserDO knowledgeArticleUserDO =knowledgeArticleUserDao.findByrelationCodeAndUserAndDel(id,doctor);
		if (knowledgeArticleUserDO==null){
			knowledgeArticleUserDO = new KnowledgeArticleUserDO();

svr/svr-base/src/main/java/com/yihu/jw/base/service/article/KnowledgeCategoryService.java

@@ -43,7 +43,7 @@ public class KnowledgeCategoryService extends BaseJpaService<KnowledgeCategoryDO
			knowledgeCategoryDO.setCreateTime(new Date());
			knowledgeCategoryDO.setDel(1);
		} else {
			KnowledgeCategoryDO one = knowledgeCategoryDao.getOne(knowledgeCategoryDO.getId());
			KnowledgeCategoryDO one = knowledgeCategoryDao.findById(knowledgeCategoryDO.getId()).orElse(null);;
			knowledgeCategoryDO.setId(one.getId());
			knowledgeCategoryDO.setDel(one.getDel());
			knowledgeCategoryDO.setUpdateTime(new Date());

svr/svr-base/src/main/java/com/yihu/jw/base/service/clientSearch/ClientSearchService.java

@@ -39,7 +39,7 @@ public class ClientSearchService extends BaseJpaService<BaseSearchNoveltyRepeatD
    public void deleteByid(String id) {
        if (baseSearchNoveltyRepeatDao.getOne(id)!=null) {
        if (baseSearchNoveltyRepeatDao.findById(id).orElse(null)!=null) {
            baseSearchNoveltyRepeatDao.deleteById(id);
        }
@@ -54,7 +54,7 @@ public class ClientSearchService extends BaseJpaService<BaseSearchNoveltyRepeatD
    public void updateById(String id, Integer status) {
        BaseSearchNoveltyRepeatDO baseSearchNoveltyRepeatDO = baseSearchNoveltyRepeatDao.getOne(id);
        BaseSearchNoveltyRepeatDO baseSearchNoveltyRepeatDO = baseSearchNoveltyRepeatDao.findById(id).orElse(null);
        if (baseSearchNoveltyRepeatDO != null){
@@ -81,7 +81,7 @@ public class ClientSearchService extends BaseJpaService<BaseSearchNoveltyRepeatD
    }
    public void updateReply(String id, String reply,String updataUser) {
        BaseSearchNoveltyRepeatDO baseSearchNoveltyRepeatDO = baseSearchNoveltyRepeatDao.getOne(id);
        BaseSearchNoveltyRepeatDO baseSearchNoveltyRepeatDO = baseSearchNoveltyRepeatDao.findById(id).orElse(null);
        if (baseSearchNoveltyRepeatDO != null){
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd HH:mm:ss");
            Date date = new Date();
@@ -95,12 +95,12 @@ public class ClientSearchService extends BaseJpaService<BaseSearchNoveltyRepeatD
    public BaseSearchNoveltyRepeatDO findFileById(String id){
        BaseSearchNoveltyRepeatDO baseSearchNoveltyRepeatDO = new BaseSearchNoveltyRepeatDO();
        baseSearchNoveltyRepeatDO = baseSearchNoveltyRepeatDao.getOne(id);
        baseSearchNoveltyRepeatDO = baseSearchNoveltyRepeatDao.findById(id).orElse(null);
        return baseSearchNoveltyRepeatDO;
    }
    public void updataShowType(String id,String showType) {
        BaseSearchNoveltyRepeatDO baseSearchNoveltyRepeatDO = baseSearchNoveltyRepeatDao.getOne(id);
        BaseSearchNoveltyRepeatDO baseSearchNoveltyRepeatDO = baseSearchNoveltyRepeatDao.findById(id).orElse(null);
        if (baseSearchNoveltyRepeatDO != null){
            baseSearchNoveltyRepeatDO.setShowType(showType);
            baseSearchNoveltyRepeatDao.save(baseSearchNoveltyRepeatDO);

svr/svr-base/src/main/java/com/yihu/jw/base/service/course/CourseSalesOrderRecordService.java

@@ -30,7 +30,7 @@ public class CourseSalesOrderRecordService extends BaseJpaService<CourseSalesOrd
     */
    @Transactional(rollbackFor = Exception.class)
    public synchronized void refund(String id){
        CourseSalesOrderRecordDO courseSalesOrderRecordDO = courseSalesOrderRecordDao.getOne(id);
        CourseSalesOrderRecordDO courseSalesOrderRecordDO = courseSalesOrderRecordDao.findById(id).orElse(null);
        PatientOrderRefundDO refundDO = patientOrderRefundDao.findByTypeAndOrderId("2",id);
        boolean flag = "3".equals(courseSalesOrderRecordDO.getStatus())&&
                (refundDO == null ||"1".equals(refundDO.getStatus()));

svr/svr-base/src/main/java/com/yihu/jw/base/service/course/CourseService.java

@@ -31,7 +31,7 @@ public class CourseService extends BaseJpaService<CourseDO, CourseDao> {
    public void deletes(String ids){
        List<CourseDO> courseDOList = new ArrayList<>();
        for(String id:ids.split(",")){
            CourseDO courseDO = courseDao.getOne(id);
            CourseDO courseDO = courseDao.findById(id).orElse(null);
            courseDO.setDel(0);
            courseDOList.add(courseDO);
        }

svr/svr-base/src/main/java/com/yihu/jw/base/service/course/PatientOrderRefundService.java

@@ -34,16 +34,16 @@ public class PatientOrderRefundService extends BaseJpaService<PatientOrderRefund
     */
    @Transactional(rollbackFor = Exception.class)
    public synchronized void refund(String id){
        PatientOrderRefundDO refundDO = patientOrderRefundDao.getOne(id);
        PatientOrderRefundDO refundDO = patientOrderRefundDao.findById(id).orElse(null);
        CourseSalesOrderRecordDO courseSalesOrderRecordDO = null;
        RecruitStudentsRecordDO recruitStudentsRecordDO = null;
        String orderType = refundDO.getType();
        String orderStatus = "";
        if("2".equals(orderType)){
            courseSalesOrderRecordDO = courseSalesOrderRecordDao.getOne(refundDO.getOrderId());
            courseSalesOrderRecordDO = courseSalesOrderRecordDao.findById(refundDO.getOrderId()).orElse(null);;
            orderStatus = courseSalesOrderRecordDO.getStatus();
        }else if("1".equals(orderType)){
            recruitStudentsRecordDO = recruitStudentsRecordDao.getOne(refundDO.getOrderId());
            recruitStudentsRecordDO = recruitStudentsRecordDao.findById(refundDO.getOrderId()).orElse(null);;
            orderStatus = recruitStudentsRecordDO.getStatus();
        }

svr/svr-base/src/main/java/com/yihu/jw/base/service/course/RecruitStudentsRecordService.java

@@ -44,7 +44,7 @@ public class RecruitStudentsRecordService extends BaseJpaService<RecruitStudents
     */
    @Transactional(rollbackFor = Exception.class)
    public synchronized void refund(String id){
        RecruitStudentsRecordDO recruitStudentsRecordDO = recruitStudentsRecordDao.getOne(id);
        RecruitStudentsRecordDO recruitStudentsRecordDO = recruitStudentsRecordDao.findById(id).orElse(null);
        PatientOrderRefundDO refundDO = patientOrderRefundDao.findByTypeAndOrderId("2",id);
        boolean flag = "3".equals(recruitStudentsRecordDO.getStatus())&&
                (refundDO == null ||"1".equals(refundDO.getStatus()));
@@ -80,7 +80,7 @@ public class RecruitStudentsRecordService extends BaseJpaService<RecruitStudents
        List<RecruitStudentsRecordDO> list = new ArrayList<>();
        String re = "";
        for(String id : idStr){
            RecruitStudentsRecordDO recruitStudentsRecordDO = recruitStudentsRecordDao.getOne(id);
            RecruitStudentsRecordDO recruitStudentsRecordDO = recruitStudentsRecordDao.findById(id).orElse(null);
            if("1".equals(recruitStudentsRecordDO.getStatus())){
                recruitStudentsRecordDO.setStatus("2");
                list.add(recruitStudentsRecordDO);
@@ -107,7 +107,7 @@ public class RecruitStudentsRecordService extends BaseJpaService<RecruitStudents
        String idStr[] = ids.split(",");
        List<RecruitStudentsRecordDO> list = new ArrayList<>();
        for(String id : idStr){
            RecruitStudentsRecordDO recruitStudentsRecordDO = recruitStudentsRecordDao.getOne(id);
            RecruitStudentsRecordDO recruitStudentsRecordDO = recruitStudentsRecordDao.findById(id).orElse(null);
            if("1".equals(recruitStudentsRecordDO.getStatus())){
                recruitStudentsRecordDO.setStatus("4");
                list.add(recruitStudentsRecordDO);
@@ -124,7 +124,7 @@ public class RecruitStudentsRecordService extends BaseJpaService<RecruitStudents
     */
    public synchronized boolean isAdmissionFull(String id){
        List<RecruitStudentsRecordDO> list = findListById(id);
        RecruitStudentsDO recruitStudentsDO = recruitStudentsDao.getOne(id);
        RecruitStudentsDO recruitStudentsDO = recruitStudentsDao.findById(id).orElse(null);
        if(recruitStudentsDO.getNum()<=list.size()){
            return true;
        }
@@ -143,7 +143,7 @@ public class RecruitStudentsRecordService extends BaseJpaService<RecruitStudents
     * @return
     */
    public synchronized String admission(String id){
        RecruitStudentsRecordDO recruitStudentsRecordDO = recruitStudentsRecordDao.getOne(id);
        RecruitStudentsRecordDO recruitStudentsRecordDO = recruitStudentsRecordDao.findById(id).orElse(null);
        if(!"1".equals(recruitStudentsRecordDO.getStatus())){
            return "只有待审核状态的人员才能录取";
        }
@@ -160,7 +160,7 @@ public class RecruitStudentsRecordService extends BaseJpaService<RecruitStudents
     * @param id
     */
    public synchronized String refuse(String id){
        RecruitStudentsRecordDO recruitStudentsRecordDO = recruitStudentsRecordDao.getOne(id);
        RecruitStudentsRecordDO recruitStudentsRecordDO = recruitStudentsRecordDao.findById(id).orElse(null);
        if(!"1".equals(recruitStudentsRecordDO.getStatus())){
            return "只有待审核状态的人员才能拒绝";
        }

svr/svr-base/src/main/java/com/yihu/jw/base/service/course/RecruitStudentsService.java

@@ -29,7 +29,7 @@ public class RecruitStudentsService extends BaseJpaService<RecruitStudentsDO, Re
    public void deletes(String ids){
        List<RecruitStudentsDO> recruitStudentsDOList = new ArrayList<>();
        for(String id:ids.split(",")){
            RecruitStudentsDO recruitStudentsDO = recruitStudentsDao.getOne(id);
            RecruitStudentsDO recruitStudentsDO = recruitStudentsDao.findById(id).orElse(null);
            recruitStudentsDO.setDel(0);
            recruitStudentsDOList.add(recruitStudentsDO);
        }

svr/svr-base/src/main/java/com/yihu/jw/base/service/device/WlyyPatientDeviceService.java

@@ -23,7 +23,7 @@ public class WlyyPatientDeviceService extends BaseJpaService<DevicePatientDevice
    PatientDeviceDao patientDeviceDao;
    public void delPatientDevice(String id){
        DevicePatientDevice patientDevice = patientDeviceDao.getOne(Long.parseLong(id));
        DevicePatientDevice patientDevice = patientDeviceDao.findById(Long.parseLong(id)).orElse(null);
        String deviceSn = patientDevice.getDeviceSn();
        patientDeviceDao.deleteById(Long.parseLong(id));
        List<DevicePatientDevice> patientDeviceList = patientDeviceDao.findByDeviceSn(deviceSn);

svr/svr-base/src/main/java/com/yihu/jw/base/service/dict/BaseDrugDictService.java

@@ -44,7 +44,7 @@ public class BaseDrugDictService extends BaseJpaService<BaseDrugDictDO, BaseDrug
                }
            }
            System.out.println("===="+nationalDrugDictDO.getId());
            BaseDrugDictDO oldDurgDictDO =  baseDrugDictDao.getOne(nationalDrugDictDO.getId());
            BaseDrugDictDO oldDurgDictDO =  baseDrugDictDao.findById(nationalDrugDictDO.getId()).orElse(null);
            BeanUtils.copyProperties(nationalDrugDictDO, oldDurgDictDO, getNullPropertyNames(nationalDrugDictDO));
            oldDurgDictDO.setUpdate_time(new Date());
            return baseDrugDictDao.save(oldDurgDictDO);
@@ -118,7 +118,7 @@ public class BaseDrugDictService extends BaseJpaService<BaseDrugDictDO, BaseDrug
        return mixEnvelop;
    }
    public BaseDrugDictDO findOneDrug(String id){
        return baseDrugDictDao.getOne(id);
        return baseDrugDictDao.findById(id).orElse(null);
    }
    public Map<String, Object> batchInsertDrugs(List<BasDrugExcelDO> drugs,String templateId) throws ManageException {
@@ -173,7 +173,7 @@ public class BaseDrugDictService extends BaseJpaService<BaseDrugDictDO, BaseDrug
        return result;
    }
    public void updateDrugStatus(String id,String status,String del) throws  Exception{
        BaseDrugDictDO baseDrugDictDO = baseDrugDictDao.getOne(id);
        BaseDrugDictDO baseDrugDictDO = baseDrugDictDao.findById(id).orElse(null);
        if (baseDrugDictDO!=null){
            if (StringUtils.isNoneBlank(status)){
                baseDrugDictDO.setStatus(status);

svr/svr-base/src/main/java/com/yihu/jw/base/service/dict/BaseDrugUseService.java

@@ -36,7 +36,7 @@ public class BaseDrugUseService extends BaseJpaService<BaseDrugUseDictDO, BaseDr
            if (baseDrugUseDictDO1!=null){
                throw  new Exception("该使用方式code已存在");
            }
            BaseDrugUseDictDO oldDurgDictDO= baseDrugUseDictDao.getOne(baseDrugUseDictDO.getId());
            BaseDrugUseDictDO oldDurgDictDO= baseDrugUseDictDao.findById(baseDrugUseDictDO.getId()).orElse(null);
            BeanUtils.copyProperties(baseDrugUseDictDO, oldDurgDictDO, getNullPropertyNames(baseDrugUseDictDO));
            baseDrugUseDictDao.save(oldDurgDictDO);
        }else {
@@ -97,7 +97,7 @@ public class BaseDrugUseService extends BaseJpaService<BaseDrugUseDictDO, BaseDr
        return mixEnvelop;
    }
    public BaseDrugUseDictDO findOneUseDict(String dictId){
        return baseDrugUseDictDao.getOne(dictId);
        return baseDrugUseDictDao.findById(dictId).orElse(null);
    }
@@ -137,7 +137,7 @@ public class BaseDrugUseService extends BaseJpaService<BaseDrugUseDictDO, BaseDr
        return result;
    }
    public void updateDrugUseStatus(String id,String status,String del) throws  Exception{
        BaseDrugUseDictDO baseDrugUseDictDO = baseDrugUseDictDao.getOne(id);
        BaseDrugUseDictDO baseDrugUseDictDO = baseDrugUseDictDao.findById(id).orElse(null);
        if (baseDrugUseDictDO!=null){
            if (StringUtils.isNoneBlank(status)){
                baseDrugUseDictDO.setStatus(status);

svr/svr-base/src/main/java/com/yihu/jw/base/service/dict/BaseFrequencyService.java

@@ -36,7 +36,7 @@ public class BaseFrequencyService extends BaseJpaService<BaseFrequencyDictDO, Ba
            if (baseFrequencyDictDO1!=null){
                throw  new Exception("该频次code已存在");
            }
            BaseFrequencyDictDO oldFrequency= baseFrequencyDictDao.getOne(baseFrequencyDictDO.getId());
            BaseFrequencyDictDO oldFrequency= baseFrequencyDictDao.findById(baseFrequencyDictDO.getId()).orElse(null);
            BeanUtils.copyProperties(baseFrequencyDictDO, oldFrequency, getNullPropertyNames(baseFrequencyDictDO));
            baseFrequencyDictDao.save(oldFrequency);
        }else {
@@ -94,7 +94,7 @@ public class BaseFrequencyService extends BaseJpaService<BaseFrequencyDictDO, Ba
        return mixEnvelop;
    }
    public BaseFrequencyDictDO findOneFrequency(String id){
        return baseFrequencyDictDao.getOne(id);
        return baseFrequencyDictDao.findById(id).orElse(null);
    }
    public Map<String, Object> batchInsertDrugs(List<BasFrequencyExcelDO> drugs, String templateId) throws ManageException {
        Map<String, Object> result = new HashMap<>();
@@ -129,7 +129,7 @@ public class BaseFrequencyService extends BaseJpaService<BaseFrequencyDictDO, Ba
        return result;
    }
    public void updateFrequencyStatus(String id,String status,String del) throws  Exception{
        BaseFrequencyDictDO baseFrequencyDictDO = baseFrequencyDictDao.getOne(id);
        BaseFrequencyDictDO baseFrequencyDictDO = baseFrequencyDictDao.findById(id).orElse(null);
        if (baseFrequencyDictDO!=null){
            if (StringUtils.isNotBlank(status)){
                baseFrequencyDictDO.setStatus(status);

svr/svr-base/src/main/java/com/yihu/jw/base/service/dict/BusinessSysDictService.java

@@ -45,7 +45,7 @@ public class BusinessSysDictService extends BaseJpaService<BusinessSysDictDO, Bu
        }
        businessSysDictDO.setModelName(modelName);
        if(StringUtils.isNoneBlank(businessSysDictDO.getId())){
            BusinessSysDictDO businessSysDictDO1 = businessSysDictDao.getOne(businessSysDictDO.getId());
            BusinessSysDictDO businessSysDictDO1 = businessSysDictDao.findById(businessSysDictDO.getId()).orElse(null);
            if (businessSysDictDO1!=null){
                businessSysDictDO1.setDictValue(businessSysDictDO.getDictValue());
                businessSysDictDO1.setDictCode(businessSysDictDO.getDictCode());
@@ -82,7 +82,7 @@ public class BusinessSysDictService extends BaseJpaService<BusinessSysDictDO, Bu
    public String  deleteDictById(String id){
        String msg = "";
        if (StringUtils.isNoneBlank(id)){
            BusinessSysDictDO businessSysDictDO = businessSysDictDao.getOne(id);
            BusinessSysDictDO businessSysDictDO = businessSysDictDao.findById(id).orElse(null);
            if (businessSysDictDO!=null) {
                businessSysDictDao.deleteById(id);
                msg = "删除成功";

svr/svr-base/src/main/java/com/yihu/jw/base/service/dict/DictHospitalDeptService.java

@@ -123,9 +123,9 @@ public class DictHospitalDeptService extends BaseJpaService<DictHospitalDeptDO,
     */
    public Map findDept(Integer id,Integer page,Integer pageSize){
        Map<String ,Object> returnMap = new HashMap<>();
        DictHospitalDeptDO dictHospitalDeptDO = dictHospitalDeptDao.getOne(id);
        DictHospitalDeptDO dictHospitalDeptDO = dictHospitalDeptDao.findById(id).orElse(null);
        if (StringUtils.isNoneBlank(dictHospitalDeptDO.getFatherDeptCode())){
            DictHospitalDeptDO fatherDeptDO =  dictHospitalDeptDao.getOne(Integer.parseInt(dictHospitalDeptDO.getFatherDeptCode()));
            DictHospitalDeptDO fatherDeptDO =  dictHospitalDeptDao.findById(Integer.parseInt(dictHospitalDeptDO.getFatherDeptCode())).orElse(null);;
            if(fatherDeptDO!=null){
                dictHospitalDeptDO.setFatherDeptName(fatherDeptDO.getName());
            }
@@ -171,7 +171,7 @@ public class DictHospitalDeptService extends BaseJpaService<DictHospitalDeptDO,
        if (dictHospitalDeptDO.getId()!=null){
            dictHospitalDeptDO.setDeptTypeCode("6");
            if (StringUtils.isNoneBlank(dictHospitalDeptDO.getFatherDeptCode())){
                DictHospitalDeptDO father  =dictHospitalDeptDao.getOne(Integer.parseInt(dictHospitalDeptDO.getFatherDeptCode()));
                DictHospitalDeptDO father  =dictHospitalDeptDao.findById(Integer.parseInt(dictHospitalDeptDO.getFatherDeptCode())).orElse(null);;
                if (father!=null){
                    dictHospitalDeptDO.setFatherDeptName(father.getName());
                }
@@ -260,7 +260,7 @@ public class DictHospitalDeptService extends BaseJpaService<DictHospitalDeptDO,
            }
        }else {
            if (StringUtils.isNoneBlank(dictHospitalDeptDO.getFatherDeptCode())){
                DictHospitalDeptDO father  = dictHospitalDeptDao.getOne(Integer.parseInt(dictHospitalDeptDO.getFatherDeptCode()));
                DictHospitalDeptDO father  = dictHospitalDeptDao.findById(Integer.parseInt(dictHospitalDeptDO.getFatherDeptCode())).orElse(null);;
                if (father!=null){
                    dictHospitalDeptDO.setFatherDeptName(father.getName());
                }
@@ -454,7 +454,7 @@ public class DictHospitalDeptService extends BaseJpaService<DictHospitalDeptDO,
       return mixEnvelop;
   }
    public DictHospitalDeptDO unUsed(Integer id,String consultFlag){
        DictHospitalDeptDO dictHospitalDeptDO= dictHospitalDeptDao.getOne(id);
        DictHospitalDeptDO dictHospitalDeptDO= dictHospitalDeptDao.findById(id).orElse(null);
        if (dictHospitalDeptDO!=null){
            dictHospitalDeptDO.setConsultDeptFlag(consultFlag);
            dictHospitalDeptDao.save(dictHospitalDeptDO);

svr/svr-base/src/main/java/com/yihu/jw/base/service/dict/DictIcd10Service.java

@@ -120,7 +120,7 @@ public class DictIcd10Service extends BaseJpaService<DictIcd10DO, DictIcd10Dao>
                    throw  new Exception("该诊断已被使用");
                }
            }
            DictIcd10DO icd10DO1= dictIcd10Dao.getOne(icd10DO.getId());
            DictIcd10DO icd10DO1= dictIcd10Dao.findById(icd10DO.getId()).orElse(null);;
            BeanUtils.copyProperties(icd10DO, icd10DO1, getNullPropertyNames(icd10DO));
            dictIcd10Dao.save(icd10DO1);
        }else {
@@ -133,7 +133,7 @@ public class DictIcd10Service extends BaseJpaService<DictIcd10DO, DictIcd10Dao>
        }
    }
    public DictIcd10DO findOneIcd10(Integer id){
        return dictIcd10Dao.getOne(id);
        return dictIcd10Dao.findById(id).orElse(null);
    }
@@ -171,7 +171,7 @@ public class DictIcd10Service extends BaseJpaService<DictIcd10DO, DictIcd10Dao>
        return result;
    }
    public void updateIcd10Status(Integer id,String status,String del) throws Exception{
        DictIcd10DO dictIcd10DO = dictIcd10Dao.getOne(id);
        DictIcd10DO dictIcd10DO = dictIcd10Dao.findById(id).orElse(null);
        if (dictIcd10DO!=null){
            if (StringUtils.isNoneBlank(status)){
                dictIcd10DO.setStatus(status);

svr/svr-base/src/main/java/com/yihu/jw/base/service/dict/DiseaseManageService.java

@@ -44,7 +44,7 @@ public class DiseaseManageService extends BaseJpaService<DiseaseManageDO, Diseas
    public DiseaseManageDO saveDisease(String jsonData) throws Exception {
        DiseaseManageDO diseaseManageDO = objectMapper.readValue(jsonData,DiseaseManageDO.class);
        if (StringUtils.isNoneBlank(diseaseManageDO.getId())){
            DiseaseManageDO dictDiseasepre = diseaseManageDao.getOne(diseaseManageDO.getId());
            DiseaseManageDO dictDiseasepre = diseaseManageDao.findById(diseaseManageDO.getId()).orElse(null);
            dictDiseasepre.setCode(diseaseManageDO.getCode());
            dictDiseasepre.setExplain(diseaseManageDO.getExplain());
            dictDiseasepre.setName(diseaseManageDO.getName());
@@ -79,7 +79,7 @@ public class DiseaseManageService extends BaseJpaService<DiseaseManageDO, Diseas
        return diseaseManageDO;
    }
    public Map deleteById(String id,String isDel,String status){
        DiseaseManageDO diseaseManageDO =  diseaseManageDao.getOne(id);
        DiseaseManageDO diseaseManageDO =  diseaseManageDao.findById(id).orElse(null);
        Map result = new HashMap();
        if (diseaseManageDO!=null){
            if (StringUtils.isNoneBlank(isDel)){
@@ -137,7 +137,7 @@ public class DiseaseManageService extends BaseJpaService<DiseaseManageDO, Diseas
        return mixEnvelop;
    }
    public DiseaseManageDO findOneById(String id){
        DiseaseManageDO diseaseManageDO = diseaseManageDao.getOne(id);
        DiseaseManageDO diseaseManageDO = diseaseManageDao.findById(id).orElse(null);
        if (diseaseManageDO!=null){
            if (StringUtils.isNotBlank(diseaseManageDO.getStatus())){
                List<WlyyHospitalSysDictDO> dictNameAndDictCode = wlyyHospitalSysDictDao.findByDictNameAndDictCode("drugStoreStatus",diseaseManageDO.getStatus());

svr/svr-base/src/main/java/com/yihu/jw/base/service/dict/TemplateManageService.java

@@ -1,6 +1,5 @@
package com.yihu.jw.base.service.dict;
import com.yihu.jw.base.dao.saas.SaasDao;
import com.yihu.jw.dict.dao.*;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.entity.base.dict.*;
@@ -10,11 +9,8 @@ import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.org.dao.BaseOrgDao;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.utils.StringUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.xerces.dom.PSVIAttrNSImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Service;
@@ -131,7 +127,7 @@ public class TemplateManageService {
                }
            }
            baseTemplateDictDao.save(baseTemplateDictDO);
            BaseTemplateDO baseTemplateDO = baseTemplateDao.getOne(templateId);
            BaseTemplateDO baseTemplateDO = baseTemplateDao.findById(templateId).orElse(null);;
            Integer chuildrenCount =  baseTemplateDictDao.getCountByTemplateId(templateId);
            if (baseTemplateDO !=null ){
                baseTemplateDO.setChildrenCount(chuildrenCount.toString());
@@ -141,7 +137,7 @@ public class TemplateManageService {
   }
   public void saveOrUpdateTemplate(String templateId,String code,String name,String user,String userName,String templateType,String diseaseId,String diseaseName){
       BaseTemplateDO baseTemplateDO = baseTemplateDao.getOne(templateId);
       BaseTemplateDO baseTemplateDO = baseTemplateDao.findById(templateId).orElse(null);;
       String localCode="MD"+new Date().getTime();
       System.out.println("templatType"+templateType);
       if (baseTemplateDO!=null){
@@ -169,7 +165,7 @@ public class TemplateManageService {
   }
   public MixEnvelop findTemlateChildList(String templateId,String name,String code,Integer page,Integer pageSize){
        BaseTemplateDO baseTemplateDictDO = baseTemplateDao.getOne(templateId);
        BaseTemplateDO baseTemplateDictDO = baseTemplateDao.findById(templateId).orElse(null);;
        PageRequest pageRequest = PageRequest.of(page-1, pageSize);
        List<Map<String,Object>> returnList= new ArrayList<>();
        MixEnvelop mixEnvelop = new MixEnvelop();
@@ -327,7 +323,7 @@ public class TemplateManageService {
   }
   public  BaseTemplateDO findOneTemplateById(String id){
        return baseTemplateDao.getOne(id);
        return baseTemplateDao.findById(id).orElse(null);
   }
    public void saveUserTemplateRelation(String orgCode,String templateIds){
        String[] templateArray = templateIds.split(",");
@@ -340,7 +336,7 @@ public class TemplateManageService {
        baseTemplateOrgDao.deleteAll(list);
        for (int i=0;i<templateArray.length;i++){
            String templateId=templateArray[i];
            BaseTemplateDO baseTemplateDO = baseTemplateDao.getOne(templateId);
            BaseTemplateDO baseTemplateDO = baseTemplateDao.findById(templateId).orElse(null);;
            if (baseTemplateDO!=null){
                String templateType = baseTemplateDO.getTemplateType();
                if (!"followUpDict".equalsIgnoreCase(templateType)){
@@ -413,7 +409,7 @@ public class TemplateManageService {
    public MixEnvelop findTemlateAddChildList(String templateId,String name,String code,Integer page,Integer pageSize){
        BaseTemplateDO baseTemplateDictDO = baseTemplateDao.getOne(templateId);
        BaseTemplateDO baseTemplateDictDO = baseTemplateDao.findById(templateId).orElse(null);;
        MixEnvelop mixEnvelop = new MixEnvelop();
        mixEnvelop.setPageSize(pageSize);
        mixEnvelop.setCurrPage(page);
@@ -664,7 +660,7 @@ public class TemplateManageService {
    public MixEnvelop findTemlateNotAddChildList(String templateId,String name,String code,Integer page,Integer pageSize){
        BaseTemplateDO baseTemplateDictDO = baseTemplateDao.getOne(templateId);
        BaseTemplateDO baseTemplateDictDO = baseTemplateDao.findById(templateId).orElse(null);;
        MixEnvelop mixEnvelop = new MixEnvelop();
        mixEnvelop.setPageSize(pageSize);
        mixEnvelop.setCurrPage(page);

svr/svr-base/src/main/java/com/yihu/jw/base/service/doctor/BaseDoctorRoleDictService.java

@@ -124,7 +124,7 @@ public class BaseDoctorRoleDictService extends BaseJpaService<BaseDoctorRoleDict
            return result;
        }
        try {
            oldRoleInfo = baseDoctorRoleDictDao.getOne(roleInfoDO.getId());
            oldRoleInfo = baseDoctorRoleDictDao.findById(roleInfoDO.getId()).orElse(null);;
        } catch (Exception e) {
            result.put("msg", "not role exist for id:" + roleInfoDO.getId());
@@ -178,7 +178,7 @@ public class BaseDoctorRoleDictService extends BaseJpaService<BaseDoctorRoleDict
        }
        //角色基本信息
        BaseDoctorRoleDictDO roleInfoDO = baseDoctorRoleDictDao.getOne(roleId.toString());
        BaseDoctorRoleDictDO roleInfoDO = baseDoctorRoleDictDao.findById(roleId.toString()).orElse(null);;
        if(null == roleInfoDO){
            result.put("msg","Role not exist for id:" + roleId);
            result.put("response",ConstantUtils.FAIL);
@@ -208,7 +208,7 @@ public class BaseDoctorRoleDictService extends BaseJpaService<BaseDoctorRoleDict
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        BaseDoctorRoleDictDO roleInfoDO = baseDoctorRoleDictDao.getOne(roleId.toString());
        BaseDoctorRoleDictDO roleInfoDO = baseDoctorRoleDictDao.findById(roleId.toString()).orElse(null);;
        if( null == roleInfoDO ){
            result.put("msg","role not exist for id:" + roleId);
            result.put("response",ConstantUtils.FAIL);

svr/svr-base/src/main/java/com/yihu/jw/base/service/doctor/BaseDoctorRoleInfoService.java

@@ -205,7 +205,7 @@ public class BaseDoctorRoleInfoService extends BaseJpaService<BaseDoctorRoleInfo
            return result;
        }
        try {
            oldRoleInfo = baseDoctorRoleInfoDao.getOne(roleInfoDO.getId());
            oldRoleInfo = baseDoctorRoleInfoDao.findById(roleInfoDO.getId()).orElse(null);;
        } catch (Exception e) {
            result.put("msg", "not role exist for id:" + roleInfoDO.getId());
@@ -257,7 +257,7 @@ public class BaseDoctorRoleInfoService extends BaseJpaService<BaseDoctorRoleInfo
        }
        //角色基本信息
        BaseDoctorRoleInfoDO roleInfoDO = baseDoctorRoleInfoDao.getOne(roleId);
        BaseDoctorRoleInfoDO roleInfoDO = baseDoctorRoleInfoDao.findById(roleId).orElse(null);;
        if(null == roleInfoDO){
            result.put("msg","Role not exist for id:" + roleId);
            result.put("response",ConstantUtils.FAIL);
@@ -287,7 +287,7 @@ public class BaseDoctorRoleInfoService extends BaseJpaService<BaseDoctorRoleInfo
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        BaseDoctorRoleInfoDO roleInfoDO = baseDoctorRoleInfoDao.getOne(roleId);
        BaseDoctorRoleInfoDO roleInfoDO = baseDoctorRoleInfoDao.findById(roleId).orElse(null);;
        if( null == roleInfoDO ){
            result.put("msg","role not exist for id:" + roleId);
            result.put("response",ConstantUtils.FAIL);

svr/svr-base/src/main/java/com/yihu/jw/base/service/doctor/BaseDoctorService.java

@@ -161,7 +161,7 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
        }
        //医生基本信息
        BaseDoctorDO doctors = baseDoctorDao.getOne(doctorId);
        BaseDoctorDO doctors = baseDoctorDao.findById(doctorId).orElse(null);;
        if(null == doctors){
            result.put("msg","医生不存在:" + doctorId);
            result.put("response",ConstantUtils.FAIL);
@@ -184,7 +184,7 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
        if (baseTeamMemberDO!=null&&baseTeamMemberDO.size()>0){
            for (BaseTeamMemberDO baseTeamMemberDO1:baseTeamMemberDO){
                String teamCode = baseTeamMemberDO1.getTeamCode();
                BaseTeamDO baseTeamDO = baseTeamDao.getOne(teamCode);
                BaseTeamDO baseTeamDO = baseTeamDao.findById(teamCode).orElse(null);;
                teamlist.add(baseTeamDO);
            }
            jsonObject.put("teamInfo",teamlist);
@@ -670,7 +670,7 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
        try {
            baseDoctorDO = objectMapper.readValue(doctor.toJSONString(),BaseDoctorDO.class);
            BaseDoctorDO oldDoctor = baseDoctorDao.getOne(baseDoctorDO.getId());
            BaseDoctorDO oldDoctor = baseDoctorDao.findById(baseDoctorDO.getId()).orElse(null);;
            if (oldDoctor!=null&&!oldDoctor.getIdcard().equalsIgnoreCase(baseDoctorDO.getIdcard())){
              List<BaseDoctorDO> isExist =  baseDoctorDao.findByIdcard(baseDoctorDO.getIdcard());
              if (isExist!=null&&isExist.size()>0){
@@ -827,7 +827,7 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
            result.put("response",ConstantUtils.FAIL);
            return result.toJSONString();
        }
        BaseDoctorDO baseDoctorDO = baseDoctorDao.getOne(doctorCode);
        BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(doctorCode).orElse(null);;
        if( null == baseDoctorDO ){
            result.put("msg","doctor not exist for id:" + doctorCode);
            result.put("response",ConstantUtils.FAIL);
@@ -1112,7 +1112,7 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
        List<BaseDoctorIncentiveDO> list = baseDoctorIncentiveDao.findByDoctorCode(doctor);
        Map map = new HashMap();
        String name = "";
        BaseDoctorDO baseDoctorDO = baseDoctorDao.getOne(doctor);
        BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(doctor).orElse(null);;
        if (baseDoctorDO!=null){
            name = baseDoctorDO.getName();
            map.put("status",-1);
@@ -1179,7 +1179,7 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
        List<BaseDoctorIncentiveDO> saveList = new ArrayList<>();
        Map map = new HashMap();
        String name = "";
        BaseDoctorDO baseDoctorDO = baseDoctorDao.getOne(doctor);
        BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(doctor).orElse(null);;
        if (baseDoctorDO!=null){
            name = baseDoctorDO.getName();
            map.put("status",-1);
@@ -1307,7 +1307,7 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
    @Transactional
    public String  resetDoctorPwd(String doctor) throws Exception{
        BaseDoctorDO baseDoctorDO= baseDoctorDao.getOne(doctor);
        BaseDoctorDO baseDoctorDO= baseDoctorDao.findById(doctor).orElse(null);;
        if (baseDoctorDO!=null){
            String salt = baseDoctorDO.getSalt();
            if (StringUtils.isEmpty(salt)){

svr/svr-base/src/main/java/com/yihu/jw/base/service/errorCode/ErrorCodeService.java

@@ -60,7 +60,7 @@ public class ErrorCodeService extends BaseJpaService<ErrorCodeDO, ErrorCodeDao>
     * @param msg
     */
    public ErrorCodeDO updateMsg(String id,String msg){
        ErrorCodeDO errorCodeDO = errorCodeDao.getOne(id);
        ErrorCodeDO errorCodeDO = errorCodeDao.findById(id).orElse(null);
        errorCodeDO.setErrorMsg(msg);
        errorCodeDao.save(errorCodeDO);
        redisTemplate.opsForValue().set(BaseErrorCode.PREFIX + errorCodeDO.getErrorCode(),msg);

svr/svr-base/src/main/java/com/yihu/jw/base/service/gw/ZjxlGwService.java

@@ -26,11 +26,11 @@ public class ZjxlGwService {
    private BaseRulesDao baseRulesDao;
    public BaseRulesDO findRulesById(String id){
        return baseRulesDao.getOne(id);
        return baseRulesDao.findById(id).orElse(null);
    }
    public BaseHomePageDO findHomePageById(String id){
        return baseHomePageDao.getOne(id);
        return baseHomePageDao.findById(id).orElse(null);
    }
    public BaseWebInfoDO findWebInfo(){

svr/svr-base/src/main/java/com/yihu/jw/base/service/interfacemg/BaseUserInterfaceService.java

@@ -56,7 +56,7 @@ public class BaseUserInterfaceService extends BaseJpaService<BaseThirdUserInterf
     * @return
     */
    public BaseThirdUserDO findUserById(String id){
        return baseThirdUserDao.getOne(id);
        return baseThirdUserDao.findById(id).orElse(null);
    }
    /**
@@ -65,7 +65,7 @@ public class BaseUserInterfaceService extends BaseJpaService<BaseThirdUserInterf
     * @return
     */
    public BaseThirdUserInterfaceDO findUserInterfaceById(String id){
        return baseThirdUserInterfaceDao.getOne(id);
        return baseThirdUserInterfaceDao.findById(id).orElse(null);
    }
    /**
@@ -74,7 +74,7 @@ public class BaseUserInterfaceService extends BaseJpaService<BaseThirdUserInterf
     * @return
     */
    public BaseThirdUserInterfaceStandardDO findUserInterfaceStandardById(String id){
        return baseThirdUserInterfaceStandardDao.getOne(id);
        return baseThirdUserInterfaceStandardDao.findById(id).orElse(null);
    }
    /**
@@ -83,7 +83,7 @@ public class BaseUserInterfaceService extends BaseJpaService<BaseThirdUserInterf
     * @return
     */
    public BaseThirdUserInterfaceLogDO findUserInterfaceLogById(String id){
        return baseThirdUserInterfaceLogDao.getOne(id);
        return baseThirdUserInterfaceLogDao.findById(id).orElse(null);
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/menu/BaseMenuManageService.java

@@ -10,19 +10,12 @@ import com.yihu.jw.base.dao.menu.BaseMenuShowDao;
import com.yihu.jw.entity.base.menu.BaseLinkDictDO;
import com.yihu.jw.entity.base.menu.BaseMenuDictDO;
import com.yihu.jw.entity.base.menu.BaseMenuShowDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDictDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.utils.StringUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
@@ -52,7 +45,7 @@ public class BaseMenuManageService {
    private WlyyHospitalSysDictDao wlyyHospitalSysDictDao;
    //删除菜单字典
    public void deletMenuDict(String id) throws  Exception{
        BaseMenuDictDO baseMenuDictDO= baseMenuDictDao.getOne(id);
        BaseMenuDictDO baseMenuDictDO= baseMenuDictDao.findById(id).orElse(null);
        if (baseMenuDictDO!=null){
            if ("0".equalsIgnoreCase(baseMenuDictDO.getParentId())){
                 List<BaseMenuDictDO> childList = baseMenuDictDao.findByParentId(baseMenuDictDO.getId());
@@ -172,13 +165,13 @@ public class BaseMenuManageService {
    }
    //查询单挑菜单字典
    public BaseMenuDictDO findOneMenuDict(String id){
        BaseMenuDictDO baseMenuDictDO= baseMenuDictDao.getOne(id);
        BaseMenuDictDO baseMenuDictDO= baseMenuDictDao.findById(id).orElse(null);
        if (baseMenuDictDO!=null){
            WlyyHospitalSysDictDO effect = wlyyHospitalSysDictDao.findOneByDictNameAndDictCode("isEffect",baseMenuDictDO.getStatus().toString());
            baseMenuDictDO.setShowName(baseMenuDictDO.getStatus().equals("1")?"是":"否");
            baseMenuDictDO.setStatusName(effect.getDictValue());
            if (!"0".equalsIgnoreCase(baseMenuDictDO.getParentId())){
                BaseMenuDictDO parentDo= baseMenuDictDao.getOne(baseMenuDictDO.getParentId());
                BaseMenuDictDO parentDo= baseMenuDictDao.findById(baseMenuDictDO.getParentId()).orElse(null);;
                if (parentDo!=null){
                    baseMenuDictDO.setParentName(parentDo.getName());
                }
@@ -202,7 +195,7 @@ public class BaseMenuManageService {
     * @throws Exception
     */
    public BaseMenuDictDO downMenu(String id) throws Exception{
        BaseMenuDictDO baseMenuDictDO= baseMenuDictDao.getOne(id);
        BaseMenuDictDO baseMenuDictDO= baseMenuDictDao.findById(id).orElse(null);
        int maxSort = baseMenuDictDao.getMaxSort(baseMenuDictDO.getParentId());
        int sort = 0;
        if(null!=baseMenuDictDO){
@@ -218,7 +211,7 @@ public class BaseMenuManageService {
        BaseMenuDictDO upPrevious = new BaseMenuDictDO();
        if (list.size()>0){
            String prviousBannerId = list.get(0).get("id").toString();
            upPrevious =baseMenuDictDao.getOne(prviousBannerId);
            upPrevious =baseMenuDictDao.findById(prviousBannerId).orElse(null);;
        }
        //交换sort值
@@ -236,7 +229,7 @@ public class BaseMenuManageService {
     */
    public BaseMenuDictDO upMenu(String id) throws Exception{
        //当前
        BaseMenuDictDO baseMenuDictDO = baseMenuDictDao.getOne(id);
        BaseMenuDictDO baseMenuDictDO = baseMenuDictDao.findById(id).orElse(null);
        int minSort = baseMenuDictDao.getMinSort(baseMenuDictDO.getParentId());
        int sort = 0;
        if(null!=baseMenuDictDO){
@@ -251,7 +244,7 @@ public class BaseMenuManageService {
        BaseMenuDictDO downPrevious = new BaseMenuDictDO();
        if (list.size()>0){
            String prviousBannerId = list.get(0).get("id").toString();
            downPrevious =baseMenuDictDao.getOne(prviousBannerId);
            downPrevious =baseMenuDictDao.findById(prviousBannerId).orElse(null);;
        }
        //获取的下一条b
        //交换sort值
@@ -274,7 +267,7 @@ public class BaseMenuManageService {
    public BaseMenuDictDO createOrUpdateMenu(String json) throws  Exception{
        BaseMenuDictDO menuDO = objectMapper.readValue(json,BaseMenuDictDO.class);
        if (StringUtils.isNoneBlank(menuDO.getId())){
            BaseMenuDictDO menuOld = baseMenuDictDao.getOne(menuDO.getId());
            BaseMenuDictDO menuOld = baseMenuDictDao.findById(menuDO.getId()).orElse(null);;
            if (menuOld!=null){
                menuOld.setParentId(menuDO.getParentId());
                menuOld.setName(menuDO.getName());
@@ -309,7 +302,7 @@ public class BaseMenuManageService {
        BaseLinkDictDO linkDictDO = objectMapper.readValue(json,BaseLinkDictDO.class);
        Integer maxSort=baseLinkDictDao.getMaxSort();
        if (StringUtils.isNoneBlank(linkDictDO.getId())){
            BaseLinkDictDO baseLinkDictDO=baseLinkDictDao.getOne(linkDictDO.getId());
            BaseLinkDictDO baseLinkDictDO=baseLinkDictDao.findById(linkDictDO.getId()).orElse(null);;
            if (baseLinkDictDO!=null){
                baseLinkDictDO.setName(linkDictDO.getName());
                baseLinkDictDO.setLinkUrl(linkDictDO.getLinkUrl());
@@ -360,7 +353,7 @@ public class BaseMenuManageService {
    }
    public BaseLinkDictDO findOneLinkDict(String id){
        BaseLinkDictDO baseLinkDictDO= baseLinkDictDao.getOne(id);
        BaseLinkDictDO baseLinkDictDO= baseLinkDictDao.findById(id).orElse(null);
        if (baseLinkDictDO!=null){
            WlyyHospitalSysDictDO effect = wlyyHospitalSysDictDao.findOneByDictNameAndDictCode("isEffect",baseLinkDictDO.getStatus());
            baseLinkDictDO.setShowName(baseLinkDictDO.getStatus().equalsIgnoreCase("1")?"是":"否");
@@ -376,7 +369,7 @@ public class BaseMenuManageService {
     * @throws Exception
     */
    public BaseLinkDictDO downlink(String id) throws Exception{
        BaseLinkDictDO baseLinkDictDO= baseLinkDictDao.getOne(id);
        BaseLinkDictDO baseLinkDictDO= baseLinkDictDao.findById(id).orElse(null);
        int maxSort = baseLinkDictDao.getMaxSort();
        int sort = 0;
        if(null!=baseLinkDictDO){
@@ -391,7 +384,7 @@ public class BaseMenuManageService {
        BaseLinkDictDO upPrevious = new BaseLinkDictDO();
        if (list.size()>0){
            String prviousBannerId = list.get(0).get("id").toString();
            upPrevious =baseLinkDictDao.getOne(prviousBannerId);
            upPrevious =baseLinkDictDao.findById(prviousBannerId).orElse(null);;
        }
        //交换sort值
@@ -409,7 +402,7 @@ public class BaseMenuManageService {
     */
    public BaseLinkDictDO upLink(String id) throws Exception{
        //当前
        BaseLinkDictDO baseLinkDictDO = baseLinkDictDao.getOne(id);
        BaseLinkDictDO baseLinkDictDO = baseLinkDictDao.findById(id).orElse(null);
        int minSort = baseLinkDictDao.getMinSort();
        int sort = 0;
        if(null!=baseLinkDictDO){
@@ -423,7 +416,7 @@ public class BaseMenuManageService {
        BaseLinkDictDO downPrevious = new BaseLinkDictDO();
        if (list.size()>0){
            String prviousBannerId = list.get(0).get("id").toString();
            downPrevious =baseLinkDictDao.getOne(prviousBannerId);
            downPrevious =baseLinkDictDao.findById(prviousBannerId).orElse(null);;
        }
        //获取的下一条b
        //交换sort值
@@ -467,7 +460,7 @@ public class BaseMenuManageService {
     *
     */
    public BaseMenuShowDO removeMenu(String menuId){
        BaseMenuShowDO baseMenuShowDO = baseMenuShowDao.getOne(menuId);
        BaseMenuShowDO baseMenuShowDO = baseMenuShowDao.findById(menuId).orElse(null);;
        baseMenuShowDO.setIsDel("0");
        baseMenuShowDao.save(baseMenuShowDO);
        return baseMenuShowDO;
@@ -502,7 +495,7 @@ public class BaseMenuManageService {
        for (Map<String,Object> map:list){
            if (map.get("parentId")!=null){
                String parentId = map.get("parentId").toString();
                BaseMenuDictDO parentDo= baseMenuDictDao.getOne(parentId);
                BaseMenuDictDO parentDo= baseMenuDictDao.findById(parentId).orElse(null);
                if (parentDo!=null){
                    map.put("parentName",parentDo.getName());
                }
@@ -551,7 +544,7 @@ public class BaseMenuManageService {
     * @throws Exception
     */
    public BaseMenuShowDO downMenuShow(String id) throws Exception{
        BaseMenuShowDO baseMenuShowDO= baseMenuShowDao.getOne(id);
        BaseMenuShowDO baseMenuShowDO= baseMenuShowDao.findById(id).orElse(null);
        int maxSort = baseMenuShowDao.getMaxSort(baseMenuShowDO.getModelId());
        int sort = 0;
        if(null!=baseMenuShowDO){
@@ -567,7 +560,7 @@ public class BaseMenuManageService {
        BaseMenuShowDO upPrevious = new BaseMenuShowDO();
        if (list.size()>0){
            String prviousBannerId = list.get(0).get("id").toString();
            upPrevious =baseMenuShowDao.getOne(prviousBannerId);
            upPrevious =baseMenuShowDao.findById(prviousBannerId).orElse(null);;
        }
        //交换sort值
@@ -585,7 +578,7 @@ public class BaseMenuManageService {
     */
    public BaseMenuShowDO upMenuShow(String id) throws Exception{
        //当前
        BaseMenuShowDO baseMenuShowDO = baseMenuShowDao.getOne(id);
        BaseMenuShowDO baseMenuShowDO = baseMenuShowDao.findById(id).orElse(null);
        int minSort = baseMenuShowDao.getMinSort(baseMenuShowDO.getModelId());
        int sort = 0;
        if(null!=baseMenuShowDO){
@@ -600,7 +593,7 @@ public class BaseMenuManageService {
        BaseMenuShowDO downPrevious = new BaseMenuShowDO();
        if (list.size()>0){
            String prviousBannerId = list.get(0).get("id").toString();
            downPrevious =baseMenuShowDao.getOne(prviousBannerId);
            downPrevious =baseMenuShowDao.findById(prviousBannerId).orElse(null);;
        }
        //获取的下一条b
        //交换sort值

svr/svr-base/src/main/java/com/yihu/jw/base/service/module/InterfaceService.java

@@ -40,7 +40,7 @@ public class InterfaceService extends BaseJpaService<InterfaceDO, InterfaceDao>
     * @return
     */
    public InterfaceDO findById(String id){
        InterfaceDO interfaceDO = interfaceDao.getOne(id);
        InterfaceDO interfaceDO = interfaceDao.findById(id).orElse(null);
        List<InterfaceParamDO> paramDOList = interfaceParamDao.findByInterfaceId(id);
        List<InterfaceParamDO> entryParams = paramDOList.stream()
@@ -82,7 +82,7 @@ public class InterfaceService extends BaseJpaService<InterfaceDO, InterfaceDao>
            interfaceParamDao.deleteByInterfaceId(interfaceDO.getId());
            interfaceErrorCodeDao.deleteByInterfaceId(interfaceDO.getId());
            isNew = false;
            InterfaceDO oldInterfaceDO = interfaceDao.getOne(interfaceDO.getId());
            InterfaceDO oldInterfaceDO = interfaceDao.findById(interfaceDO.getId()).orElse(null);;
            //判断是否修改了状态
            if(!oldInterfaceDO.getStatus().equals(interfaceDO.getStatus())){

svr/svr-base/src/main/java/com/yihu/jw/base/service/module/ModuleService.java

@@ -45,7 +45,7 @@ public class ModuleService extends BaseJpaService<ModuleDO, ModuleDao> {
     */
    @Transactional(rollbackFor = Exception.class)
    public ModuleDO updateModule(ModuleDO moduleDO){
        ModuleDO oldModule = moduleDao.getOne(moduleDO.getId());
        ModuleDO oldModule = moduleDao.findById(moduleDO.getId()).orElse(null);
        if(StringUtils.isBlank(moduleDO.getParentId())){
            moduleDO.setParentId(CommonContant.DEFAULT_PARENTID);
        }
@@ -55,7 +55,7 @@ public class ModuleService extends BaseJpaService<ModuleDO, ModuleDao> {
        if(CommonContant.DEFAULT_PARENTID.equals(moduleDO.getParentId())){
            moduleDO.setLevel(0);
        }else {
            parentModule = moduleDao.getOne(moduleDO.getParentId());
            parentModule = moduleDao.findById(moduleDO.getParentId()).orElse(null);;
            moduleDO.setLevel(parentModule.getLevel()+1);
        }
        moduleDO.setDel(1);
@@ -93,7 +93,7 @@ public class ModuleService extends BaseJpaService<ModuleDO, ModuleDao> {
        if(CommonContant.DEFAULT_PARENTID.equals(moduleDO.getParentId())){
            moduleDO.setLevel(0);
        }else {
            parentModule = moduleDao.getOne(moduleDO.getParentId());
            parentModule = moduleDao.findById(moduleDO.getParentId()).orElse(null);;
            moduleDO.setLevel(parentModule.getLevel()+1);
        }
@@ -124,7 +124,7 @@ public class ModuleService extends BaseJpaService<ModuleDO, ModuleDao> {
            boolean parentIsMust = true;
            ModuleDO parentModule = null;
            if(!CommonContant.DEFAULT_PARENTID.equals(moduleDO.getParentId())){
                parentModule = moduleDao.getOne(moduleDO.getParentId());
                parentModule = moduleDao.findById(moduleDO.getParentId()).orElse(null);;
                if(ModuleDO.Must.nonMust.getValue().equals(parentModule.getIsMust())){
                    parentIsMust = false;
                }
@@ -225,7 +225,7 @@ public class ModuleService extends BaseJpaService<ModuleDO, ModuleDao> {
     */
    @Transactional(rollbackFor = Exception.class)
    public void updateStatus(String id,Integer status){
        ModuleDO moduleDO = moduleDao.getOne(id);
        ModuleDO moduleDO = moduleDao.findById(id).orElse(null);
        //若原业务模块为失效/生效，操作生效/失效后的变更逻辑如以下流程图所示
        if(ModuleDO.Status.available.getValue().equals(status)){
@@ -248,7 +248,7 @@ public class ModuleService extends BaseJpaService<ModuleDO, ModuleDao> {
        addSubModule(moduleDO);
        if(!CommonContant.DEFAULT_PARENTID.equals(moduleDO.getParentId())){
            ModuleDO parentModule = moduleDao.getOne(moduleDO.getParentId());
            ModuleDO parentModule = moduleDao.findById(moduleDO.getParentId()).orElse(null);;
            if(ModuleDO.Status.available.getValue().equals(parentModule.getStatus())){
                available(parentModule);
            }
@@ -293,6 +293,6 @@ public class ModuleService extends BaseJpaService<ModuleDO, ModuleDao> {
    }
    public ModuleDO findOne(String id){
        return moduleDao.getOne(id);
        return moduleDao.findById(id).orElse(null);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/module/SaasInterfaceService.java

@@ -93,7 +93,7 @@ public class SaasInterfaceService extends BaseJpaService<SaasInterfaceDO, SaasIn
     * @return
     */
    public SaasInterfaceDO findById(String id){
        SaasInterfaceDO interfaceDO = interfaceDao.getOne(id);
        SaasInterfaceDO interfaceDO = interfaceDao.findById(id).orElse(null);
        List<SaasInterfaceParamDO> paramDOList = interfaceParamDao.findBySaasInterfaceId(id);
        List<SaasInterfaceParamDO> entryParams = paramDOList.stream()

svr/svr-base/src/main/java/com/yihu/jw/base/service/notice/NoticeService.java

@@ -77,7 +77,7 @@ public class NoticeService extends BaseJpaService<NoticeDO, NoticeDao> {
     * @return
     */
    public NoticeDO findById(String id){
        return noticeDao.getOne(id);
        return noticeDao.findById(id).orElse(null);
    }
    /**
@@ -103,7 +103,7 @@ public class NoticeService extends BaseJpaService<NoticeDO, NoticeDao> {
     * @return
     */
    public NoticeDO updateNotice(NoticeDO noticeDO){
        NoticeDO noticeOld = noticeDao.getOne(noticeDO.getId());
        NoticeDO noticeOld = noticeDao.findById(noticeDO.getId()).orElse(null);;
        if(released.getValue().equals(noticeDO.getStatus())){
            //已发布的不能修改
            return noticeDO;
@@ -133,7 +133,7 @@ public class NoticeService extends BaseJpaService<NoticeDO, NoticeDao> {
     * @param noticeId
     */
    public void deleteNotice(String noticeId){
        NoticeDO noticeDO = noticeDao.getOne(noticeId);
        NoticeDO noticeDO = noticeDao.findById(noticeId).orElse(null);;
        noticeDO.setDel(0);
        noticeDao.save(noticeDO);
    }
@@ -156,7 +156,7 @@ public class NoticeService extends BaseJpaService<NoticeDO, NoticeDao> {
                        try {
                            if(lock.lock()) {
                                //需要加锁的代码
                                NoticeDO noticeDO = noticeDao.getOne(noticeId);
                                NoticeDO noticeDO = noticeDao.findById(noticeId).orElse(null);;
                                if (NoticeDO.Status.wait.getValue().equals(noticeDO.getStatus())
                                        &&NoticeDO.SendType.automatic_release.getValue().equals(noticeDO.getSendType())){
                                    release(noticeDO);

svr/svr-base/src/main/java/com/yihu/jw/base/service/notice/UserNoticeService.java

@@ -37,12 +37,12 @@ public class UserNoticeService extends BaseJpaService<UserNoticeDO, UserNoticeDa
     * @return
     */
    public NoticeDO findNoticeDetail(String id){
        UserNoticeDO userNoticeDO = userNoticeDao.getOne(id);
        UserNoticeDO userNoticeDO = userNoticeDao.findById(id).orElse(null);
        if(UserNoticeDO.Read.unRead.getValue().equals(userNoticeDO.getIsRead())){
            userNoticeDO.setIsRead(UserNoticeDO.Read.read.getValue());
            userNoticeDao.save(userNoticeDO);
        }
        NoticeDO noticeDO = noticeDao.getOne(userNoticeDO.getNoticeId());
        NoticeDO noticeDO = noticeDao.findById(userNoticeDO.getNoticeId()).orElse(null);;
        return noticeDO;
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/order/PayService.java

@@ -156,7 +156,7 @@ public class PayService {
            result.put(ResponseContant.resultMsg, "订单不存在");
            return result;
        }
        BasePatientDO patientDO = patientDao.getOne(businessOrderDO.getPatient());
        BasePatientDO patientDO = patientDao.findById(businessOrderDO.getPatient()).orElse(null);;
        if (patientDO==null){
            result.put(ResponseContant.resultFlag, ResponseContant.fail);
            result.put(ResponseContant.resultMsg, "患者不存在");
@@ -197,7 +197,7 @@ public class PayService {
            result.put(ResponseContant.resultMsg, "订单未申请退款或已退款，无法操作");
            return result;
        }
        BasePatientDO patientDO = patientDao.getOne(businessOrderDO.getPatient());
        BasePatientDO patientDO = patientDao.findById(businessOrderDO.getPatient()).orElse(null);;
        if (patientDO==null){
            result.put(ResponseContant.resultFlag, ResponseContant.fail);
            result.put(ResponseContant.resultMsg, "患者不存在");

svr/svr-base/src/main/java/com/yihu/jw/base/service/org/BaseOrgService.java

@@ -212,7 +212,7 @@ public class BaseOrgService extends BaseJpaService<BaseOrgDO, BaseOrgDao> {
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        BaseOrgDO baseOrgDO = baseOrgDao.getOne(id);
        BaseOrgDO baseOrgDO = baseOrgDao.findById(id).orElse(null);
        if(null == baseOrgDO){
            return null;
        }
@@ -269,7 +269,7 @@ public class BaseOrgService extends BaseJpaService<BaseOrgDO, BaseOrgDao> {
            //新增机构与区域的树形结构关系
            orgTreeService.addOrgTreeNode(baseOrgDO);
        }else{
            BaseOrgDO oldBaseOrgDO = baseOrgDao.getOne(baseOrgDO.getId());
            BaseOrgDO oldBaseOrgDO = baseOrgDao.findById(baseOrgDO.getId()).orElse(null);;
            if(null == oldBaseOrgDO){
                return "机构不存在";
            }
@@ -316,7 +316,7 @@ public class BaseOrgService extends BaseJpaService<BaseOrgDO, BaseOrgDao> {
            result.put("response",ConstantUtils.FAIL);
            return result.toJSONString();
        }
        BaseOrgDO baseOrgDO = baseOrgDao.getOne(id);
        BaseOrgDO baseOrgDO = baseOrgDao.findById(id).orElse(null);
        if( null == baseOrgDO ){
            result.put("msg","该机构不存在 id:" + id);
            result.put("response",ConstantUtils.FAIL);

svr/svr-base/src/main/java/com/yihu/jw/base/service/population/BasePopulationService.java

@@ -33,7 +33,7 @@ public class BasePopulationService extends BaseJpaService<BasePopulationDO, Base
    private BasePopulationDao basePopulationDao;
    public BasePopulationDO findById(String id) {
        return basePopulationDao.getOne(id);
        return basePopulationDao.findById(id).orElse(null);
    }
    /**

svr/svr-base/src/main/java/com/yihu/jw/base/service/role/MenuService.java

@@ -48,7 +48,7 @@ public class MenuService extends BaseJpaService<MenuDO, MenuDao> {
        if(CommonContant.DEFAULT_PARENTID.equals(menuDO.getParentId())){
            menuDO.setLevel(0);
        }else {
            MenuDO parentMemu = menuDao.getOne(menuDO.getParentId());
            MenuDO parentMemu = menuDao.findById(menuDO.getParentId()).orElse(null);;
            menuDO.setLevel(parentMemu.getLevel()+1);
        }
        int sort = menuDao.countMenuByParentId(menuDO.getParentId())+1;
@@ -71,7 +71,7 @@ public class MenuService extends BaseJpaService<MenuDO, MenuDao> {
        if(CommonContant.DEFAULT_PARENTID.equals(menuDO.getParentId())){
            menuDO.setLevel(0);
        }else {
            MenuDO parentMemu = menuDao.getOne(menuDO.getParentId());
            MenuDO parentMemu = menuDao.findById(menuDO.getParentId()).orElse(null);;
            menuDO.setLevel(parentMemu.getLevel()+1);
        }
        int sort = menuDao.countMenuByParentId(menuDO.getParentId())+1;
@@ -86,7 +86,7 @@ public class MenuService extends BaseJpaService<MenuDO, MenuDao> {
     */
    @Transactional(rollbackFor = Exception.class)
    public void moveUp(String menuId){
        MenuDO menuDO = menuDao.getOne(menuId);
        MenuDO menuDO = menuDao.findById(menuId).orElse(null);;
        int sort = menuDO.getSort();
        if(sort > 1){
            sort = sort-1;
@@ -102,7 +102,7 @@ public class MenuService extends BaseJpaService<MenuDO, MenuDao> {
     */
    @Transactional(rollbackFor = Exception.class)
    public void moveDown(String menuId){
        MenuDO menuDO = menuDao.getOne(menuId);
        MenuDO menuDO = menuDao.findById(menuId).orElse(null);;
        int sort = menuDO.getSort();
        int count = menuDao.countMenuByParentId(menuDO.getParentId());
        if(sort < count){
@@ -123,7 +123,7 @@ public class MenuService extends BaseJpaService<MenuDO, MenuDao> {
    }
    public MenuDO findOne(String id){
        return menuDao.getOne(id);
        return menuDao.findById(id).orElse(null);
    }
    //public List<Map<String,Object>> queryMenuBy
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/role/WlyyUserRoleService.java

@@ -62,7 +62,7 @@ public class WlyyUserRoleService extends BaseJpaService<WlyyUserRole, WlyyUserRo
        if (null==doctorRole){
            return -1;
        }
        WlyyUserRole wlyyUserRole = wlyyUserRoleDao.getOne(Long.valueOf(id));
        WlyyUserRole wlyyUserRole = wlyyUserRoleDao.findById(Long.valueOf(id)).orElse(null);;
        if (null==wlyyUserRole){
            return -2;
        }

svr/svr-base/src/main/java/com/yihu/jw/base/service/saas/BaseEmailTemplateConfigService.java

@@ -17,7 +17,7 @@ public class BaseEmailTemplateConfigService extends BaseJpaService<BaseEmailTemp
    private BaseEmailTemplateConfigDao baseEmailTemplateConfigDao;
    public BaseEmailTemplateConfigDO findById(String id) {
        return baseEmailTemplateConfigDao.getOne(id);
        return baseEmailTemplateConfigDao.findById(id).orElse(null);
    }
    public BaseEmailTemplateConfigDO findByCode(String code) {
        return baseEmailTemplateConfigDao.findByCode(code);

svr/svr-base/src/main/java/com/yihu/jw/base/service/saas/SaasService.java

@@ -235,14 +235,14 @@ public class SaasService extends BaseJpaService<SaasDO, SaasDao> {
    @Transactional(rollbackFor = Exception.class)
    public SaasDO saveSystemConfig(SaasDO saasDO){
        SaasDO oldSaas = saasDao.getOne(saasDO.getId());
        SaasDO oldSaas = saasDao.findById(saasDO.getId()).orElse(null);;
        oldSaas.setSystemName(saasDO.getSystemName());
        oldSaas.setLogo(saasDO.getLogo());
        oldSaas.setAreaNumber(saasDO.getAreaNumber());
        List<SaasModuleDO> saasModuleDOList = saasDO.getSaasModuleList();
        saasModuleDao.deleteBySaasId(saasDO.getId());
        saasModuleDOList.forEach(saasModuleDO -> {
            ModuleDO moduleDO = moduleDao.getOne(saasModuleDO.getModuleId());
            ModuleDO moduleDO = moduleDao.findById(saasModuleDO.getModuleId()).orElse(null);;
            saasModuleDO.setSaasId(saasDO.getId());
            saasModuleDO.setDel(moduleDO.getDel());
            saasModuleDO.setCreateTime(new Date());
@@ -273,7 +273,7 @@ public class SaasService extends BaseJpaService<SaasDO, SaasDao> {
     */
    @Transactional(rollbackFor = Exception.class)
    public void createThemeConfig(SaasDO saasDO){
        SaasDO oldSaas = saasDao.getOne(saasDO.getId());
        SaasDO oldSaas = saasDao.findById(saasDO.getId()).orElse(null);;
        oldSaas.setThemeColor(saasDO.getThemeColor());
        List<SaasThemeDO> themeDOList = saasDO.getSaasThemeList();
        List<SaasThemeExtendDO> themeExtendDOList = new ArrayList<>(16);
@@ -297,13 +297,13 @@ public class SaasService extends BaseJpaService<SaasDO, SaasDao> {
    @Transactional
    public void delete(String ids) {
        for (String id : ids.split(",")) {
            SaasDO saas = saasDao.getOne(id);
            SaasDO saas = saasDao.findById(id).orElse(null);
            saas.setStatus(SaasDO.Status.delete);
        }
    }
    public SaasDO findById(String id){
        return saasDao.getOne(id);
        return saasDao.findById(id).orElse(null);
    }
    public SaasDO findByCreateUser(String createUser){
        return saasDao.findByCreateUser(createUser);

svr/svr-base/src/main/java/com/yihu/jw/base/service/saas/SaasTypeDictService.java

@@ -46,7 +46,7 @@ public class SaasTypeDictService extends BaseJpaService<SaasTypeDictDO, SaasType
        List<SaasTypeModuleDO> saasDefaultModuleDOS = new ArrayList<>();
        for (String id : ids) {
            if(!StringUtils.isEmpty(id)){
                ModuleDO moduleDO = moduleDao.getOne(id);
                ModuleDO moduleDO = moduleDao.findById(id).orElse(null);
                saasTypeModuleDO = new SaasTypeModuleDO();
                saasTypeModuleDO.setModuleId(id);
                saasTypeModuleDO.setName(moduleDO.getName());
@@ -92,7 +92,7 @@ public class SaasTypeDictService extends BaseJpaService<SaasTypeDictDO, SaasType
    }
    public SaasTypeDictDO findById(String id) {
        return saasTypeDictDao.getOne(id);
        return saasTypeDictDao.findById(id).orElse(null);
    }
    public SaasTypeDictDO findByCode(Integer code) {

svr/svr-base/src/main/java/com/yihu/jw/base/service/servicePackage/ServicePackageItemService.java

@@ -75,7 +75,7 @@ public class ServicePackageItemService extends BaseJpaService<ServicePackageItem
                    itemDO.setTopicItem(systemDictEntryDO.getRemark());
                }
            }
            ServicePackageItemDO oldItemDO = servicePackageItemDao.getOne(itemDO.getId());
            ServicePackageItemDO oldItemDO = servicePackageItemDao.findById(itemDO.getId()).orElse(null);
            oldItemDO.setName(itemDO.getName());
            oldItemDO.setDel(itemDO.getDel());
            oldItemDO.setCode(itemDO.getCode());

svr/svr-base/src/main/java/com/yihu/jw/base/service/servicePackage/ServicePackageService.java

@@ -68,7 +68,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
            servicePackageDO=servicePackageDao.save(servicePackageDO);
        }else{
            //修改
            ServicePackageDO oldDO = servicePackageDao.getOne(servicePackageDO.getId());
            ServicePackageDO oldDO = servicePackageDao.findById(servicePackageDO.getId()).orElse(null);;
            oldDO.setName(servicePackageDO.getName());
            oldDO.setDel(servicePackageDO.getDel());
            oldDO.setType(servicePackageDO.getType());
@@ -84,7 +84,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
            if (baseOrgDO!=null){
                itemDO.setOrgName(baseOrgDO.getName());
            }
            itemDO = servicePackageItemDao.getOne(itemDO.getId());
            itemDO = servicePackageItemDao.findById(itemDO.getId()).orElse(null);;
            ServicePackageItemDO itemDO1 = new ServicePackageItemDO();
            BeanUtils.copyProperties(itemDO,itemDO1);
            itemDO1.setId(null);

svr/svr-base/src/main/java/com/yihu/jw/base/service/system/SystemDictEntryService.java

@@ -18,7 +18,7 @@ public class SystemDictEntryService extends BaseJpaService<SystemDictEntryDO, Sy
    private SystemDictEntryDao systemDictEntryDao;
    public SystemDictEntryDO findById(String id) {
        return systemDictEntryDao.getOne(id);
        return systemDictEntryDao.findById(id).orElse(null);
    }
    public void deleteByDictCode(String dictCode) {

svr/svr-base/src/main/java/com/yihu/jw/base/service/team/BaseTeamService.java

@@ -450,7 +450,7 @@ public class BaseTeamService extends BaseJpaService<BaseTeamDO, BaseTeamDao> {
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        BaseTeamDO teamDO = baseTeamDao.getOne(teamId);
        BaseTeamDO teamDO = baseTeamDao.findById(teamId).orElse(null);;
        if( null == teamDO ){
            result.put("msg","teamId not exist for id:" + teamId);
            result.put("response",ConstantUtils.FAIL);

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -141,7 +141,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
     * @return
     */
    public UserDO findById(String id) {
        return userDao.getOne(id);
        return userDao.findById(id).orElse(null);
    }
    /**
@@ -186,7 +186,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        Map<String, Object> userinfo = new HashedMap();
        UserDO user = userDao.getOne(id);
        UserDO user = userDao.findById(id).orElse(null);
        RoleDO role = null;
        if (user != null ) {
            if(!user.getEnabled()){
@@ -194,7 +194,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
            }
            userinfo.put("id", user.getId());
            userinfo.put("name", user.getName());
            role = roleDao.getOne(user.getRoleId());
            role = roleDao.findById(user.getRoleId()).orElse(null);;
        }
        //获取角色
        if (role != null) {
@@ -208,7 +208,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
            } else if (role.getType()==2) {
                //saas平台管理员信息获取
                if (org.apache.commons.lang3.StringUtils.isNotBlank(user.getId())) {
                    SaasDO saas = saasDao.getOne(user.getSaasId());
                    SaasDO saas = saasDao.findById(user.getSaasId()).orElse(null);;
                    Map<String, Object> ss = new HashedMap();
                    ss.put("id", saas.getId());
                    ss.put("name", saas.getName());
@@ -279,7 +279,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        com.alibaba.fastjson.JSONObject valueJson = null;
        if(org.apache.commons.lang3.StringUtils.isNotBlank(authPw)){
            
            WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.getOne("pwOverDue");
            WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.findById("pwOverDue").orElse(null);;
            String code[] = wlyyHospitalSysDictDO.getDictCode().split(",");
            Integer maxDateInt = Integer.parseInt(code[0]);
            Integer remainDateInt = Integer.parseInt(code[1]);
@@ -441,7 +441,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        UserDO userDO = null;
        try {
            userDO = objectMapper.readValue(user.toJSONString(), UserDO.class);
            UserDO oldUser = userDao.getOne(userDO.getId());
            UserDO oldUser = userDao.findById(userDO.getId()).orElse(null);;
            userDO.setPassword(oldUser.getPassword());
            userDO.setUpdateTime(new Date());
        } catch (IOException e) {
@@ -541,14 +541,14 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        }
        //用户基本信息
        UserDO user = userDao.getOne(userId);
        UserDO user = userDao.findById(userId).orElse(null);;
        if(null == user){
            result.put("msg","User not exist for id:" + userId);
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        //用户角色
        RoleDO roleDO = roleDao.getOne(user.getRoleId());
        RoleDO roleDO = roleDao.findById(user.getRoleId()).orElse(null);;
        //用户所属区域
        List<WlyyUserAreaDO> userAreaDOList = userAreaDao.findAllByUserId(userId);
@@ -669,7 +669,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
     */
    public JSONObject updatePwd(String userId,String pwd,String oldpwd){
        JSONObject result = new JSONObject();
        UserDO user = userDao.getOne(userId);
        UserDO user = userDao.findById(userId).orElse(null);;
        if(null == user){
            result.put("response", ConstantUtils.FAIL);
            result.put("msg","user not exist for id : " + userId);
@@ -721,7 +721,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
     */
    public JSONObject resetPassword(String userId){
        JSONObject result = new JSONObject();
        UserDO user = userDao.getOne(userId);
        UserDO user = userDao.findById(userId).orElse(null);;
        if(null == user){
            result.put("response", ConstantUtils.FAIL);
            result.put("msg","user not exist for id : " + userId);
@@ -783,7 +783,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        UserDO user = userDao.getOne(userId);
        UserDO user = userDao.findById(userId).orElse(null);;
        if( null == user ){
            result.put("msg","user not exist for id:" + userId);
            result.put("response",ConstantUtils.FAIL);
@@ -810,7 +810,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        UserDO user = userDao.getOne(userId);
        UserDO user = userDao.findById(userId).orElse(null);;
        if( null == user ){
            result.put("msg","user not exist for id:" + userId);
            result.put("response",ConstantUtils.FAIL);

svr/svr-base/src/main/java/com/yihu/jw/base/service/util/YkyyBaseService.java

@@ -270,7 +270,7 @@ public class YkyyBaseService {
     * @throws Exception
     */
    public void registerYkt(String patient,String pw,String code) throws Exception {
        BasePatientDO basePatientDO  = patientDao.getOne(patient);
        BasePatientDO basePatientDO  = patientDao.findById(patient).orElse(null);;
        if (basePatientDO!=null){
            String userId = basePatientDO.getUserId();
            if (StringUtils.isNoneBlank(userId)){

svr/svr-base/src/main/java/com/yihu/jw/base/service/video/BaseVideoGroupService.java

@@ -160,7 +160,7 @@ public class BaseVideoGroupService extends BaseJpaService<BaseVideoGroupDO, Base
     * @return
     */
    public Envelop deleteVideo(String id){
        BaseVideoDO video = videoDao.getOne(id);
        BaseVideoDO video = videoDao.findById(id).orElse(null);
        if(video != null){
            videoDao.delete(video);
        }

svr/svr-base/src/main/java/com/yihu/jw/base/service/voluntary/VoluntaryRecruitmentService.java

@@ -129,7 +129,7 @@ public class VoluntaryRecruitmentService {
    public void addPeople(List<VoluntaryRecruitmentPeopleDO> peopleDOList,List<VoluntaryRecruitmentPeopleDO> peopleDOs,VoluntaryRecruitmentCompanyDO companyDO){
        if(!StringUtil.isBlank(companyDO.getId())){
            VoluntaryRecruitmentCompanyDO old = companyDao.getOne(companyDO.getId());
            VoluntaryRecruitmentCompanyDO old = companyDao.findById(companyDO.getId()).orElse(null);;
            companyDO = old;
        }else {
            companyDO.setNum(0);

svr/svr-base/src/main/java/com/yihu/jw/base/service/word/BaseSensitiveService.java

@@ -65,7 +65,7 @@ public class BaseSensitiveService extends BaseJpaService<BaseSensitiveDO, BaseSe
     * @param explanation
     */
    public void updateSensitiveWords(String id, String words, String explanation,String status,String operatorCode,String name) {
        BaseSensitiveDO baseSensitiveDO = baseSensitiveWordDao.getOne(id);
        BaseSensitiveDO baseSensitiveDO = baseSensitiveWordDao.findById(id).orElse(null);
        baseSensitiveDO.setSensitiveWord(words);
        baseSensitiveDO.setExplanation(explanation);
        baseSensitiveDO.setUpdateTime(DateUtil.getNowDate());
@@ -97,7 +97,7 @@ public class BaseSensitiveService extends BaseJpaService<BaseSensitiveDO, BaseSe
        String[] list = ids.split(",");
        for (String id : list) {
            if (StringUtils.isNotEmpty(id)){
                BaseSensitiveDO baseSensitiveDO = baseSensitiveWordDao.getOne(id);
                BaseSensitiveDO baseSensitiveDO = baseSensitiveWordDao.findById(id).orElse(null);
                baseSensitiveDO.setStatus(status);
                baseSensitiveDO.setUpdateTime(DateUtil.getNowDate());
                baseSensitiveDO.setOperatorCode(operatorCode);

svr/svr-base/src/main/java/com/yihu/jw/base/service/wx/WechatService.java

@@ -249,7 +249,7 @@ public class WechatService {
    }
    public WxWechatDO findWxWechatSingle(String wechatId){
        WxWechatDO wxWechatDO = wechatDao.getOne(wechatId);
        WxWechatDO wxWechatDO = wechatDao.findById(wechatId).orElse(null);;
        return wxWechatDO;
    }
@@ -350,7 +350,7 @@ public class WechatService {
    }
    public Envelop updateImgGroup(String id,String scene){
        WxGraphicSceneDO wxGraphicSceneDO = wxGraphicSceneDao.getOne(id);
        WxGraphicSceneDO wxGraphicSceneDO = wxGraphicSceneDao.findById(id).orElse(null);
        List<WxGraphicSceneGroupDO> list = wxGraphicSceneGroupDao.findByWechatIdAndScene(wxGraphicSceneDO.getWechatId(),wxGraphicSceneDO.getScene());
        if(list!=null&&list.size()>0){
@@ -365,7 +365,7 @@ public class WechatService {
    }
    public Envelop deleteImgGroup(String id){
        WxGraphicSceneDO wxGraphicSceneDO = wxGraphicSceneDao.getOne(id);
        WxGraphicSceneDO wxGraphicSceneDO = wxGraphicSceneDao.findById(id).orElse(null);
        List<WxGraphicSceneGroupDO> list = wxGraphicSceneGroupDao.findByWechatIdAndScene(wxGraphicSceneDO.getWechatId(),wxGraphicSceneDO.getScene());
        if(list!=null&&list.size()>0){
            wxGraphicSceneGroupDao.deleteAll(list);
@@ -465,7 +465,7 @@ public class WechatService {
    }
    public WxGraphicMessageDO findGraphicMessageSingle(String id){
        return wxGraphicMessageDao.getOne(id);
        return wxGraphicMessageDao.findById(id).orElse(null);
    }
    public Envelop saveImgGroup(List<WxGraphicSceneGroupDO> groups){