代码修改

svr/svr-basic/src/main/java/com/yihu/jw/basic/address/service/AddressService.java

@@ -51,8 +51,8 @@ public class AddressService extends BaseJpaService<Address,AddressRepository>{
    }
    public Address getAddressById(String Id) {
        return geographyRepository.getOne(Id);
    public Address getAddressById(String id) {
        return geographyRepository.findById(id).orElse(null);
    }
    public String getCanonicalAddress(Address address) {

svr/svr-basic/src/main/java/com/yihu/jw/basic/apps/service/AppApiCategoryService.java

@@ -20,7 +20,7 @@ public class AppApiCategoryService extends BaseJpaService<AppApiCategory, AppApi
    private AppApiCategoryDao appApiCategoryDao;
    public AppApiCategory getOne(Integer id) {
        return appApiCategoryDao.getOne(id);
        return appApiCategoryDao.findById(id).orElse(null);
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/apps/service/AppApiService.java

@@ -105,7 +105,7 @@ public class AppApiService extends BaseJpaService<AppApi, AppApiDao> {
    }
    public AppApi findById(Integer id) {
        return appApiRepository.getOne(id);
        return appApiRepository.findById(id).orElse(null);
    }
    public List<AppApi> findByCateId(Integer categoryId) {

svr/svr-basic/src/main/java/com/yihu/jw/basic/apps/service/AppService.java

@@ -115,7 +115,7 @@ public class AppService extends BaseJpaService<App, AppDao> {
     * @return
     */
    public boolean verifyApp(String id, String secret) {
        App app = appDao.getOne(id);
        App app = appDao.findById(id).orElse(null);
        return app != null && app.getSecret().equals(secret);
    }
@@ -125,7 +125,7 @@ public class AppService extends BaseJpaService<App, AppDao> {
    }
    public void checkStatus(String appId, String status) {
        App app = appDao.getOne(appId);
        App app = appDao.findById(appId).orElse(null);
        //开启：Approved；禁用：Forbidden;
        app.setStatus(status);
        appDao.save(app);

svr/svr-basic/src/main/java/com/yihu/jw/basic/apps/service/AppVersionService.java

@@ -18,7 +18,7 @@ public class AppVersionService extends BaseJpaService<AppVersion, AppVersionRepo
    private AppVersionRepository appVersionRepository;
    public AppVersion getAppVersion(String id){
        return appVersionRepository.getOne(id);
        return appVersionRepository.findById(id).orElse(null);
    }
    public AppVersion getAppVersionByCode(String code){

svr/svr-basic/src/main/java/com/yihu/jw/basic/dict/service/SystemDictService.java

@@ -71,7 +71,7 @@ public class SystemDictService extends BaseJpaService<SystemDict, SystemDictRepo
    }
    public SystemDict getOne(long id) {
        return  dictRepo.getOne(id);
        return  dictRepo.findById(id).orElse(null);
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/fileresource/service/FileResourceManager.java

@@ -99,7 +99,7 @@ public class FileResourceManager extends BaseJpaService<FileResource, XFileResou
    }
    public String getStoragePathById(String id) {
        FileResource file= resourceRepository.getOne(id);
        FileResource file= resourceRepository.findById(id).orElse(null);
        String storage_path=file.getStoragePath();
        return storage_path;
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/org/service/OrgHealthCategoryService.java

@@ -25,7 +25,7 @@ public class OrgHealthCategoryService extends BaseJpaService<OrgHealthCategory,
    OrgHealthCategoryDao orgHealthCategoryDao;
    public OrgHealthCategory getById(Long id) {
        return orgHealthCategoryDao.getOne(id);
        return orgHealthCategoryDao.findById(id).orElse(null);
    }
    public List<OrgHealthCategory> findAll() {

svr/svr-basic/src/main/java/com/yihu/jw/basic/patient/service/ArchiveApplyService.java

@@ -61,7 +61,7 @@ public class ArchiveApplyService extends BaseJpaService<ArchiveApply, XArchiveAp
     * 卡认证申请新增/修改
     */
    public ArchiveApply getArchiveApply(Long id) throws Exception{
        return archiveApplyDao.getOne(id);
        return archiveApplyDao.findById(id).orElse(null);
    }
    /**
@@ -107,7 +107,7 @@ public class ArchiveApplyService extends BaseJpaService<ArchiveApply, XArchiveAp
     */
    public Envelop archiveVerifyManager(Long id, String status, String auditor, String auditReason, String archiveRelationIds) throws Exception{
        ArchiveApply apply = archiveApplyDao.getOne(id);
        ArchiveApply apply = archiveApplyDao.findById(id).orElse(null);
        if(apply!=null){
            String[] ids = archiveRelationIds.replace("，",",").split(",");
@@ -115,7 +115,7 @@ public class ArchiveApplyService extends BaseJpaService<ArchiveApply, XArchiveAp
            for(String idString :ids){
                if(!StringUtils.isEmpty(idString)) {
                    ArchiveRelation relation = archiveRelationDao.getOne(Long.valueOf(idString));
                    ArchiveRelation relation = archiveRelationDao.findById(Long.valueOf(idString)).orElse(null);
                    if (relation != null) {
                        try {
                            if ("1".equals(apply.getStatus())) {  //审批通过

svr/svr-basic/src/main/java/com/yihu/jw/basic/patient/service/ArchiveRelationService.java

@@ -91,7 +91,7 @@ public class ArchiveRelationService extends BaseJpaService<ArchiveRelation, XArc
    }
    public ArchiveRelation getOne(Long id) {
        return   archiveRelationDao.getOne(id);
        return   archiveRelationDao.findById(id).orElse(null);
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/patient/service/CardManager.java

@@ -44,9 +44,9 @@ public class CardManager {
        AbstractCard card = null;
        SystemDictEntry cardTypeDict = systemDictEntryService.getDictEntry(10, cardType);
        if (!cardTypeDict.getCatalog().equals("VirtualCard")) {
            card = abstractPhysicalCardRepository.getOne(id);
            card = abstractPhysicalCardRepository.findById(id).orElse(null);
        } else {
            card = abstractVirtualCardRepository.getOne(id);
            card = abstractVirtualCardRepository.findById(id).orElse(null);
        }
        return card;
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/patient/service/DemographicService.java

@@ -39,7 +39,7 @@ public class DemographicService extends BaseJpaService {
    public DemographicInfo getDemographicInfo(String id) {
        DemographicInfo demInfo = demographicInfoRepository.getOne(id);
        DemographicInfo demInfo = demographicInfoRepository.findById(id).orElse(null);
        return demInfo;
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/patient/service/FamiliesService.java

@@ -54,7 +54,7 @@ public class FamiliesService extends BaseJpaService<Families, XFamiliesRepositor
     */
    public Families getFamiliesById(String id)
    {
        Families families = familiesRep.getOne(id);
        Families families = familiesRep.findById(id).orElse(null);
        return families;
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/patient/service/MedicalCardsService.java

@@ -37,7 +37,7 @@ public class MedicalCardsService extends BaseJpaService<MedicalCards, XMedicalCa
     * 就诊卡详细信息
     */
    public MedicalCards getMCard(Long id) throws Exception{
        return medicalCardsDao.getOne(id);
        return medicalCardsDao.findById(id).orElse(null);
    }
    public List<MedicalCards> getBycardNoStr(String cardNoStr) {

svr/svr-basic/src/main/java/com/yihu/jw/basic/patient/service/UserCardsService.java

@@ -65,7 +65,7 @@ import java.util.Date;
     * 卡认证申请详情
     */
    public UserCards getCardApply(Long id) throws Exception{
        return userCardsDao.getOne(id);
        return userCardsDao.findById(id).orElse(null);
    }
    /**
@@ -118,7 +118,7 @@ import java.util.Date;
     * 管理员--卡认证审核操作
     */
    public Envelop cardVerifyManager(Long id, String status, String auditor, String auditReason) throws Exception{
        UserCards card = userCardsDao.getOne(id);
        UserCards card = userCardsDao.findById(id).orElse(null);
        if(card == null)
        {
            return Envelop.getError("该数据不存在！");

svr/svr-basic/src/main/java/com/yihu/jw/basic/portal/service/SurveyTemplateService.java

@@ -134,7 +134,7 @@ public class SurveyTemplateService extends BaseJpaService<SurveyTemplate,SurveyT
    }
    public SurveyTemplate findById(Long id){
         return  surveyTemplateDao.getOne(id);
         return  surveyTemplateDao.findById(id).orElse(null);
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjDataSaveService.java

@@ -21,7 +21,7 @@ public class TjDataSaveService extends BaseJpaService<TjDataSave, XTjDataSaveRep
    XTjDataSaveRepository tjDataSaveRepository;
    public TjDataSave getById(Long id) {
        TjDataSave tjDataSave = tjDataSaveRepository.getOne(id);
        TjDataSave tjDataSave = tjDataSaveRepository.findById(id).orElse(null);
        return tjDataSave;
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjDataSourceService.java

@@ -22,7 +22,7 @@ public class TjDataSourceService extends BaseJpaService<TjDataSource, XTjDataSou
    XTjDataSourceRepository tjDataSourceRepository;
    public TjDataSource getById(Long id) {
        TjDataSource tjDataSource = tjDataSourceRepository.getOne(id);
        TjDataSource tjDataSource = tjDataSourceRepository.findById(id).orElse(null);
        return tjDataSource;
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjDimensionMainService.java

@@ -34,7 +34,7 @@ public class TjDimensionMainService extends BaseJpaService<TjDimensionMain, XTjD
     * @param
     */
    public TjDimensionMain getTjDimensionMain(Long id) {
        TjDimensionMain tjDimensionMain = tjDimensionMainRepository.getOne(id);
        TjDimensionMain tjDimensionMain = tjDimensionMainRepository.findById(id).orElse(null);
        return tjDimensionMain;
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjDimensionSlaveService.java

@@ -30,7 +30,7 @@ public class TjDimensionSlaveService extends BaseJpaService<TjDimensionSlave, XT
     * @param
     */
    public TjDimensionSlave getTjDimensionSlave(Long id) {
        TjDimensionSlave tjDimensionSlave = tjDimensionSlaveRepository.getOne(id);
        TjDimensionSlave tjDimensionSlave = tjDimensionSlaveRepository.findById(id).orElse(null);
        return tjDimensionSlave;
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjQuotaCategoryService.java

@@ -29,7 +29,7 @@ public class TjQuotaCategoryService extends BaseJpaService<TjQuotaCategory, XTjQ
    }
    public TjQuotaCategory getById(Integer id) {
        return quotaCategoryRepository.getOne(id);
        return quotaCategoryRepository.findById(id).orElse(null);
    }
    public void deleteQuotaCategory(Integer id) {

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjQuotaChartService.java

@@ -29,7 +29,7 @@ public class TjQuotaChartService extends BaseJpaService<TjQuotaChart, XTjQuotaCh
     * @param
     */
    public TjQuotaChart getTjQuotaChart(Integer id) {
        TjQuotaChart reportTemplate = xTjQuotaChartRepository.getOne(id);
        TjQuotaChart reportTemplate = xTjQuotaChartRepository.findById(id).orElse(null);
        return reportTemplate;
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjQuotaService.java

@@ -48,7 +48,7 @@ public class TjQuotaService extends BaseJpaService<TjQuota, XTjQuotaRepository>
    }
    public TjQuota getById(Long id) {
        TjQuota tjQuota = tjQuotaRepository.getOne(id);
        TjQuota tjQuota = tjQuotaRepository.findById(id).orElse(null);
        return tjQuota;
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/redis/service/RedisMqPublisherService.java

@@ -23,7 +23,7 @@ public class RedisMqPublisherService extends BaseJpaService<RedisMqPublisher, Re
    RedisMqPublisherDao redisMqPublisherDao;
    public RedisMqPublisher getById(Integer id) {
        return redisMqPublisherDao.getOne(id);
        return redisMqPublisherDao.findById(id).orElse(null);
    }
    public List<RedisMqPublisher> findByChannel(String channel) {

svr/svr-basic/src/main/java/com/yihu/jw/basic/redis/service/RedisMqSubscriberService.java

@@ -24,7 +24,7 @@ public class RedisMqSubscriberService extends BaseJpaService<RedisMqSubscriber,
    RedisMqSubscriberDao redisMqSubscriberDao;
    public RedisMqSubscriber getById(Integer id) {
        return redisMqSubscriberDao.getOne(id);
        return redisMqSubscriberDao.findById(id).orElse(null);
    }
    public List<RedisMqSubscriber> findByChannel(String channel) {

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/service/JsonReportService.java

@@ -39,11 +39,11 @@ public class JsonReportService extends BaseJpaService<JsonReport, XJsonReportRep
    }
    public JsonReport getJsonReport(Integer id) {
        return getRepo().getOne(id);
        return getRepo().findById(id).orElse(null);
    }
    public InputStream downloadFile(Integer id) throws Exception {
        JsonReport aJsonReport = getRepo().getOne(id);
        JsonReport aJsonReport = getRepo().findById(id).orElse(null);
        if (aJsonReport == null) return null;
        String file[] = aJsonReport.getRemotePath().split(":");
        byte[] data = fastDFSUtil.download(file[0], file[1]);

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsAdapterDictionaryService.java

@@ -19,7 +19,7 @@ public class RsAdapterDictionaryService extends BaseJpaService<RsAdapterDictiona
    private RsAdapterDictionaryDao adapterDictionaryDao;
    public RsAdapterDictionary findById(String id) {
        return adapterDictionaryDao.getOne(id);
        return adapterDictionaryDao.findById(id).orElse(null);
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsAppResourceMetadataGrantService.java

@@ -90,7 +90,7 @@ public class RsAppResourceMetadataGrantService extends BaseJpaService<RsAppResou
     */
    public RsAppResourceMetadata getRsMetadataGrantById(String id)
    {
        return appRsMetadataDao.getOne(id);
        return appRsMetadataDao.findById(id).orElse(null);
    }
    /**

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsDictionaryEntryService.java

@@ -32,7 +32,7 @@ public class RsDictionaryEntryService extends BaseJpaService<RsDictionaryEntry,
    private RsDictionaryEntryDao dictionaryEntryDao;
    public RsDictionaryEntry findById(int id) {
        return dictionaryEntryDao.getOne(id);
        return dictionaryEntryDao.findById(id).orElse(null);
    }
    public List<RsDictionaryEntry> findByDictCode(String code) {

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsDictionaryService.java

@@ -39,7 +39,7 @@ public class RsDictionaryService extends BaseJpaService<RsDictionary, RsDictiona
    public RsDictionary findById(int id) {
        return dictionaryDao.getOne(id);
        return dictionaryDao.findById(id).orElse(null);
    }
    public RsDictionary findByCode(String code){

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsInterfaceService.java

@@ -28,7 +28,7 @@ public class RsInterfaceService extends BaseJpaService<RsInterface, RsInterfaceD
    }
    public RsInterface getOne(String id){
       return rsInterfaceDao.getOne(id);
       return rsInterfaceDao.findById(id).orElse(null);
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsMetadataService.java

@@ -78,7 +78,7 @@ public class RsMetadataService extends BaseJpaService<RsMetadata, RsResourceMeta
     * @return RsMetadata
     */
    public RsMetadata getMetadataById(String id) {
        return metadataDao.getOne(id);
        return metadataDao.findById(id).orElse(null);
    }
    /**

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsOrgResourceGrantService.java

@@ -97,7 +97,7 @@ public class RsOrgResourceGrantService extends BaseJpaService<RsOrgResource, RsO
     */
    public RsOrgResource getRsOrgGrantById(String id)
    {
        return orgRsDao.getOne(id);
        return orgRsDao.findById(id).orElse(null);
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsOrgResourceMetadataGrantService.java

@@ -90,7 +90,7 @@ public class RsOrgResourceMetadataGrantService extends BaseJpaService<RsOrgResou
     */
    public RsOrgResourceMetadata getRsOrgMetadataGrantById(String id)
    {
        return OrgResourceMetadataDao.getOne(id);
        return OrgResourceMetadataDao.findById(id).orElse(null);
    }
    /**

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsReportCategoryService.java

@@ -34,7 +34,7 @@ public class RsReportCategoryService extends BaseJpaService<RsReportCategory, Rs
     * @return RsReportCategory
     */
    public RsReportCategory getById(Integer id) {
        return rsReportCategoryDao.getOne(id);
        return rsReportCategoryDao.findById(id).orElse(null);
    }
    /**

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsReportMonitorTypeService.java

@@ -32,7 +32,7 @@ public class RsReportMonitorTypeService extends BaseJpaService<RsReportMonitorTy
     * @return RsReportMonitorType
     */
    public RsReportMonitorType getById(Integer id) {
        return rsReportMonitorTypeDao.getOne(id);
        return rsReportMonitorTypeDao.findById(id).orElse(null);
    }
    /**

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsReportService.java

@@ -32,7 +32,7 @@ public class RsReportService extends BaseJpaService<RsReport, RsReportDao> {
     * @return RsReport
     */
    public RsReport getById(Integer id) {
        return rsReportDao.getOne(id);
        return rsReportDao.findById(id).orElse(null);
    }
    /**

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsResourceCategoryService.java

@@ -76,7 +76,7 @@ public class RsResourceCategoryService extends BaseJpaService<RsResourceCategory
     * @return RsCategory
     */
    public RsResourceCategory getRsCategoryById(String id) {
        return rsResourcesCategoryDao.getOne(id);
        return rsResourcesCategoryDao.findById(id).orElse(null);
    }
    public List<RsResourceCategory> findAll() {

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsResourceDefaultParamService.java

@@ -21,7 +21,7 @@ public class RsResourceDefaultParamService extends BaseJpaService<RsResourceDefa
    private RsResourceDefaultParamDao resourceDefaultParamDao;
    public RsResourceDefaultParam findById(String id) {
        return resourceDefaultParamDao.getOne(id);
        return resourceDefaultParamDao.findById(id).orElse(null);
    }
    public List<RsResourceDefaultParam> findByResourcesIdOrResourcesCodeWithParamKey(String resourcesId, String resourcesCode, String paramKey){

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsResourceDefaultQueryService.java

@@ -51,7 +51,7 @@ public class RsResourceDefaultQueryService extends BaseJpaService<RsResourceDefa
     */
    public RsResourceDefaultQuery getResourceQueryById(String id)
    {
        return rsQueryDao.getOne(id);
        return rsQueryDao.findById(id).orElse(null);
    }
    /**

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsResourceMetadataService.java

@@ -95,7 +95,7 @@ public class RsResourceMetadataService extends BaseJpaService<RsResourceMetadata
     * @return RsResourceMetadata
     */
    public RsResourceMetadata getRsMetadataById(String id) {
        return rsMetadataDao.getOne(id);
        return rsMetadataDao.findById(id).orElse(null);
    }
    public List<RsResourceMetadata> getRsMetadataByResourcesId(String resourcesId) {

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsRolesResourceMetadataGrantService.java

@@ -81,7 +81,7 @@ public class RsRolesResourceMetadataGrantService extends BaseJpaService<RsRolesR
     * @return RsRolesResource
     */
    public RsRolesResourceMetadata getRsRolesMetadataGrantById(String id) {
        return rsRolesResourceMetadataDao.getOne(id);
        return rsRolesResourceMetadataDao.findById(id).orElse(null);
    }
    /**

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsSystemDictionaryEntryService.java

@@ -18,6 +18,6 @@ public class RsSystemDictionaryEntryService extends BaseJpaService<RsSystemDicti
    @Autowired
    private RsSystemDictionaryEntryDao systemDictionaryEntryDao;
    public RsSystemDictionaryEntry findById(String id) {
        return systemDictionaryEntryDao.getOne(id);
        return systemDictionaryEntryDao.findById(id).orElse(null);
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsSystemDictionaryService.java

@@ -19,6 +19,6 @@ public class RsSystemDictionaryService extends BaseJpaService<RsSystemDictionary
    private RsSystemDictionaryDao systemDictionaryDao;
    public RsSystemDictionary findById(String id) {
        return systemDictionaryDao.getOne(id);
        return systemDictionaryDao.findById(id).orElse(null);
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/security/service/UserSecurityService.java

@@ -100,7 +100,7 @@ public class UserSecurityService {
    }
    public void deleteKey(String id) {
        UserSecurity key = keyRepository.getOne(id);
        UserSecurity key = keyRepository.findById(id).orElse(null);
        keyRepository.delete(key);
    }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/MultipleCode/MultipleCoderController.java

@@ -6,14 +6,12 @@ import com.yihu.jw.entity.base.wx.BasePatientWechatDo;
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
import com.yihu.jw.hospital.httplog.dao.WlyyHttpLogDao;
import com.yihu.jw.hospital.service.MultipleCode.MultipleCodeService;
import com.yihu.jw.hospital.ykyy.service.YkyyService;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.wechat.dao.BasePatientWechatDao;
import com.ylzinfo.ehc.trans.TransResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -24,10 +22,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
 * @author HZY
 * @vsrsion 1.0
@@ -70,7 +64,7 @@ public class MultipleCoderController extends EnvelopRestEndpoint {
        try {
            WlyyHttpLogDO logDO = new WlyyHttpLogDO();
            MixEnvelop envelop = new MixEnvelop();
            BasePatientDO patientDO = basePatientDao.getOne(patientId);
            BasePatientDO patientDO = basePatientDao.findById(patientId).orElse(null);
            logDO.setCode("ehc.ehealthcard.queryInfo");
            logDO.setName("查询多码融合信息");

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/DoctorConsultEndpoint.java

@@ -41,7 +41,6 @@ import com.yihu.jw.wlyy.service.WlyyBusinessService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import net.sf.json.JSON;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -229,7 +228,7 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
										  @ApiParam(name = "source", value = "来源")
											  @RequestParam(value = "source", required = false) String source)throws Exception{
			ConsultTeamDo consult = new ConsultTeamDo();
			WlyyOutpatientDO outpatientDO = outpatientDao.getOne(outpatientCode);
			WlyyOutpatientDO outpatientDO = outpatientDao.findById(outpatientCode).orElse(null);
			if (null!=outpatientDO){
                if(!outpatientDO.getDoctor().equalsIgnoreCase(doctorCode)){
                    return failed("当前患者已选择其他医生进行咨询或复诊。");
@@ -429,7 +428,7 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
							  @ApiParam(name = "source", value = "来源")
								  @RequestParam(value = "source", required = false) String source)throws Exception{
		ConsultTeamDo consult = new ConsultTeamDo();
		WlyyOutpatientDO outpatientDO = outpatientDao.getOne(outpatientCode);
		WlyyOutpatientDO outpatientDO = outpatientDao.findById(outpatientCode).orElse(null);
		if (null!=outpatientDO){
		    if(!outpatientDO.getDoctor().equalsIgnoreCase(doctorCode)){
                return failed("当前患者已选择其他医生进行咨询或复诊。");
@@ -527,7 +526,7 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
			BaseDoctorDO generalDoctor = baseDoctorDao.findByIdAndDel(general_doctor);
			BaseDoctorDO specialDoctor = baseDoctorDao.findByIdAndDel(special_doctor);
			// 查询患者信息
			BasePatientDO p = basePatientDao.getOne(patient_code);
			BasePatientDO p = basePatientDao.findById(patient_code).orElse(null);
			//发送系统消息
			SystemMessageDO systemMessageDO = new SystemMessageDO();
			systemMessageDO.setTitle("新增专家咨询");
@@ -567,13 +566,13 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
		String jsonStr = "";
		if ("xm_zsyy_wx".equalsIgnoreCase(wxId)){
			//结束时医生未开处方则发送模板消息结算
			ConsultDo cons = consultDao.getOne(consult);
			ConsultDo cons = consultDao.findById(consult).orElse(null);
			if (StringUtils.isNoneBlank(cons.getRelationCode())){
				WlyyOutpatientDO outpatientDO = outpatientDao.getOne(cons.getRelationCode());
				WlyyOutpatientDO outpatientDO = outpatientDao.findById(cons.getRelationCode()).orElse(null);
				List<WlyyPrescriptionDO> wlyyPrescriptionDOS = prescriptionDao.findByOutpatientId(outpatientDO.getId());
				if (wlyyPrescriptionDOS==null||wlyyPrescriptionDOS.size()==0){
					logger.info("发送诊查费支付模板消息start");
					BasePatientDO patientDO = basePatientDao.getOne(outpatientDO.getPatient());
					BasePatientDO patientDO = basePatientDao.findById(outpatientDO.getPatient()).orElse(null);
					String userName = null;
					String idcard = null;
					if (patientDO != null) {
@@ -708,7 +707,7 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
		try {
			prescriptionService.pickVideoPrescripitonWaitingPeople(outpatientCode,doctor);
			WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.getOne(outpatientCode);
			WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findById(outpatientCode).orElse(null);
			if (StringUtils.isNoneBlank(wlyyOutpatientDO.getType())){
				if (wlyyOutpatientDO.getType().equalsIgnoreCase("2")&&wlyyOutpatientDO.getOutpatientType().equalsIgnoreCase("3")){
					prescriptionService.sendWxTemplateMsg(wxId, wlyyOutpatientDO.getId(),null, "17", "videoOrderRemind", "");
@@ -783,7 +782,7 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
				for(Map<String,Object> consult :data){
					//如果是协同门诊，多返回全科医生的详细信息
					if(12 == Integer.parseInt(consult.get("type").toString()) && StringUtils.isNoneBlank((String)consult.get("generalDoctor"))){
						BaseDoctorDO baseDoctorDO = baseDoctorDao.getOne((String)consult.get("generalDoctor"));
						BaseDoctorDO baseDoctorDO = baseDoctorDao.findById((String)consult.get("generalDoctor")).orElse(null);
						List<BaseDoctorHospitalDO> baseDoctorHospitalDOList = baseDoctorHospitalDao.findByDoctorCode((String)consult.get("generalDoctor"));
						if(baseDoctorDO!=null){
							consult.put("generalDoctorName", baseDoctorDO.getName());

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/PatientConsultEndpoint.java

@@ -551,7 +551,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
					data.put("msg",msg);
					systemMessageDO.setData(data.toString());
					systemMessageService.saveMessage(systemMessageDO);
					BasePatientDO patientDO = basePatientDao.getOne(patient);
					BasePatientDO patientDO = basePatientDao.findById(patient).orElse(null);
					if ("xm_ykyy_wx".equalsIgnoreCase(wxId)){
						String templateMsgResult = ykyyService.pushNotificationToYktPatient(patientDO.getYktId(), systemMessageDO.getTitle(), data.get("msg").toString());
					}
@@ -577,7 +577,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			systemMessageDO.setData(data.toString());
			hospitalSystemMessageService.saveMessage(systemMessageDO);
			BaseDoctorDO d = baseDoctorDao.findByIdAndDel(re.getString("doctor"));
			BasePatientDO p = basePatientDao.getOne(re.getString("patient"));
			BasePatientDO p = basePatientDao.findById(re.getString("patient")).orElse(null);
			
			try {
				//眼科支付订单
@@ -604,7 +604,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
					if(d!=null&& org.apache.commons.lang3.StringUtils.isNoneBlank(d.getFee())){
						price = Double.parseDouble(d.getFee());
					}
					ConsultDo consultDo = consultDao.getOne(re.getString("consult"));
					ConsultDo consultDo = consultDao.findById(re.getString("consult")).orElse(null);
					if (price==0.0){
						consultDo.setPayStatus(1);
						consultDao.save(consultDo);
@@ -615,7 +615,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
					if(d!=null&& org.apache.commons.lang3.StringUtils.isNoneBlank(d.getFee())){
						price = Double.parseDouble(d.getFee());
					}
					ConsultDo consultDo = consultDao.getOne(re.getString("consult"));
					ConsultDo consultDo = consultDao.findById(re.getString("consult")).orElse(null);
					if (price==0.0){
						consultDo.setPayStatus(1);
						consultDao.save(consultDo);
@@ -705,13 +705,13 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
		String jsonStr = "";
		if ("xm_zsyy_wx".equalsIgnoreCase(wxId)){
		//结束时医生未开处方则发送模板消息结算
		ConsultDo cons = consultDao.getOne(consult);
		ConsultDo cons = consultDao.findById(consult).orElse(null);
		if (org.apache.commons.lang3.StringUtils.isNoneBlank(cons.getRelationCode())){
			WlyyOutpatientDO outpatientDO = outpatientDao.getOne(cons.getRelationCode());
			WlyyOutpatientDO outpatientDO = outpatientDao.findById(cons.getRelationCode()).orElse(null);
			List<WlyyPrescriptionDO> wlyyPrescriptionDOS = prescriptionDao.findByOutpatientId(outpatientDO.getId());
			if (wlyyPrescriptionDOS==null||wlyyPrescriptionDOS.size()==0){
				logger.info("发送诊查费支付模板消息start");
				BasePatientDO patientDO = basePatientDao.getOne(outpatientDO.getPatient());
				BasePatientDO patientDO = basePatientDao.findById(outpatientDO.getPatient()).orElse(null);
				String userName = null;
				String idcard = null;
				if (patientDO != null) {

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/hospital/WlyyFamilyMemberController.java

@@ -22,7 +22,6 @@ import com.yihu.jw.sms.service.ZBSmsService;
import com.yihu.jw.sms.service.ZhongShanSMSService;
import com.yihu.jw.sms.util.ykyy.vo.ResultMsg;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.StringUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -189,7 +188,7 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
            throw new IllegalAccessException("SMS request frequency is too fast");
            //发送短信获取验证码
        }
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.getOne("isNeedSMS");
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.findById("isNeedSMS").orElse(null);
        if (wlyyHospitalSysDictDO!=null&&!StringUtils.isEmpty(wlyyHospitalSysDictDO.getDictValue())){
            String captcha = wlyyHospitalSysDictDO.getDictValue();
            this.store(client_id, phoneNum, captcha, 120);
@@ -296,7 +295,7 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
            throw new IllegalAccessException("SMS request frequency is too fast");
            //发送短信获取验证码
        }
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.getOne("isNeedSMS");
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.findById("isNeedSMS").orElse(null);
        if (wlyyHospitalSysDictDO!=null&&!StringUtils.isEmpty(wlyyHospitalSysDictDO.getDictValue())){
            String captcha = wlyyHospitalSysDictDO.getDictValue();
            this.store(client_id, phoneNum, captcha, 120);
@@ -347,7 +346,7 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
    //验证验证码
    public boolean verification(String client_id, String username, String code) {
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.getOne("isNeedSMS");
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.findById("isNeedSMS").orElse(null);
        if (wlyyHospitalSysDictDO!=null&&!StringUtils.isEmpty(wlyyHospitalSysDictDO.getDictValue())){
            if (code.equalsIgnoreCase(wlyyHospitalSysDictDO.getDictValue())){
                return true;

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@@ -632,7 +632,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            BusinessOrderDO businessOrderDO = businessOrderDao.selectByOrderNo(seqNo);
            if (businessOrderDO.getStatus()!=1&&businessOrderDO.getStatus()!=9){
                if (businessOrderDO!=null&&businessOrderDO.getOrderCategory().equalsIgnoreCase("4")){
                    WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionDao.getOne(businessOrderDO.getRelationCode());
                    WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionDao.findById(businessOrderDO.getRelationCode()).orElse(null);
                    JSONObject object = (JSONObject) JSONObject.toJSON(wlyyPrescriptionDO);
                    logger.info("wlyyPrescriptionDO参数入参"+object.toJSONString());
                    WlyyPrescriptionVO prescriptionVO = JSONObject.toJavaObject(object,WlyyPrescriptionVO.class);
@@ -668,7 +668,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
    @RequestMapping(value = "/ylzReceiveNotify")
    public String mmpReceiveNotify(HttpServletRequest request, HttpServletResponse response) throws IOException, PayException {
        response.setContentType("text/html;charset=utf-8");
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.getOne("ylz_pay_config");
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.findById("ylz_pay_config").orElse(null);
        if(oauthYlzConfigDO==null){
            return "未找到支付配置文件";
        }
@@ -705,7 +705,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                    BusinessOrderDO businessOrderDO = businessOrderDao.selectByOrderNo(traceNo);
                    if (businessOrderDO.getStatus()!=1){
                        if (businessOrderDO!=null&&businessOrderDO.getOrderCategory().equalsIgnoreCase("4")){
                            WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionDao.getOne(businessOrderDO.getRelationCode());
                            WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionDao.findById(businessOrderDO.getRelationCode()).orElse(null);
                            JSONObject object = (JSONObject) JSONObject.toJSON(wlyyPrescriptionDO);
                            logger.info("wlyyPrescriptionDO参数入参"+object.toJSONString());
                            WlyyPrescriptionVO prescriptionVO = JSONObject.toJavaObject(object,WlyyPrescriptionVO.class);
@@ -735,7 +735,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                            //发送IM消息
                            hospitalSystemMessageService.sendImMessage(systemMessageDO);
                        }else if (businessOrderDO!=null&&businessOrderDO.getOrderCategory().equalsIgnoreCase("6")){
                            YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.getOne(businessOrderDO.getRelationCode());
                            YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.findById(businessOrderDO.getRelationCode()).orElse(null);
                            prescriptionService.confirmSettlementService(ylzMedicalRelationDO.getRelationCode());
                        }
                    }
@@ -755,7 +755,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
    @ApiOperation("支付回调")
    public String receiveNotify(HttpServletRequest request, HttpServletResponse response) throws IOException, IOException {
        response.setContentType("text/html;charset=utf-8");
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.getOne("ylz_pay_config");
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.findById("ylz_pay_config").orElse(null);
        if(oauthYlzConfigDO==null){
            return "未找到支付配置文件";
        }
@@ -820,7 +820,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                        BusinessOrderDO businessOrderDO = businessOrderDao.selectByOrderNo(outChargeNo);
                        if (businessOrderDO.getStatus()!=1){
                            if (businessOrderDO!=null&&businessOrderDO.getOrderCategory().equalsIgnoreCase("4")){
                                WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionDao.getOne(businessOrderDO.getRelationCode());
                                WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionDao.findById(businessOrderDO.getRelationCode()).orElse(null);
                                JSONObject object = (JSONObject) JSONObject.toJSON(wlyyPrescriptionDO);
                                logger.info("wlyyPrescriptionDO参数入参"+object.toJSONString());
                                WlyyPrescriptionVO prescriptionVO = JSONObject.toJavaObject(object,WlyyPrescriptionVO.class);
@@ -990,7 +990,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
        if (wxId.equalsIgnoreCase("xm_zsyy_wx")){
            id = "zsyy";
        }
        WxEnterpriseDO wxEnterpriseDO = wxEnterpriseDao.getOne(id);
        WxEnterpriseDO wxEnterpriseDO = wxEnterpriseDao.findById(id).orElse(null);
        Map<Object, Object> map = new HashMap<Object, Object>();
        if (ticket != null) {
            String noncestr = UUID.randomUUID().toString();
@@ -1145,7 +1145,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
    @RequestMapping(value = "/ylzSettleRecord")
    public String ylzSettleRecord(HttpServletRequest request, HttpServletResponse response) throws Exception{
        response.setContentType("text/html;charset=utf-8");
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.getOne("ylz_balance_config");
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.findById("ylz_balance_config").orElse(null);
        if(oauthYlzConfigDO==null){
            return "未找到支付配置文件";
        }
@@ -1166,7 +1166,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            logger.info("解密后：{}",JSON.toJSONString(decryptRes) );
            JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(decryptRes));
            String hsName="核酸";
            WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.getOne("natItemName");
            WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.findById("natItemName").orElse(null);
            if (wlyyHospitalSysDictDO!=null){
                hsName=wlyyHospitalSysDictDO.getDictValue();
            }
@@ -1201,7 +1201,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                                    if (prescriptionDO.getStatus()!=30&&prescriptionDO.getStatus()>=20){
                                        String fee=null;
                                        String title = null;
                                        WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.getOne(prescriptionDO.getOutpatientId());
                                        WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findById(prescriptionDO.getOutpatientId()).orElse(null);
                                        if (wlyyOutpatientDO.getHisStatus()==null){
                                            fee=(prescriptionDO.getDrugFee()+wlyyOutpatientDO.getFee())+"";
                                            if (wxId.equalsIgnoreCase("xm_zsyy_wx")){
@@ -1263,14 +1263,14 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                                                String title="您在厦门大学附属中山医院有一笔交易已支付完成！";
                                                pushPayLog = payInfoNoticeService.pushPrescriptionPayAndHsjc(natAppointmentDO.getPatientId(),natAppointmentDO.getDoctorName(),waitPayDetailVO.getVoucherNo(),natAppointmentDO.getId()+"",fee,title,null,waitPayDetailVO.getRecipeNo());
                                            }
                                            BasePatientDO patientDO = patientDao.getOne(natAppointmentDO.getPatientId());
                                            BasePatientDO patientDO = patientDao.findById(natAppointmentDO.getPatientId()).orElse(null);
                                            //发送预约成功通知
                                            String name= patientDO.getName();
                                            String idcard = patientDO.getIdcard();
                                            String mobile = patientDO.getMobile();
                                            String url = "https://hlwyy.xmzsh.com/hlwyy/ims-wx/#/nucleicTest/detail?id="+natAppointmentDO.getId();
                                            String date = DateUtil.dateToStrLong(natAppointmentDO.getAppointmentTime());
                                            WlyyHospitalSysDictDO hospitalSysDictDO = wlyyHospitalSysDictDao.getOne("natConfigTestNew");
                                            WlyyHospitalSysDictDO hospitalSysDictDO = wlyyHospitalSysDictDao.findById("natConfigTestNew").orElse(null);
                                            String addres = "我院五号楼北侧（急诊部后侧）";
                                            String timeDes = "6-8小时";
                                            if (hospitalSysDictDO!=null){
@@ -1406,7 +1406,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                          @ApiParam(name = "demoflag", value = "是否测试")
                          @RequestParam(value = "demoflag", required = false) boolean demoflag) throws Exception{
        WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionDao.getOne(prescriptionId);
        WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionDao.findById(prescriptionId).orElse(null);
        //判断是否是快递如果是则下物流单
        List<WlyyPrescriptionExpressageDO> expressList=prescriptionExpressageDao.findByOutpatientId(wlyyPrescriptionDO.getOutpatientId());
        if (null!=expressList&&expressList.size()>0){
@@ -1982,7 +1982,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
    @GetMapping("/smsToDoctor")
    public Envelop sentMessageRemindSms(@RequestParam(value = "consult", required = true)String consult){
        try {
            ConsultDo consultDo = consultDao.getOne(consult);
            ConsultDo consultDo = consultDao.findById(consult).orElse(null);
            return  success(systemMessageService.sendDoctorRemindSms(consultDo));
        } catch (Exception e) {
            return failedException(e);
@@ -2177,7 +2177,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                                 @RequestParam(value = "mailStatus", required = false)String mailStatus,
                             @ApiParam(name = "prescriptionId", value = "")
                                 @RequestParam(value = "prescriptionId", required = false)String prescriptionId) {
       WlyyOutpatientDO wlyyOutpatientDO =  outpatientDao.getOne(outpatientId);
       WlyyOutpatientDO wlyyOutpatientDO =  outpatientDao.findById(outpatientId).orElse(null);
        ConsultTeamDo consultTeamDo = consultTeamDao.queryByRelationCode(outpatientId);
        return success(prescriptionService.wxTempalteJPush(templateCode,wlyyOutpatientDO,consultTeamDo,drugName,mailNo,mailStatus,prescriptionId));
@@ -2578,7 +2578,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                JSONObject orderStatus=JSONObject.parseObject(res);
                if ("0".equalsIgnoreCase(orderStatus.getString("code"))){
                    System.out.println("开始同步状态");
                        BaseNatAppointmentDO baseNatAppointmentDO = baseNatAppointmentDao.getOne(Integer.valueOf(businessOrderDO.getRelationCode()));
                        BaseNatAppointmentDO baseNatAppointmentDO = baseNatAppointmentDao.findById(Integer.valueOf(businessOrderDO.getRelationCode())).orElse(null);
                        if (baseNatAppointmentDO!=null){
                            if (baseNatAppointmentDO.getPayStatus().equalsIgnoreCase("0")){
                                JSONObject chargeObj=new JSONObject();

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -764,7 +764,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
            msgObj.put("zd", zd_str);
            msgObj.put("jl", jl_str);
            msgObj.put("outpatientid", outPatientId);
            WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.getOne(outPatientId);
            WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findById(outPatientId).orElse(null);
            String immsg = imService.pushHuiZhenMsg(msgObj, wlyyOutpatientDO.getDoctor(), wlyyOutpatientDO.getDoctorName(), outPatientId, wlyyOutpatientDO.getPatient(), wlyyOutpatientDO.getOutpatientType());
            System.out.println("发送诊断消息成功：" + immsg);
            if (result.get("prescriptionId") != null && StringUtils.isNoneBlank(orderId)) {
@@ -2410,7 +2410,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        try {
            WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionService.findPrescriptionDo(prescriptionId);
            WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.getOne(wlyyPrescriptionDO.getOutpatientId());
            WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findById(wlyyPrescriptionDO.getOutpatientId()).orElse(null);
            if (status == 1) {
                com.alibaba.fastjson.JSONObject msgObj = new com.alibaba.fastjson.JSONObject();
                msgObj.put("outpatientid", wlyyPrescriptionDO.getOutpatientId());
@@ -3266,7 +3266,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        } else if ("xm_tasy_wx".equalsIgnoreCase(wxId)) {
            String res = tasyNatService.departMent(deptCode);
            String dept = "";
            WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.getOne("tasyNatDept");
            WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.findById("tasyNatDept").orElse(null);
            if (wlyyHospitalSysDictDO != null) {
                dept = wlyyHospitalSysDictDO.getDictValue();
            }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/MultipleCode/MultipleCodeService.java

@@ -12,8 +12,6 @@ import com.yihu.jw.hospital.ykyy.service.YkyyService;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.wechat.WeiXinMessageReplyUtils;
import com.yihu.jw.utils.StringUtil;
import com.yihu.jw.wechat.dao.BasePatientWechatDao;
import com.yihu.jw.wechat.dao.WechatDao;
import com.ylzinfo.ehc.EhcHandler;
@@ -22,10 +20,8 @@ import com.ylzinfo.ehc.trans.TransRequest;
import com.ylzinfo.ehc.trans.TransResponse;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.UUID;
/**
@@ -57,7 +53,7 @@ public class MultipleCodeService {
    public MixEnvelop mcfRegister(BasePatientDO patientDO, String wechatId) throws Exception {
        BasePatientWechatDo patientWechatDo = basePatientWechatDao.findByWechatIdAndPatientId(wechatId, patientDO.getId()).get(0);
        WxWechatDO wechatDO = wechatDao.findByIdAndStatus(wechatId);
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.getOne("mcf_config");
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.findById("mcf_config").orElse(null);
        TransResponse re= new TransResponse();
        try {
            TransRequest request = new TransRequest();
@@ -101,11 +97,11 @@ public class MultipleCodeService {
//     根据openId、 accountId查询三码融合码信息
    public MixEnvelop mcfOpenquery(String patientId,String wechatId) throws Exception {
        WxWechatDO wechatDO = wechatDao.findByAppId(wechatId);
        BasePatientDO patientDO = basePatientDao.getOne(patientId);
        BasePatientDO patientDO = basePatientDao.findById(patientId).orElse(null);
        if (patientDO!=null){
            BasePatientWechatDo patientWechatDo = basePatientWechatDao.findByWechatIdAndPatientId(wechatId, patientDO.getId()).get(0);
            if (patientWechatDo!=null){
                OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.getOne("mcf_config");
                OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.findById("mcf_config").orElse(null);
                TransRequest request = new TransRequest();
                request.setMethod("ehc.ehealthcard.openquery");
                request.setApp_id(oauthYlzConfigDO.getAppId());
@@ -178,7 +174,7 @@ public class MultipleCodeService {
    }
//     获取展码地址
    public  String mcfGetCodeUrl(String ehealth_card_id) throws Exception {
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.getOne("mcf_config");
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.findById("mcf_config").orElse(null);
        TransRequest request = new TransRequest();
        request.setMethod("ehc.ehealthcard.getCodeUrl");
        request.setApp_id(oauthYlzConfigDO.getAppId());
@@ -208,7 +204,7 @@ public class MultipleCodeService {
    }
    //通过身边证查询用户信息
    public  String  mcfQueryInfo(BasePatientDO patientDO) throws Exception {
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.getOne("mcf_config");
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.findById("mcf_config").orElse(null);
        TransRequest request = new TransRequest();
        request.setMethod("ehc.ehealthcard.queryInfo");
        request.setApp_id(oauthYlzConfigDO.getAppId());
@@ -302,7 +298,7 @@ public class MultipleCodeService {
    }
    public MixEnvelop mcfQueryInfo(String ehealth_card_id ) throws Exception {
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.getOne("mcf_config");
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.findById("mcf_config").orElse(null);
        TransRequest request = new TransRequest();
        request.setMethod("ehc.ehealthcard.queryInfo");
        request.setApp_id(oauthYlzConfigDO.getAppId());

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/SystemMessage/HospitalSystemMessageService.java

@@ -86,7 +86,7 @@ public class HospitalSystemMessageService  {
	 */
	@Async
	public void sendImPichCheckMessage(WlyyOutpatientDO wlyyOutpatientDO) throws Exception {
		BasePatientDO basePatientDO =basePatientDao.getOne(wlyyOutpatientDO.getPatient());
		BasePatientDO basePatientDO =basePatientDao.findById(wlyyOutpatientDO.getPatient()).orElse(null);
		String tagMsg = "";
		JSONObject object = new JSONObject();
		object.put("socket_sms_type",12);//抢单事件

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/BasePatientBusinessService.java

@@ -66,13 +66,13 @@ public class BasePatientBusinessService extends BaseJpaService<BasePatientBusine
			knowledgeArticleUserDO.setDel(1);
			knowledgeArticleUserDO.setUser(user);
			if (StringUtils.isNoneBlank(userType)&&userType.equalsIgnoreCase("1")){
				BasePatientDO patientDO = patientDao.getOne(user);
				BasePatientDO patientDO = patientDao.findById(user).orElse(null);
				if (patientDO!=null){
					knowledgeArticleUserDO.setUserName(patientDO.getName());
					knowledgeArticleUserDO.setCreateUserName(patientDO.getName());
				}
			}else if (StringUtils.isNoneBlank(userType)&&userType.equalsIgnoreCase("2")){
				BaseDoctorDO doctorDO = doctorDao.getOne(user);
				BaseDoctorDO doctorDO = doctorDao.findById(user).orElse(null);
				if (doctorDO!=null){
					knowledgeArticleUserDO.setUserName(doctorDO.getName());
					knowledgeArticleUserDO.setCreateUserName(doctorDO.getName());
@@ -168,8 +168,8 @@ public class BasePatientBusinessService extends BaseJpaService<BasePatientBusine
		return knowledgeArticleDO;
	}
	public void setUsed(String id,Integer used,String doctor){
		WlyySurveyTemplateDO wlyySurveyTemplateDO = surveyTemplateDao.getOne(id);
		BaseDoctorDO doctorDO = doctorDao.getOne(doctor);
		WlyySurveyTemplateDO wlyySurveyTemplateDO = surveyTemplateDao.findById(id).orElse(null);
		BaseDoctorDO doctorDO = doctorDao.findById(doctor).orElse(null);
		KnowledgeArticleUserDO knowledgeArticleUserDO =knowledgeArticleUserDao.findByrelationCodeAndUserAndDel(id,doctor);
		if (null==knowledgeArticleUserDO){
			knowledgeArticleUserDO = new KnowledgeArticleUserDO();

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/ConsultPriceService.java

@@ -51,7 +51,7 @@ public class ConsultPriceService extends BaseJpaService<WlyyHospitalConsultPrice
            wlyyHospitalConsultPriceDO.setHospital(hospital);
            wlyyHospitalConsultPriceDO = consultPriceDao.save(wlyyHospitalConsultPriceDO);
        }else{
            WlyyHospitalConsultPriceDO wlyyHospitalConsultPriceDOL = consultPriceDao.getOne(id);
            WlyyHospitalConsultPriceDO wlyyHospitalConsultPriceDOL = consultPriceDao.findById(id).orElse(null);
            wlyyHospitalConsultPriceDOL.setType(dataDetail.get("type") == "" ? 0 : Integer.parseInt(dataDetail.get("type").toString()));
            wlyyHospitalConsultPriceDOL.setPayType(dataDetail.get("payType") == "" ? 0 : Integer.parseInt(dataDetail.get("payType").toString()));
            wlyyHospitalConsultPriceDOL.setDept(dataDetail.get("dept") == "" ? "" : dataDetail.get("dept").toString());

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/KnowledgeArticleService.java

@@ -92,7 +92,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
	 * @throws Exception
	 */
	public KnowledgeArticleDO saveArticle(String jsonData) throws  Exception {
		WlyyHospitalSysDictDO wlyyHospitalSysDictDO = hospitalSysDictDao.getOne("EXAMINE");
		WlyyHospitalSysDictDO wlyyHospitalSysDictDO = hospitalSysDictDao.findById("EXAMINE").orElse(null);
		KnowledgeArticleDO knowledgeArticleDO = EntityUtils.jsonToEntity(jsonData, KnowledgeArticleDO.class);
		if (null == knowledgeArticleDO.getId()) {
			// 新增
@@ -106,7 +106,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
			knowledgeArticleDO = knowledgeArticleDao.save(knowledgeArticleDO);
			return knowledgeArticleDO;
		} else {
			KnowledgeArticleDO one = knowledgeArticleDao.getOne(knowledgeArticleDO.getId());
			KnowledgeArticleDO one = knowledgeArticleDao.findById(knowledgeArticleDO.getId()).orElse(null);
			one.setTitle(knowledgeArticleDO.getTitle());
			one.setContent(knowledgeArticleDO.getContent());
			one.setImage(knowledgeArticleDO.getImage());
@@ -126,7 +126,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
	 */
	public KnowledgeArticleDO updateIsShow(String id,Integer isShow) throws  Exception {
		KnowledgeArticleDO one = knowledgeArticleDao.getOne(id);
		KnowledgeArticleDO one = knowledgeArticleDao.findById(id).orElse(null);
		one.setIsShow(isShow);
		one.setUpdateTime(new Date());
		knowledgeArticleDao.save(one);
@@ -137,7 +137,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
	//审核/退回文章
	public KnowledgeArticleDO reviewArticle(String articleId,Integer status,String reason) throws Exception{
		
		KnowledgeArticleDO knowledgeArticleDO = knowledgeArticleDao.getOne(articleId);
		KnowledgeArticleDO knowledgeArticleDO = knowledgeArticleDao.findById(articleId).orElse(null);
		if (null == knowledgeArticleDO) {
			throw new Exception("该文章不存在");
		} else {
@@ -271,7 +271,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
				}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);
@@ -285,7 +285,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
					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());
@@ -308,7 +308,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
	 */
	public KnowledgeArticleDO setUsed(String id,Integer used,String doctor){
		KnowledgeArticleDO knowledgeArticleDO = knowledgeArticleDao.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-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/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-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/QrcodeService.java

@@ -28,15 +28,14 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartFile;
import javax.transaction.Transactional;
import java.io.*;
import java.io.InputStream;
import java.io.PrintWriter;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
@@ -429,7 +428,7 @@ public class QrcodeService {
    public ObjEnvelop getWXUserInfo(String patient) throws Exception{
        BasePatientDO basePatientDO = basePatientDao.getOne(patient);
        BasePatientDO basePatientDO = basePatientDao.findById(patient).orElse(null);
        ObjEnvelop objEnvelop = new ObjEnvelop();
        if (null!=basePatientDO){
            String openId=basePatientDO.getOpenid();

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/ReservationSettingService.java

@@ -40,7 +40,7 @@ public class ReservationSettingService extends BaseJpaService<WlyyHospitalReserv
            wlyyHospitalReservationSettingDO.setReservationStatus(Integer.parseInt(dataDetail.get("reservationStatus").toString()));
            wlyyHospitalReservationSettingDO = reservationSettingDao.save(wlyyHospitalReservationSettingDO);
        }else{
            WlyyHospitalReservationSettingDO wlyyHospitalReservationSettingDOL = reservationSettingDao.getOne(id);
            WlyyHospitalReservationSettingDO wlyyHospitalReservationSettingDOL = reservationSettingDao.findById(id).orElse(null);
            wlyyHospitalReservationSettingDOL.setDept(dataDetail.get("dept").toString());
            wlyyHospitalReservationSettingDOL.setDeptName(dataDetail.get("deptName").toString());
            wlyyHospitalReservationSettingDOL.setDoctor(dataDetail.get("doctor").toString());

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/SysDictService.java

@@ -43,7 +43,7 @@ public class SysDictService {
            wlyyHospitalSysDictDO.setDictValue(dictValue);
            wlyyHospitalSysDictDO = sysDictDao.save(wlyyHospitalSysDictDO);
        }else{
            WlyyHospitalSysDictDO wlyyHospitalSysDictDOL = sysDictDao.getOne(id);
            WlyyHospitalSysDictDO wlyyHospitalSysDictDOL = sysDictDao.findById(id).orElse(null);
            wlyyHospitalSysDictDOL.setDictValue(dictValue);
            wlyyHospitalSysDictDO = sysDictDao.save(wlyyHospitalSysDictDOL);
        }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/WlyyPatientExpressageAddrService.java

@@ -72,7 +72,7 @@ public class WlyyPatientExpressageAddrService extends BaseJpaService<WlyyPatient
    @Transactional(rollbackFor = Exception.class)
    public Object setAddrDefault(String patient,String id)throws Exception{
        StringBuilder error = new StringBuilder("OK");
        WlyyPatientExpressageAddrDO newDefaultAddr = patientExpressageAddrDao.getOne(id);
        WlyyPatientExpressageAddrDO newDefaultAddr = patientExpressageAddrDao.findById(id).orElse(null);
        if(null == newDefaultAddr){
            error.replace(0,2,"当前地址不存在!");
            return error;

svr/svr-quota/src/main/java/com/yihu/jw/quota/service/job/JobService.java

@@ -108,7 +108,7 @@ public class JobService {
     * @throws Exception
     */
    public void removeJob(Long id) throws Exception {
        TjQuota tjQuota = quotaDao.getOne(id);
        TjQuota tjQuota = quotaDao.findById(id).orElse(null);
        if (tjQuota != null) {
            QuotaVo quotaVo = new QuotaVo();
            BeanUtils.copyProperties(tjQuota, quotaVo);

svr/svr-quota/src/main/java/com/yihu/jw/quota/service/quota/QuotaService.java

@@ -22,7 +22,7 @@ public class QuotaService {
    private EsResultExtract esResultExtract;
    public TjQuota findOne(Long id){
        return quotaDao.getOne(id);
        return quotaDao.findById(id).orElse(null);
    }
    public TjQuota findByCode(String code){
@@ -30,7 +30,7 @@ public class QuotaService {
    }
    public List<Map<String, Object>> queryResultPage(Long id,String filters ,int pageNo,int pageSize) throws Exception {
        TjQuota tjQuota= quotaDao.getOne(id);
        TjQuota tjQuota= quotaDao.findById(id).orElse(null);
        return  esResultExtract.queryResultPage(tjQuota, filters, pageNo, pageSize);
    }
@@ -40,7 +40,7 @@ public class QuotaService {
    }
    public long getQuotaTotalCount(Long id,String filters) throws Exception {
        TjQuota tjQuota= quotaDao.getOne(id);
        TjQuota tjQuota= quotaDao.findById(id).orElse(null);
        long count = esResultExtract.getQuotaTotalCount(tjQuota,filters);
        return count;
    }
@@ -65,7 +65,7 @@ public class QuotaService {
        }else{
            dimensions = new String[]{"quotaDate"};
        }
        TjQuota tjQuota= quotaDao.getOne(id);
        TjQuota tjQuota= quotaDao.findById(id).orElse(null);
        List<Map<String, Object>> resultListMap = esResultExtract.getQuotaReport(tjQuota, filters,10000);
        Map<String,Map<String, Object>> cloumnMap = new HashMap<>();