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

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/YkyyEntranceService.java

@@ -1574,7 +1574,7 @@ public class YkyyEntranceService {
        BasePatientDO basePatientDO = basePatientDao.findById(patient);
        if(basePatientDO!=null){
            patient = basePatientDO.getUserId();
            patient = basePatientDO.getYktId();
        }
        Map<String,Object> params = new HashedMap();