Home Explore Help
Register Sign In
Amoy2
/
wlyy2.0
Watch 5
Star 1
Fork 18
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java
wangzhinan 4 years ago
parent
2a04f1102a
commit
07aea08fa9
1 changed files with 1 additions and 1 deletions
Split View Show Diff Stats
  1. 1 1
      business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

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

@ -6116,7 +6116,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
 
                            userNo = patientMappingDO.getMappingCode();
 
                        }
 
                        String cardNo = null;
 
                        if (!StringUtils.isNoneBlank(outpatientDO.getCardNo())){
 
                        if (StringUtils.isNoneBlank(outpatientDO.getCardNo())){
 
                            cardNo = outpatientDO.getCardNo();
 
                        }
 
                        logger.info("cardNo:"+cardNo);