Quellcode durchsuchen

添加工具类判断节假日

wangzhinan vor 2 Jahren
Ursprung
Commit
3af7406e4e

+ 3 - 0
business/base-service/src/main/java/com/yihu/jw/hospital/healthCare/YlzMedicailRelationDao.java

@ -21,6 +21,9 @@ public interface YlzMedicailRelationDao extends PagingAndSortingRepository<YlzMe
    @Query("from YlzMedicalRelationDO a where   a.relationCode = ?1 and a.state=1 ")
    List<YlzMedicalRelationDO> findByOutpatientStatus(String outpatientId);
    @Query("from YlzMedicalRelationDO a where   a.relationCode = ?1 and a.state=1 and a.pageCode=?2 ")
    YlzMedicalRelationDO findByOutpatientPageCode(String outpatientId,String code);
    @Query("from YlzMedicalRelationDO a where a.logNo = ?1 ")
    YlzMedicalRelationDO findByLog_no(String logNo);

+ 8 - 1
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@ -14422,6 +14422,13 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            logger.info("获取患者待结算信息开始!");
            YlzMedicalRelationDO ylzMedicalRelationDO = new YlzMedicalRelationDO();
            ylzMedicalRelationDO = ylzMedicailRelationDao.findByOutpatient(outpatientId);
          /*  if (ylzMedicalRelationDO!=null&&ylzMedicalRelationDO.getStatus()==1){
                if (!object.getString("flag").equalsIgnoreCase("1")){
                    ylzMedicalRelationDO = ylzMedicailRelationDao.findByOutpatientPersonCode(outpatientId,code);
                    ylzMedicalRelationDO.setStatus(1);
                    ylzMedicailRelationDao.save(ylzMedicalRelationDO);
                }
            }*/
            if (ylzMedicalRelationDO!=null&&ylzMedicalRelationDO.getStatus()==1){
                //医保已结算直接返回数据
                List<YlzMedicalMxDO> mxDOList = ylzMedicailMxDao.findByMedicalId(ylzMedicalRelationDO.getId());
@ -14545,7 +14552,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            logger.info("医保结算结果获取start!");
            result = healthCareService.getSettlementResult(code);
            logger.info("医保结算结果获取end!");
            com.alibaba.fastjson.JSONObject object = com.alibaba.fastjson.JSONObject.parseObject(result);
        }/*else{
            logger.info("医保结算页面start!");
            String registerNo = outpatientDO.getRegisterNo();

+ 13 - 1
gateway/ag-basic/src/main/resources/application.yml

@ -121,6 +121,7 @@ zuul:
    svr-rehabilitation:
      path: /rehabilitation/**
      serviceId: svr-rehabilitation
endpoints:
  env:
    enabled: false
@ -130,7 +131,18 @@ endpoints:
    enabled: false
  heapdump:
    enabled: false
  configprops:
    enabled: false
  metrics:
    enabled: false
  features:
    enabled: false
  beans:
    enabled: false
  autoconfig:
    enabled: false
  loggers:
    enabled: false
# 信息安全
security:
  csrf: